From 5455cb3164293172764bf6a60350ded0939cf1b9 Mon Sep 17 00:00:00 2001
From: boojack <stevenlgtm@gmail.com>
Date: Mon, 13 Feb 2023 23:27:45 +0800
Subject: [PATCH] chore: simplify editor (#1087)

---
 web/src/components/Editor/Editor.tsx               | 5 +++--
 web/src/components/MemoEditor.tsx                  | 1 -
 web/src/components/Settings/PreferencesSection.tsx | 8 --------
 web/src/locales/en.json                            | 1 -
 web/src/locales/it.json                            | 1 -
 web/src/locales/ru.json                            | 1 -
 web/src/locales/uk.json                            | 1 -
 web/src/locales/zh-Hant.json                       | 1 -
 web/src/locales/zh.json                            | 1 -
 web/src/store/module/user.ts                       | 1 -
 web/src/types/modules/setting.d.ts                 | 1 -
 11 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/web/src/components/Editor/Editor.tsx b/web/src/components/Editor/Editor.tsx
index 7ab91cc9..50c22658 100644
--- a/web/src/components/Editor/Editor.tsx
+++ b/web/src/components/Editor/Editor.tsx
@@ -54,8 +54,9 @@ const Editor = forwardRef(function Editor(props: Props, ref: React.ForwardedRef<
         editorRef.current?.focus();
       },
       scrollToCursor: () => {
-        editorRef.current?.blur();
-        editorRef.current?.focus();
+        if (editorRef.current) {
+          editorRef.current.scrollTop = editorRef.current.scrollHeight;
+        }
       },
       insertText: (content = "", prefix = "", suffix = "") => {
         if (!editorRef.current) {
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index 7378b0f7..2095675d 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -160,7 +160,6 @@ const MemoEditor = () => {
               }
             }
           }
-
           editorRef.current?.scrollToCursor();
         }
       }
diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx
index 53d39f61..07654528 100644
--- a/web/src/components/Settings/PreferencesSection.tsx
+++ b/web/src/components/Settings/PreferencesSection.tsx
@@ -49,10 +49,6 @@ const PreferencesSection = () => {
     userStore.upsertLocalSetting({ ...localSetting, enableFoldMemo: event.target.checked });
   };
 
-  const handlePowerfulEditorEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
-    userStore.upsertLocalSetting({ ...localSetting, enablePowerfulEditor: event.target.checked });
-  };
-
   const handleDoubleClickEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
     userStore.upsertLocalSetting({ ...localSetting, enableDoubleClickEditing: event.target.checked });
   };
@@ -109,10 +105,6 @@ const PreferencesSection = () => {
         <span className="normal-text">{t("setting.preference-section.enable-folding-memo")}</span>
         <Switch className="ml-2" checked={localSetting.enableFoldMemo} onChange={handleIsFoldingEnabledChanged} />
       </label>
-      <label className="form-label selector">
-        <span className="normal-text">{t("setting.preference-section.enable-powerful-editor")}</span>
-        <Switch className="ml-2" checked={localSetting.enablePowerfulEditor} onChange={handlePowerfulEditorEnabledChanged} />
-      </label>
       <label className="form-label selector">
         <span className="normal-text">{t("setting.preference-section.enable-double-click")}</span>
         <Switch className="ml-2" checked={localSetting.enableDoubleClickEditing} onChange={handleDoubleClickEnabledChanged} />
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 0d1366c0..908f77b5 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -161,7 +161,6 @@
       "theme": "Theme",
       "default-memo-visibility": "Default memo visibility",
       "enable-folding-memo": "Enable folding memo",
-      "enable-powerful-editor": "Enable powerful editor",
       "enable-double-click": "Enable double-click to edit",
       "editor-font-style": "Editor font style",
       "mobile-editor-style": "Mobile editor style",
diff --git a/web/src/locales/it.json b/web/src/locales/it.json
index a0ff18ec..ca8bf28e 100644
--- a/web/src/locales/it.json
+++ b/web/src/locales/it.json
@@ -161,7 +161,6 @@
       "theme": "Tema",
       "default-memo-visibility": "Visibilità predefinita memo",
       "enable-folding-memo": "Enable folding memo",
-      "enable-powerful-editor": "Abilitata editor avanzato",
       "editor-font-style": "Editor font style",
       "mobile-editor-style": "Mobile editor style",
       "default-memo-sort-option": "Ordine visualizzazione memo",
diff --git a/web/src/locales/ru.json b/web/src/locales/ru.json
index 3685075d..ce394a5c 100644
--- a/web/src/locales/ru.json
+++ b/web/src/locales/ru.json
@@ -161,7 +161,6 @@
       "theme": "Тема",
       "default-memo-visibility": "Видимость записей по умолчанию",
       "enable-folding-memo": "Включить сворачивание записей",
-      "enable-powerful-editor": "Включить расширенный редактор",
       "editor-font-style": "Стиль шрифта",
       "mobile-editor-style": "Стиль мобильного редактора",
       "default-memo-sort-option": "Отображаемое время записи",
diff --git a/web/src/locales/uk.json b/web/src/locales/uk.json
index b88fb8ec..d9f6027f 100644
--- a/web/src/locales/uk.json
+++ b/web/src/locales/uk.json
@@ -161,7 +161,6 @@
       "theme": "Тема",
       "default-memo-visibility": "Стандартна видимість нотаток",
       "enable-folding-memo": "Згортати нотатки",
-      "enable-powerful-editor": "Увімкнути потужний редактор",
       "editor-font-style": "Стиль шрифта",
       "mobile-editor-style": "Стиль мобільного редактора",
       "default-memo-sort-option": "Час відображення закладки",
diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json
index 26425b9c..9ff8e2d1 100644
--- a/web/src/locales/zh-Hant.json
+++ b/web/src/locales/zh-Hant.json
@@ -161,7 +161,6 @@
       "theme": "主題",
       "default-memo-visibility": "預設 Memo 可見性",
       "enable-folding-memo": "開啟折疊 Memo",
-      "enable-powerful-editor": "開啟編輯器自動補全",
       "editor-font-style": "編輯器字體樣式",
       "mobile-editor-style": "移動端編輯器樣式",
       "default-memo-sort-option": "Memo 顯示時間",
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index f89803e8..6ec0de9f 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -161,7 +161,6 @@
       "theme": "主题",
       "default-memo-visibility": "默认 Memo 可见性",
       "enable-folding-memo": "开启折叠 Memo",
-      "enable-powerful-editor": "开启编辑器自动补全",
       "enable-double-click":"开启双击编辑",
       "editor-font-style": "编辑器字体样式",
       "mobile-editor-style": "移动端编辑器样式",
diff --git a/web/src/store/module/user.ts b/web/src/store/module/user.ts
index a329cd51..58f5a28a 100644
--- a/web/src/store/module/user.ts
+++ b/web/src/store/module/user.ts
@@ -15,7 +15,6 @@ const defaultSetting: Setting = {
 
 const defaultLocalSetting: LocalSetting = {
   enableFoldMemo: true,
-  enablePowerfulEditor: true,
   enableDoubleClickEditing: true,
 };
 
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index a4481cb5..b88fe61c 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -9,7 +9,6 @@ interface Setting {
 
 interface LocalSetting {
   enableFoldMemo: boolean;
-  enablePowerfulEditor: boolean;
   enableDoubleClickEditing: boolean;
 }