Главная Обзор Помощь
Вход
wiki
/
weseek__growi
зеркало из https://github.com/weseek/growi
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

remove ThemeProvider

Yuki Takei 3 лет назад
Родитель
6a7bcbf61f
Сommit
b05571f437
3 измененных файлов с 4 добавлено и 111 удалено
Единый вид Показать статистику Diff
  1. 4 9
      packages/app/src/components/Layout/RawLayout.tsx
  2. 0 36
      packages/app/src/components/Theme/utils/ThemeInjector.tsx
  3. 0 66
      packages/app/src/components/Theme/utils/ThemeProvider.tsx

+ 4 - 9
packages/app/src/components/Layout/RawLayout.tsx
Просмотреть файл 

@@ -9,9 +9,6 @@ import { ColorScheme, useNextThemes, NextThemesProvider } from '~/stores/use-nex
 
 import loggerFactory from '~/utils/logger';
 
 import loggerFactory from '~/utils/logger';
 
 
 
 
 
-import { ThemeProvider as GrowiThemeProvider } from '../Theme/utils/ThemeProvider';
 
-
 
-
 
 const logger = loggerFactory('growi:cli:RawLayout');
 
 const logger = loggerFactory('growi:cli:RawLayout');
 
 
 
 
 
@@ -46,12 +43,10 @@ export const RawLayout = ({ children, title, className }: Props): JSX.Element =>
 
         <meta name="viewport" content="initial-scale=1.0, width=device-width" />
 
         <meta name="viewport" content="initial-scale=1.0, width=device-width" />
 
       </Head>
 
       </Head>
 
       <NextThemesProvider>
 
       <NextThemesProvider>
 
-        <GrowiThemeProvider theme={growiTheme} colorScheme={colorScheme}>
 
-          <div className={classNames.join(' ')} data-color-scheme={colorScheme}>
 
-            {children}
 
-            <ToastContainer theme={colorScheme} />
 
-          </div>
 
-        </GrowiThemeProvider>
 
+        <div className={classNames.join(' ')} data-color-scheme={colorScheme}>
 
+          {children}
 
+          <ToastContainer theme={colorScheme} />
 
+        </div>
 
       </NextThemesProvider>
 
       </NextThemesProvider>
 
     </>
 
     </>
 
   );
 
   );

+ 0 - 36
packages/app/src/components/Theme/utils/ThemeInjector.tsx
Просмотреть файл 

@@ -1,36 +0,0 @@
 
-
 
-import React from 'react';
 
-
 
-import { useIsomorphicLayoutEffect } from 'usehooks-ts';
 
-
 
-type Props = {
 
-  children: JSX.Element,
 
-  bodyTagClassName?: string,
 
-  className?: string,
 
-  bgImageNode?: React.ReactNode,
 
-}
 
-
 
-export const ThemeInjector = ({
 
-  children, bodyTagClassName, className: childrenClassName, bgImageNode,
 
-}: Props): JSX.Element => {
 
-  const className = `${children.props.className ?? ''} ${childrenClassName ?? ''}`;
 
-
 
-  // add class name to <body>
 
-  useIsomorphicLayoutEffect(() => {
 
-    if (bodyTagClassName != null) {
 
-      document.body.classList.add(bodyTagClassName);
 
-    }
 
-
 
-    // clean up
 
-    return () => {
 
-      if (bodyTagClassName != null) {
 
-        document.body.classList.remove(bodyTagClassName);
 
-      }
 
-    };
 
-  });
 
-
 
-  return React.cloneElement(children, { className }, [
 
-    <div key="grw-bg-image-wrapper" className="grw-bg-image-wrapper">{bgImageNode}</div>,
 
-    children.props.children,
 
-  ]);
 
-};

+ 0 - 66
packages/app/src/components/Theme/utils/ThemeProvider.tsx
Просмотреть файл 

@@ -1,66 +0,0 @@
 
-
 
-import React from 'react';
 
-
 
-import dynamic from 'next/dynamic';
 
-
 
