Merge remote-tracking branch 'origin/master' into payment-system

This commit is contained in:
Joooye_34
2023-10-27 16:04:48 +08:00
87 changed files with 1004 additions and 581 deletions

View File

@@ -0,0 +1,23 @@
import { useAtom } from 'jotai';
import { useCallback, useMemo } from 'react';
import { type AppSetting, appSettingAtom } from '../../atoms/settings';
export function useAppSettingHelper() {
const [appSettings, setAppSettings] = useAtom(appSettingAtom);
const updateSettings = useCallback(
<K extends keyof AppSetting>(key: K, value: AppSetting[K]) => {
setAppSettings(prevSettings => ({ ...prevSettings, [key]: value }));
},
[setAppSettings]
);
return useMemo(
() => ({
appSettings,
updateSettings,
}),
[appSettings, updateSettings]
);
}

View File

@@ -16,7 +16,7 @@ export function useLanguageHelper() {
})),
[]
);
const onSelect = useCallback(
const onLanguageChange = useCallback(
(event: string) => {
i18n.changeLanguage(event);
},
@@ -27,8 +27,8 @@ export function useLanguageHelper() {
() => ({
currentLanguage,
languagesList,
onSelect,
onLanguageChange,
}),
[currentLanguage, languagesList, onSelect]
[currentLanguage, languagesList, onLanguageChange]
);
}

View File

@@ -0,0 +1,19 @@
import { appSidebarOpenAtom } from '@affine/component/app-sidebar';
import { useAtom } from 'jotai';
import { useCallback, useMemo } from 'react';
export function useSwitchSidebarStatus() {
const [isOpened, setOpened] = useAtom(appSidebarOpenAtom);
const onOpenChange = useCallback(() => {
setOpened(open => !open);
}, [setOpened]);
return useMemo(
() => ({
onOpenChange,
isOpened,
}),
[isOpened, onOpenChange]
);
}

View File

@@ -52,7 +52,7 @@ export function useRegisterWorkspaceCommands() {
languageHelper,
})
);
unsubs.push(registerAffineLayoutCommands({ store, t }));
unsubs.push(registerAffineLayoutCommands({ t, store }));
unsubs.push(
registerAffineCreationCommands({
store,