feat(electron): spellcheck setting (#8730)

fix AF-1647
This commit is contained in:
pengx17
2024-11-11 13:03:33 +00:00
parent b3749246f6
commit 35f3fc7b5d
12 changed files with 172 additions and 65 deletions

View File

@@ -15,22 +15,26 @@ import {
SettingRow,
SettingWrapper,
} from '@affine/component/setting-components';
import { useAsyncCallback } from '@affine/core/components/hooks/affine-async-hooks';
import { ServerConfigService } from '@affine/core/modules/cloud';
import { DesktopApiService } from '@affine/core/modules/desktop-api';
import {
EditorSettingService,
type FontFamily,
fontStyleOptions,
} from '@affine/core/modules/editor-setting';
import { SpellCheckSettingService } from '@affine/core/modules/editor-setting/services/spell-check-setting';
import {
type FontData,
SystemFontFamilyService,
} from '@affine/core/modules/system-font-family';
import { useI18n } from '@affine/i18n';
import { Trans, useI18n } from '@affine/i18n';
import type { DocMode } from '@blocksuite/affine/blocks';
import { DoneIcon, SearchIcon } from '@blocksuite/icons/rc';
import {
FeatureFlagService,
useLiveData,
useService,
useServices,
} from '@toeverything/infra';
import clsx from 'clsx';
@@ -41,10 +45,10 @@ import {
useCallback,
useEffect,
useMemo,
useState,
} from 'react';
import { Virtuoso } from 'react-virtuoso';
import { DropdownMenu } from './menu';
import * as styles from './style.css';
const getLabel = (fontKey: FontFamily, t: ReturnType<typeof useI18n>) => {
@@ -351,55 +355,6 @@ const NewDocDefaultModeSettings = () => {
);
};
export const DeFaultCodeBlockSettings = () => {
const t = useI18n();
return (
<>
<SettingRow
name={t[
'com.affine.settings.editorSettings.general.default-code-block.language.title'
]()}
desc={t[
'com.affine.settings.editorSettings.general.default-code-block.language.description'
]()}
>
<DropdownMenu
items={<MenuItem>Plain Text</MenuItem>}
trigger={
<MenuTrigger className={styles.menuTrigger} disabled>
Plain Text
</MenuTrigger>
}
/>
</SettingRow>
<SettingRow
name={t[
'com.affine.settings.editorSettings.general.default-code-block.wrap.title'
]()}
desc={t[
'com.affine.settings.editorSettings.general.default-code-block.wrap.description'
]()}
>
<Switch />
</SettingRow>
</>
);
};
export const SpellCheckSettings = () => {
const t = useI18n();
return (
<SettingRow
name={t['com.affine.settings.editorSettings.general.spell-check.title']()}
desc={t[
'com.affine.settings.editorSettings.general.spell-check.description'
]()}
>
<Switch />
</SettingRow>
);
};
const AISettings = () => {
const t = useI18n();
const { openConfirmModal } = useConfirmModal();
@@ -460,6 +415,56 @@ const AISettings = () => {
);
};
const SpellCheckSettings = () => {
const t = useI18n();
const spellCheckSetting = useService(SpellCheckSettingService);
const desktopApiService = useService(DesktopApiService);
const enabled = useLiveData(spellCheckSetting.enabled$)?.enabled;
const [requireRestart, setRequireRestart] = useState(false);
const onToggleSpellCheck = useCallback(
(checked: boolean) => {
spellCheckSetting.setEnabled(checked);
setRequireRestart(true);
},
[spellCheckSetting]
);
const onRestart = useAsyncCallback(async () => {
await desktopApiService.handler.ui.restartApp();
}, [desktopApiService]);
return (
<SettingRow
name={t['com.affine.settings.editorSettings.general.spell-check.title']()}
desc={
requireRestart ? (
<div className={styles.spellCheckSettingDescription}>
<Trans i18nKey="com.affine.settings.editorSettings.general.spell-check.restart-hint">
Settings changed; please restart the app.
<button
onClick={onRestart}
className={styles.spellCheckSettingDescriptionButton}
>
Restart
</button>
</Trans>
</div>
) : (
t[
'com.affine.settings.editorSettings.general.spell-check.description'
]()
)
}
>
<Switch checked={enabled} onChange={onToggleSpellCheck} />
</SettingRow>
);
};
export const General = () => {
const t = useI18n();
@@ -469,9 +474,10 @@ export const General = () => {
<FontFamilySettings />
<CustomFontFamilySettings />
<NewDocDefaultModeSettings />
{BUILD_CONFIG.isElectron && <SpellCheckSettings />}
{/* // TODO(@akumatus): implement these settings
<DeFaultCodeBlockSettings />
<SpellCheckSettings /> */}
<DeFaultCodeBlockSettings />
*/}
</SettingWrapper>
);
};

