fix: remove pageMode from pageMeta (#1647)

This commit is contained in:
Himself65
2023-03-21 19:45:54 -05:00
committed by GitHub
parent e7d6bda7a5
commit 45260543e1
7 changed files with 40 additions and 27 deletions
+4 -6
View File
@@ -6,14 +6,14 @@ import {
ThemeProvider as AffineThemeProvider,
} from '@affine/component';
import { GlobalStyles } from '@mui/material';
import { useAtomValue } from 'jotai';
import { ThemeProvider as NextThemeProvider, useTheme } from 'next-themes';
import type { PropsWithChildren } from 'react';
import type React from 'react';
import { memo, useEffect, useMemo, useState } from 'react';
import { workspacePreferredModeAtom } from '../atoms';
import { useCurrentPage } from '../hooks/current/use-current-page-id';
import { useCurrentWorkspace } from '../hooks/current/use-current-workspace';
import { usePageMeta } from '../hooks/use-page-meta';
const ThemeInjector = memo<{
themeStyle: AffineTheme;
@@ -40,11 +40,9 @@ const ThemeInjector = memo<{
const ThemeProviderInner = memo<React.PropsWithChildren>(
function ThemeProviderInner({ children }) {
const { resolvedTheme: theme } = useTheme();
const [currentWorkspace] = useCurrentWorkspace();
const currentPage = useCurrentPage();
const pageMeta = usePageMeta(currentWorkspace?.blockSuiteWorkspace ?? null);
const editorMode =
pageMeta.find(page => page.id === currentPage?.id)?.mode ?? 'page';
const record = useAtomValue(workspacePreferredModeAtom);
const editorMode = currentPage ? record[currentPage.id] ?? 'page' : 'page';
const themeStyle = useMemo(() => getLightTheme(editorMode), [editorMode]);
const darkThemeStyle = useMemo(
() => getDarkTheme(editorMode),