From 34cd4d62e96c6cc1b70f65a7a8e199ba66f8c835 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Fri, 7 May 2021 13:43:28 +0800
Subject: [PATCH] ui: auto-resize editor by default

---
 packages/hydrooj/package.json                        |  2 +-
 packages/hydrooj/src/service/server.ts               |  4 ++--
 .../components/discussion/comments.page.js           | 12 +++---------
 packages/ui-default/components/editor/index.js       |  6 ++----
 packages/ui-default/package.json                     |  2 +-
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 81e494ba6..a492d6072 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.24.21",
+    "version": "2.24.22",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/service/server.ts b/packages/hydrooj/src/service/server.ts
index 00e81c973..c24efc2ba 100644
--- a/packages/hydrooj/src/service/server.ts
+++ b/packages/hydrooj/src/service/server.ts
@@ -423,7 +423,7 @@ export class Handler extends HandlerCommon {
             query: ctx.query,
             path: ctx.path,
             params: ctx.params,
-            referer: ctx.request.headers.referer || '/',
+            referer: ctx.request.headers.referer,
             json: (ctx.request.headers.accept || '').includes('application/json'),
         };
         this.response = {
@@ -520,7 +520,7 @@ export class Handler extends HandlerCommon {
                 text: global.Hydro.lib[key].text,
             }));
         if (!this.noCheckPermView) this.checkPerm(PERM.PERM_VIEW);
-        if (this.request.method === 'post' && this.request.headers.referer !== '/') {
+        if (this.request.method === 'post' && this.request.headers.referer) {
             const host = new URL(this.request.headers.referer).host;
             if (host !== this.request.host) throw new CsrfTokenError(host);
         }
diff --git a/packages/ui-default/components/discussion/comments.page.js b/packages/ui-default/components/discussion/comments.page.js
index fcc6216d9..3a142eb46 100644
--- a/packages/ui-default/components/discussion/comments.page.js
+++ b/packages/ui-default/components/discussion/comments.page.js
@@ -50,9 +50,7 @@ function onClickDummyBox(ev) {
   const $evTarget = $(ev.currentTarget);
 
   if (CommentBox.get($evTarget)) {
-    CommentBox
-      .get($evTarget)
-      .focus();
+    CommentBox.get($evTarget).focus();
     return;
   }
 
@@ -125,9 +123,7 @@ async function onCommentClickEdit(mode, ev) {
   const $evTarget = $(ev.currentTarget);
 
   if (CommentBox.get($evTarget)) {
-    CommentBox
-      .get($evTarget)
-      .focus();
+    CommentBox.get($evTarget).focus();
     return;
   }
 
@@ -174,9 +170,7 @@ async function onCommentClickDelete(type, ev) {
         <p>${i18n(message)}</p>
       </div>`,
   }).open();
-  if (action !== 'yes') {
-    return;
-  }
+  if (action !== 'yes') return;
 
   const $evTarget = $(ev.currentTarget);
   const form = JSON.parse($evTarget.attr('data-form'));
diff --git a/packages/ui-default/components/editor/index.js b/packages/ui-default/components/editor/index.js
index 02624cdc9..66c84a2a9 100644
--- a/packages/ui-default/components/editor/index.js
+++ b/packages/ui-default/components/editor/index.js
@@ -40,8 +40,7 @@ export default class Editor extends DOMAttachedObject {
     const hasFocus = $dom.is(':focus') || $dom.hasClass('autofocus');
     const origin = $dom.get(0);
     const ele = document.createElement('div');
-    $(ele).width('100%');
-    $(ele).addClass('textbox');
+    $(ele).width('100%').addClass('textbox');
     $dom.hide();
     origin.parentElement.appendChild(ele);
     const value = $dom.val();
@@ -49,7 +48,7 @@ export default class Editor extends DOMAttachedObject {
       onChange, language = 'markdown',
       theme = UserContext.monacoTheme || 'vs-light',
       model = `file://model-${Math.random().toString(16)}`,
-      autoResize = $dom.hasClass('auto-resize'),
+      autoResize = true,
     } = this.options;
     this.model = typeof model === 'string' ? monaco.editor.createModel(value, language, monaco.Uri.parse(model)) : model;
     const cfg = {
@@ -63,7 +62,6 @@ export default class Editor extends DOMAttachedObject {
     if (autoResize) {
       cfg.scrollbar = {
         vertical: 'hidden',
-        alwaysConsumeMouseWheel: false,
         handleMouseWheel: false,
       };
       cfg.scrollBeyondLastLine = false;
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index bf7b356ac..7de42bec6 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.7.7",
+  "version": "4.7.8",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",