fix: font style setting only control editor's font (#3117)

Co-authored-by: Alex Yang <himself65@outlook.com>

apps/web/src/atoms/settings.ts

@@ -1,6 +1,5 @@
-import { useAtom } from 'jotai';
+import { atom, useAtom } from 'jotai';
 import { atomWithStorage } from 'jotai/utils';
-import { useCallback } from 'react';
 
 export type DateFormats =
   | 'MM/dd/YYYY'
@@ -15,7 +14,7 @@ export type AppSetting = {
   clientBorder: boolean;
   fullWidthLayout: boolean;
   windowFrameStyle: 'frameless' | 'NativeTitleBar';
-  fontStyle: 'Sans' | 'Serif' | 'Mono';
+  fontStyle: FontFamily;
   dateFormat: DateFormats;
   startWeekOnMonday: boolean;
   enableBlurBackground: boolean;
@@ -38,16 +37,18 @@ export const dateFormatOptions: DateFormats[] = [
   'dd MMMM YYYY',
 ];
 
-export const fontStyleOptions: {
+export type FontFamily = 'Sans' | 'Serif' | 'Mono';
-  key: AppSetting['fontStyle'];
+
-  value: string;
+export const fontStyleOptions = [
-}[] = [
   { key: 'Sans', value: 'var(--affine-font-sans-family)' },
   { key: 'Serif', value: 'var(--affine-font-serif-family)' },
   { key: 'Mono', value: 'var(--affine-font-mono-family)' },
-];
+] satisfies {
+  key: FontFamily;
+  value: string;
+}[];
 
-export const AppSettingAtom = atomWithStorage<AppSetting>('AFFiNE settings', {
+const appSettingBaseAtom = atomWithStorage<AppSetting>('affine-settings', {
   clientBorder: false,
   fullWidthLayout: false,
   windowFrameStyle: 'frameless',
@@ -60,19 +61,21 @@ export const AppSettingAtom = atomWithStorage<AppSetting>('AFFiNE settings', {
   autoDownloadUpdate: true,
 });
 
-export const useAppSetting = () => {
+type SetStateAction<Value> = Value | ((prev: Value) => Value);
-  const [settings, setSettings] = useAtom(AppSettingAtom);
 
-  return [
+const appSettingAtom = atom<
-    settings,
+  AppSetting,
-    useCallback(
+  [SetStateAction<Partial<AppSetting>>],
-      (patch: Partial<AppSetting>) => {
+  void
-        setSettings((prev: AppSetting) => ({
+>(
-          ...prev,
+  get => get(appSettingBaseAtom),
-          ...patch,
+  (get, set, apply) => {
-        }));
+    const prev = get(appSettingBaseAtom);
-      },
+    const next = typeof apply === 'function' ? apply(prev) : apply;
-      [setSettings]
+    set(appSettingBaseAtom, { ...prev, ...next });
-    ),
+  }
-  ] as const;
+);
+
+export const useAppSetting = () => {
+  return useAtom(appSettingAtom);
 };

apps/web/src/components/affine/setting-modal/general-setting/appearance/index.tsx

@@ -58,14 +58,7 @@ const FontFamilySettings = () => {
       defaultValue={appSettings.fontStyle}
       onValueChange={useCallback(
         (key: AppSetting['fontStyle']) => {
-          const value = fontStyleOptions.find(option => option.key === key)
-            ?.value;
-
           setAppSettings({ fontStyle: key });
-
-          document
-            .querySelector('html')
-            ?.style.setProperty('--affine-font-family', value || null);
         },
         [setAppSettings]
       )}

apps/web/src/components/page-detail-editor.tsx

@@ -21,13 +21,13 @@ import type { PluginBlockSuiteAdapter } from '@toeverything/plugin-infra/type';
 import clsx from 'clsx';
 import { useAtomValue, useSetAtom } from 'jotai';
 import Head from 'next/head';
-import type { FC, ReactElement } from 'react';
+import type { CSSProperties, FC, ReactElement } from 'react';
-import React, { memo, Suspense, useCallback, useMemo } from 'react';
+import { memo, Suspense, useCallback, useMemo } from 'react';
 import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
 
 import { pageSettingFamily } from '../atoms';
 import { contentLayoutAtom } from '../atoms/layout';
-import { useAppSetting } from '../atoms/settings';
+import { fontStyleOptions, useAppSetting } from '../atoms/settings';
 import { BlockSuiteEditor as Editor } from './blocksuite/block-suite-editor';
 import { editor } from './page-detail-editor.css';
 import { pluginContainer } from './page-detail-editor.css';
@@ -69,12 +69,24 @@ const EditorWrapper = memo(function EditorWrapper({
   const [appSettings] = useAppSetting();
 
   assertExists(meta);
+  const value = useMemo(() => {
+    const fontStyle = fontStyleOptions.find(
+      option => option.key === appSettings.fontStyle
+    );
+    assertExists(fontStyle);
+    return fontStyle.value;
+  }, [appSettings.fontStyle]);
 
   return (
     <Editor
       className={clsx(editor, {
-        'full-screen': appSettings?.fullWidthLayout,
+        'full-screen': appSettings.fullWidthLayout,
       })}
+      style={
+        {
+          '--affine-font-family': value,
+        } as CSSProperties
+      }
       key={`${workspace.id}-${pageId}`}
       mode={isPublic ? 'page' : currentMode}
       page={page}

packages/component/src/components/workspace/index.tsx

@@ -55,7 +55,7 @@ export const WorkspaceFallback = (): ReactElement => {
   return (
     <AppContainer>
       <AppSidebarFallback />
-      <MainContainer></MainContainer>
+      <MainContainer />
     </AppContainer>
   );
 };