From bcae582a8af2d36a8e3c7340c215f636283b906b Mon Sep 17 00:00:00 2001 From: Himself65 Date: Wed, 17 May 2023 17:15:12 -0700 Subject: [PATCH] refactor: remove unused code (#2425) --- apps/web/src/providers/theme-provider.tsx | 8 ++--- packages/component/src/styles/index.ts | 2 -- .../src/styles/mui-theme-provider.tsx | 28 +----------------- packages/component/src/styles/mui-theme.ts | 2 -- packages/component/src/styles/types.ts | 13 --------- packages/component/src/styles/utils/index.ts | 2 -- .../utils/local-storage-theme-helper.ts | 13 --------- .../src/styles/utils/system-theme-helper.ts | 29 ------------------- 8 files changed, 3 insertions(+), 94 deletions(-) delete mode 100644 packages/component/src/styles/types.ts delete mode 100644 packages/component/src/styles/utils/index.ts delete mode 100644 packages/component/src/styles/utils/local-storage-theme-helper.ts delete mode 100644 packages/component/src/styles/utils/system-theme-helper.ts diff --git a/apps/web/src/providers/theme-provider.tsx b/apps/web/src/providers/theme-provider.tsx index 4182cf4f9bd24..ec67f3da41824 100644 --- a/apps/web/src/providers/theme-provider.tsx +++ b/apps/web/src/providers/theme-provider.tsx @@ -1,4 +1,3 @@ -import type { ThemeProviderProps } from '@affine/component'; import { ThemeProvider as NextThemeProvider, useTheme } from 'next-themes'; import type { PropsWithChildren } from 'react'; import { memo, useRef } from 'react'; @@ -21,12 +20,9 @@ const DesktopThemeSync = memo(function DesktopThemeSync() { return null; }); -export const ThemeProvider = ({ - children, - ...props -}: PropsWithChildren) => { +export const ThemeProvider = ({ children }: PropsWithChildren) => { return ( - + {children} diff --git a/packages/component/src/styles/index.ts b/packages/component/src/styles/index.ts index dfeaa6fb37dc3..575d48515d576 100644 --- a/packages/component/src/styles/index.ts +++ b/packages/component/src/styles/index.ts @@ -1,5 +1,3 @@ export * from './helper'; export * from './mui-theme'; export * from './mui-theme-provider'; -export * from './types'; -export * from './utils'; diff --git a/packages/component/src/styles/mui-theme-provider.tsx b/packages/component/src/styles/mui-theme-provider.tsx index de5704b9b17ce..7d1e11ef4e923 100644 --- a/packages/component/src/styles/mui-theme-provider.tsx +++ b/packages/component/src/styles/mui-theme-provider.tsx @@ -1,29 +1,3 @@ -import { CssBaseline } from '@mui/material'; -import { - alpha, - createTheme as createMuiTheme, - css, - keyframes, - styled, - type ThemeOptions, - ThemeProvider as MuiThemeProvider, -} from '@mui/material/styles'; -import type { PropsWithChildren } from 'react'; -import { useMemo } from 'react'; +import { alpha, css, keyframes, styled } from '@mui/material/styles'; export { alpha, css, keyframes, styled }; - -export const AffineMuiThemeProvider = ({ - theme, - children, -}: PropsWithChildren<{ - theme: ThemeOptions; -}>) => { - const muiTheme = useMemo(() => createMuiTheme(theme), [theme]); - return ( - - - {children} - - ); -}; diff --git a/packages/component/src/styles/mui-theme.ts b/packages/component/src/styles/mui-theme.ts index 7e515740a49af..35da7f787c9e7 100644 --- a/packages/component/src/styles/mui-theme.ts +++ b/packages/component/src/styles/mui-theme.ts @@ -1,5 +1,3 @@ -import '@emotion/react'; - import type { Breakpoint, BreakpointsOptions, diff --git a/packages/component/src/styles/types.ts b/packages/component/src/styles/types.ts deleted file mode 100644 index 13f0721fa86c2..0000000000000 --- a/packages/component/src/styles/types.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { AffineTheme } from '@toeverything/theme'; - -export type ThemeProviderProps = { - defaultTheme?: Theme; -}; - -export type Theme = 'light' | 'dark'; -export type ThemeMode = Theme | 'auto'; - -declare module '@emotion/react' { - // eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface Theme extends AffineTheme {} -} diff --git a/packages/component/src/styles/utils/index.ts b/packages/component/src/styles/utils/index.ts deleted file mode 100644 index 6e5300c818817..0000000000000 --- a/packages/component/src/styles/utils/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './local-storage-theme-helper'; -export * from './system-theme-helper'; diff --git a/packages/component/src/styles/utils/local-storage-theme-helper.ts b/packages/component/src/styles/utils/local-storage-theme-helper.ts deleted file mode 100644 index be9961e6abfbb..0000000000000 --- a/packages/component/src/styles/utils/local-storage-theme-helper.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { ThemeMode } from '../types'; - -export class LocalStorageThemeHelper { - name = 'Affine-theme-mode'; - get = (): ThemeMode | null => { - return localStorage.getItem(this.name) as ThemeMode | null; - }; - set = (mode: ThemeMode) => { - localStorage.setItem(this.name, mode); - }; -} - -export const localStorageThemeHelper = new LocalStorageThemeHelper(); diff --git a/packages/component/src/styles/utils/system-theme-helper.ts b/packages/component/src/styles/utils/system-theme-helper.ts deleted file mode 100644 index 9b817c140f666..0000000000000 --- a/packages/component/src/styles/utils/system-theme-helper.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type { Theme } from '../types'; - -export class SystemThemeHelper { - media: MediaQueryList = window.matchMedia('(prefers-color-scheme: light)'); - eventList: Array<(e: Event) => void> = []; - eventHandler = (e: Event) => { - this.eventList.forEach(fn => fn(e)); - }; - - constructor() { - this.media.addEventListener('change', this.eventHandler); - } - - get = (): Theme => { - if (typeof window === 'undefined') { - return 'light'; - } - return this.media.matches ? 'light' : 'dark'; - }; - - onChange = (callback: () => void) => { - this.eventList.push(callback); - }; - - dispose = () => { - this.eventList = []; - this.media.removeEventListener('change', this.eventHandler); - }; -}