From 3bc9708871a9879b68ad589e1919e886dc75bc9a Mon Sep 17 00:00:00 2001 From: Erik Michelson Date: Fri, 13 Oct 2023 18:35:24 +0200 Subject: [PATCH] fix(settings): re-add spellcheck setting This was included in the old editor preferences dialog, which got removed altogether with the document-bar. Signed-off-by: Erik Michelson --- frontend/locales/en.json | 33 +++---------------- .../editor/editor-settings-tab-content.tsx | 4 +++ .../spellcheck-setting-button-group.tsx | 17 ++++++++++ frontend/src/redux/editor/methods.ts | 13 ++++++-- frontend/src/redux/editor/reducers.ts | 2 +- frontend/src/redux/editor/types.ts | 6 ++-- 6 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 frontend/src/components/global-dialogs/settings-dialog/editor/spellcheck-setting-button-group.tsx diff --git a/frontend/locales/en.json b/frontend/locales/en.json index 83cf6c09b..f1b015e5f 100644 --- a/frontend/locales/en.json +++ b/frontend/locales/en.json @@ -445,35 +445,6 @@ "errorAddingAlias": "The chosen alias can not be added to this note", "errorRemovingAlias": "There was an error removing the alias", "errorMakingPrimary": "There was an error marking the alias as primary" - }, - "preferences": { - "title": "Preferences", - "theme": { - "label": "Editor theme", - "one-dark": "Dark", - "neat": "Light" - }, - "keyMap": { - "label": "Keymap", - "sublime": "Sublime", - "emacs": "Emacs", - "vim": "Vim" - }, - "indentWithTabs": { - "label": "Tab character", - "on": "Tabs", - "off": "Spaces" - }, - "indentUnit": "Number of spaces per tab", - "spellcheck": { - "label": "Spell checking" - }, - "ligatures": { - "label": "Show ligatures" - }, - "smartPaste": { - "label": "Auto format pasted content" - } } }, "embeddings": { @@ -637,6 +608,10 @@ "lineWrapping": { "label": "Line Wrapping", "help": "Breaks long lines so they're visible without scrolling." + }, + "spellCheck":{ + "label": "Spell checking", + "help": "Enables browser spell checking." } }, "global": { diff --git a/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx index f71430a45..65441b121 100644 --- a/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx +++ b/frontend/src/components/global-dialogs/settings-dialog/editor/editor-settings-tab-content.tsx @@ -11,6 +11,7 @@ import { SyncScrollSettingButtonGroup } from './sync-scroll-setting-button-group import React from 'react' import { ListGroup } from 'react-bootstrap' import { useTranslation } from 'react-i18next' +import { SpellcheckSettingButtonGroup } from './spellcheck-setting-button-group' /** * Shows the editor specific settings. @@ -32,6 +33,9 @@ export const EditorSettingsTabContent: React.FC = () => { + + + ) } diff --git a/frontend/src/components/global-dialogs/settings-dialog/editor/spellcheck-setting-button-group.tsx b/frontend/src/components/global-dialogs/settings-dialog/editor/spellcheck-setting-button-group.tsx new file mode 100644 index 000000000..c06bb89de --- /dev/null +++ b/frontend/src/components/global-dialogs/settings-dialog/editor/spellcheck-setting-button-group.tsx @@ -0,0 +1,17 @@ +/* + * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file) + * + * SPDX-License-Identifier: AGPL-3.0-only + */ +import { useApplicationState } from '../../../../hooks/common/use-application-state' +import { setEditorSpellCheck } from '../../../../redux/editor/methods' +import { OnOffButtonGroup } from '../utils/on-off-button-group' +import React from 'react' + +/** + * Allows to change whether spellchecking is enabled or not in the editor. + */ +export const SpellcheckSettingButtonGroup: React.FC = () => { + const enabled = useApplicationState((state) => state.editorConfig.spellCheck) + return +} diff --git a/frontend/src/redux/editor/methods.ts b/frontend/src/redux/editor/methods.ts index 9b5e11271..0fbe04b3a 100644 --- a/frontend/src/redux/editor/methods.ts +++ b/frontend/src/redux/editor/methods.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 The HedgeDoc developers (see AUTHORS file) + * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file) * * SPDX-License-Identifier: AGPL-3.0-only */ @@ -9,7 +9,8 @@ import type { SetEditorLigaturesAction, SetEditorLineWrappingAction, SetEditorSmartPasteAction, - SetEditorSyncScrollAction + SetEditorSyncScrollAction, + SetEditorSpellCheckAction } from './types' import { EditorConfigActionType } from './types' @@ -45,6 +46,14 @@ export const setEditorSmartPaste = (smartPaste: boolean): void => { store.dispatch(action) } +export const setEditorSpellCheck = (spellCheck: boolean): void => { + const action: SetEditorSpellCheckAction = { + type: EditorConfigActionType.SET_SPELL_CHECK, + spellCheck + } + store.dispatch(action) +} + export const loadFromLocalStorage = (): void => { const action: LoadFromLocalStorageAction = { type: EditorConfigActionType.LOAD_FROM_LOCAL_STORAGE diff --git a/frontend/src/redux/editor/reducers.ts b/frontend/src/redux/editor/reducers.ts index e8bfa598f..9e826f645 100644 --- a/frontend/src/redux/editor/reducers.ts +++ b/frontend/src/redux/editor/reducers.ts @@ -14,7 +14,7 @@ export const initialState: EditorConfig = { ligatures: true, syncScroll: true, smartPaste: true, - spellCheck: false, + spellCheck: true, lineWrapping: true } diff --git a/frontend/src/redux/editor/types.ts b/frontend/src/redux/editor/types.ts index e64a5b638..cfd95a14c 100644 --- a/frontend/src/redux/editor/types.ts +++ b/frontend/src/redux/editor/types.ts @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 The HedgeDoc developers (see AUTHORS file) + * SPDX-FileCopyrightText: 2023 The HedgeDoc developers (see AUTHORS file) * * SPDX-License-Identifier: AGPL-3.0-only */ @@ -28,7 +28,7 @@ export type EditorConfigActions = | SetEditorLigaturesAction | SetEditorSmartPasteAction | SetEditorLineWrappingAction - | SetSpellCheckAction + | SetEditorSpellCheckAction | LoadFromLocalStorageAction export interface LoadFromLocalStorageAction extends Action { @@ -55,7 +55,7 @@ export interface SetEditorSmartPasteAction extends Action { +export interface SetEditorSpellCheckAction extends Action { type: EditorConfigActionType.SET_SPELL_CHECK spellCheck: boolean }