-import { GrowiThemes } from '~/interfaces/theme';
 
-import { Themes } from '~/stores/use-next-themes';
 
-
 
-
 
-// const ThemeAntarctic = dynamic(() => import('../ThemeAntarctic'));
 
-// const ThemeBlackboard = dynamic(() => import('../ThemeBlackboard'));
 
-// const ThemeChristmas = dynamic(() => import('../ThemeChristmas'));
 
-const ThemeDefault = dynamic(() => import('../ThemeDefault'));
 
-// const ThemeFireRed = dynamic(() => import('../ThemeFireRed'));
 
-// const ThemeFuture = dynamic(() => import('../ThemeFuture'));
 
-// const ThemeHalloween = dynamic(() => import('../ThemeHalloween'));
 
-// const ThemeHufflepuff = dynamic(() => import('../ThemeHufflepuff'));
 
-// const ThemeIsland = dynamic(() => import('../ThemeIsland'));
 
-// const ThemeJadeGreen = dynamic(() => import('../ThemeJadeGreen'));
 
-// const ThemeKibela = dynamic(() => import('../ThemeKibela'));
 
-// const ThemeMonoBlue = dynamic(() => import('../ThemeMonoBlue'));
 
-// const ThemeNature = dynamic(() => import('../ThemeNature'));
 
-// const ThemeSpring = dynamic(() => import('../ThemeSpring'));
 
-// const ThemeWood = dynamic(() => import('../ThemeWood'));
 
-
 
-
 
-type Props = {
 
-  children: JSX.Element,
 
-  theme?: GrowiThemes,
 
-  colorScheme?: Themes,
 
-}
 
-
 
-export const ThemeProvider = ({ theme, children, colorScheme }: Props): JSX.Element => {
 
-  switch (theme) {
 
-    // case GrowiThemes.ANTARCTIC:
 
-    //   return <ThemeAntarctic colorScheme={colorScheme}>{children}</ThemeAntarctic>;
 
-    // case GrowiThemes.BLACKBOARD:
 
-    //   return <ThemeBlackboard>{children}</ThemeBlackboard>;
 
-    // case GrowiThemes.CHRISTMAS:
 
-    //   return <ThemeChristmas colorScheme={colorScheme}>{children}</ThemeChristmas>;
 
-    // case GrowiThemes.FIRE_RED:
 
-    //   return <ThemeFireRed>{children}</ThemeFireRed>;
 
-    // case GrowiThemes.FUTURE:
 
-    //   return <ThemeFuture>{children}</ThemeFuture>;
 
-    // case GrowiThemes.HALLOWEEN:
 
-    //   return <ThemeHalloween colorScheme={colorScheme}>{children}</ThemeHalloween>;
 
-    // case GrowiThemes.HUFFLEPUFF:
 
-    //   return <ThemeHufflepuff colorScheme={colorScheme}>{children}</ThemeHufflepuff>;
 
-    // case GrowiThemes.ISLAND:
 
-    //   return <ThemeIsland colorScheme={colorScheme}>{children}</ThemeIsland>;
 
-    // case GrowiThemes.JADE_GREEN:
 
-    //   return <ThemeJadeGreen>{children}</ThemeJadeGreen>;
 
-    // case GrowiThemes.KIBELA:
 
-    //   return <ThemeKibela>{children}</ThemeKibela>;
 
-    // case GrowiThemes.MONO_BLUE:
 
-    //   return <ThemeMonoBlue>{children}</ThemeMonoBlue>;
 
-    // case GrowiThemes.NATURE:
 
-    //   return <ThemeNature>{children}</ThemeNature>;
 
-    // case GrowiThemes.SPRING:
 
-    //   return <ThemeSpring colorScheme={colorScheme}>{children}</ThemeSpring>;
 
-    // case GrowiThemes.WOOD:
 
-    //   return <ThemeWood colorScheme={colorScheme}>{children}</ThemeWood>;
 
-    default:
 
-      return <ThemeDefault>{children}</ThemeDefault>;
 
-  }
 
-};