Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

feat: add setting for power editor (#851)

Zeng19982e2657b39d14
diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx
index dd6df1db2..ceabeb587 100644
--- a/web/src/components/MemoEditor.tsx
+++ b/web/src/components/MemoEditor.tsx
@@ -59,6 +59,7 @@ const MemoEditor = () => {
const tagSelectorRef = useRef<HTMLDivElement>(null);
const user = userStore.state.user as User;
const setting = user.setting;
+ const localSetting = user.localSetting;
const tags = tagStore.state.tags;
const memoVisibilityOptionSelectorItems = VISIBILITY_SELECTOR_ITEMS.map((item) => {
return {
@@ -215,24 +216,25 @@ const MemoEditor = () => {
}
}
- for (const symbol of pairSymbols) {
- if (event.key === symbol[0]) {
- event.preventDefault();
- editorRef.current.insertText("", symbol[0], symbol[1]);
- return;
+ if (localSetting.enablePowerfulEditor) {
+ for (const symbol of pairSymbols) {
+ if (event.key === symbol[0]) {
+ event.preventDefault();
+ editorRef.current.insertText("", symbol[0], symbol[1]);
+ return;
+ }
}
- }
-
- if (event.key === "Backspace") {
- const cursor = editorRef.current.getCursorPosition();
- const content = editorRef.current.getContent();
- const deleteChar = content?.slice(cursor - 1, cursor);
- const nextChar = content?.slice(cursor, cursor + 1);
- if (pairSymbols.includes(`${deleteChar}${nextChar}`)) {
- event.preventDefault();
- editorRef.current.removeText(cursor - 1, 2);
+ if (event.key === "Backspace") {
+ const cursor = editorRef.current.getCursorPosition();
+ const content = editorRef.current.getContent();
+ const deleteChar = content?.slice(cursor - 1, cursor);
+ const nextChar = content?.slice(cursor, cursor + 1);
+ if (pairSymbols.includes(`${deleteChar}${nextChar}`)) {
+ event.preventDefault();
+ editorRef.current.removeText(cursor - 1, 2);
+ }
+ return;
}
- return;
}
};
diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsx
index bb6782094..e573b1239 100644
--- a/web/src/components/Settings/PreferencesSection.tsx
+++ b/web/src/components/Settings/PreferencesSection.tsx
@@ -45,7 +45,11 @@ const PreferencesSection = () => {
};
const handleIsFoldingEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
- userStore.upsertLocalSetting("enableFoldMemo", event.target.checked);
+ userStore.upsertLocalSetting({ ...localSetting, enableFoldMemo: event.target.checked });
+ };
+
+ const handlePowerfulEditorEnabledChanged = (event: React.ChangeEvent<HTMLInputElement>) => {
+ userStore.upsertLocalSetting({ ...localSetting, enablePowerfulEditor: event.target.checked });
};
return (
@@ -100,6 +104,10 @@ 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>
</div>
);
};
diff --git a/web/src/locales/en.json b/web/src/locales/en.json
index 5bdce7f58..29f3415ed 100644
--- a/web/src/locales/en.json
+++ b/web/src/locales/en.json
@@ -161,6 +161,7 @@
"theme": "Theme",
"default-memo-visibility": "Default memo visibility",
"enable-folding-memo": "Enable folding memo",
+ "enable-powerful-editor": "Enable powerful editor",
"editor-font-style": "Editor font style",
"mobile-editor-style": "Mobile editor style",
"default-memo-sort-option": "Memo display time",
diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json
index 04a406092..541b7cae5 100644
--- a/web/src/locales/zh.json
+++ b/web/src/locales/zh.json
@@ -161,6 +161,7 @@
"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/store/module/user.ts b/web/src/store/module/user.ts
index f7440f008..ba537c0c3 100644
--- a/web/src/store/module/user.ts
+++ b/web/src/store/module/user.ts
@@ -15,6 +15,7 @@ const defaultSetting: Setting = {
const defaultLocalSetting: LocalSetting = {
enableFoldMemo: true,
+ enablePowerfulEditor: true,
};
export const convertResponseModelUser = (user: User): User => {
@@ -133,9 +134,9 @@ export const useUserStore = () => {
});
await doSignIn();
},
- upsertLocalSetting: async (key: keyof LocalSetting, value: any) => {
- storage.set({ localSetting: { [key]: value } });
- store.dispatch(patchUser({ localSetting: { [key]: value } }));
+ upsertLocalSetting: async (localSetting: LocalSetting) => {
+ storage.set({ localSetting });
+ store.dispatch(patchUser({ localSetting }));
},
patchUser: async (userPatch: UserPatch): Promise<void> => {
const { data } = (await api.patchUser(userPatch)).data;
diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.ts
index e6868d205..e34b65590 100644
--- a/web/src/types/modules/setting.d.ts
+++ b/web/src/types/modules/setting.d.ts
@@ -9,6 +9,7 @@ interface Setting {
interface LocalSetting {
enableFoldMemo: boolean;
+ enablePowerfulEditor: boolean;
}
interface UserLocaleSetting {