View File

@@ -154,3 +154,12 @@ export const notFound = style({
fontSize: cssVar('fontXs'),
padding: '4px',
});
export const spellCheckSettingDescription = style({
color: cssVarV2('toast/iconState/error'),
});
export const spellCheckSettingDescriptionButton = style({
color: cssVarV2('text/link'),
fontSize: 'inherit',
});

View File

@@ -15,7 +15,7 @@ type SettingItem<T> = {
readonly value: T;
set: (value: T) => void;
// eslint-disable-next-line rxjs/finnish
$: T;
$: LiveData<T>;
};
export class EditorSetting extends Entity {

View File

@@ -1,10 +1,15 @@
import { type Framework, GlobalState } from '@toeverything/infra';
import {
type Framework,
GlobalState,
GlobalStateService,
} from '@toeverything/infra';
import { UserDBService } from '../userspace';
import { EditorSetting } from './entities/editor-setting';
import { CurrentUserDBEditorSettingProvider } from './impls/user-db';
import { EditorSettingProvider } from './provider/editor-setting-provider';
import { EditorSettingService } from './services/editor-setting';
import { SpellCheckSettingService } from './services/spell-check-setting';
export type { FontFamily } from './schema';
export { EditorSettingSchema, fontStyleOptions } from './schema';
export { EditorSettingService } from './services/editor-setting';
@@ -18,3 +23,7 @@ export function configureEditorSettingModule(framework: Framework) {
GlobalState,
]);
}
export function configureSpellCheckSettingModule(framework: Framework) {
framework.service(SpellCheckSettingService, [GlobalStateService]);
}

View File

@@ -20,7 +20,6 @@ const AffineEditorSettingSchema = z.object({
fontFamily: z.enum(['Sans', 'Serif', 'Mono', 'Custom']).default('Sans'),
customFontFamily: z.string().default(''),
newDocDefaultMode: z.enum(['edgeless', 'page']).default('page'),
spellCheck: z.boolean().default(false),
fullWidthLayout: z.boolean().default(false),
displayDocInfo: z.boolean().default(true),
displayBiDirectionalLink: z.boolean().default(true),

View File

@@ -0,0 +1,27 @@
import type {
SpellCheckStateKey,
SpellCheckStateSchema,
} from '@affine/electron/main/shared-state-schema';
import type { GlobalStateService } from '@toeverything/infra';
import { LiveData, Service } from '@toeverything/infra';
const SPELL_CHECK_SETTING_KEY: SpellCheckStateKey = 'spellCheckState';
export class SpellCheckSettingService extends Service {
constructor(private readonly globalStateService: GlobalStateService) {
super();
}
enabled$ = LiveData.from(
this.globalStateService.globalState.watch<
SpellCheckStateSchema | undefined
>(SPELL_CHECK_SETTING_KEY),
{ enabled: false }
);
setEnabled(enabled: boolean) {
this.globalStateService.globalState.set(SPELL_CHECK_SETTING_KEY, {
enabled,
});
}
}