feat: ThemeProvider revisited!

and removed completely! We don't need it anymore!
React95 · Mar 3, 2024 · 233e3aa · 233e3aa
1 parent eb6a76f
commit 233e3aa
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 80 deletions.
diff --git a/packages/core/.storybook/preview.js b/packages/core/.storybook/preview.js
@@ -1,7 +1,7 @@
 import Frame from './decorators/Frame';
-import { withThemes } from './src/theme-changer/withThemes';
 
 import './preview.css';
+import { withModal } from './src/theme-changer/decorators';
 
 export const globalTypes = {
   selectedTheme: {
@@ -11,4 +11,4 @@ export const globalTypes = {
   },
 };
 
-export const decorators = [Frame, withThemes];
+export const decorators = [Frame, withModal];
diff --git a/packages/core/.storybook/src/clippy-addon/register.jsx b/packages/core/.storybook/src/clippy-addon/register.jsx
@@ -7,7 +7,6 @@ import { createGlobalStyle } from 'styled-components';
 
 import { Modal } from '../../../components/Modal';
 import List from '../../../components/List';
-import ThemeProvider from '../../../components/ThemeProvider';
 import TextArea from '../../../components/TextArea';
 
 const ClippyStyle = createGlobalStyle`
@@ -209,7 +208,7 @@ class Clippy extends React.Component {
     ].join('\n');
 
     return (
-      <ThemeProvider>
+      <>
         <ClippyStyle />
         {showModal && (
           <Modal
@@ -267,7 +266,7 @@ class Clippy extends React.Component {
             />
           </Modal>
         )}
-      </ThemeProvider>
+      </>
     );
   }
 }

diff --git a/packages/core/.storybook/src/theme-changer/decorators.jsx b/packages/core/.storybook/src/theme-changer/decorators.jsx
@@ -0,0 +1,8 @@
+import * as React from 'react';
+import { ModalProvider } from '../../../components/Modal';
+
+export const withModal = (Story, context) => (
+  <ModalProvider>
+    <Story {...context} />
+  </ModalProvider>
+);
diff --git a/packages/core/.storybook/src/theme-changer/src/extractThemes.js b/packages/core/.storybook/src/theme-changer/src/extractThemes.js
diff --git a/packages/core/.storybook/src/theme-changer/withThemes.jsx b/packages/core/.storybook/src/theme-changer/withThemes.jsx
diff --git a/packages/core/components/ThemeProvider/ThemeProvider.tsx b/packages/core/components/ThemeProvider/ThemeProvider.tsx
diff --git a/packages/core/components/ThemeProvider/index.ts b/packages/core/components/ThemeProvider/index.ts
diff --git a/packages/core/components/index.ts b/packages/core/components/index.ts
@@ -19,7 +19,6 @@ import TextArea from './TextArea';
 import Tree from './Tree';
 import Tooltip from './Tooltip';
 import TitleBar from './TitleBar';
-import ThemeProvider from './ThemeProvider';
 import Video from './Video';
 
 export {
@@ -46,6 +45,5 @@ export {
   Tree,
   Tooltip,
   TitleBar,
-  ThemeProvider,
   Video,
 };
diff --git a/packages/core/components/shared/test/utils.ts b/packages/core/components/shared/test/utils.ts
@@ -2,25 +2,14 @@ import {
   RenderOptions,
   RenderResult,
   act,
-  cleanup,
   render,
 } from '@testing-library/react';
-import ThemeProvider from '../../ThemeProvider';
-
-const customRender = (
-  ui: React.ReactElement,
-  options?: Omit<RenderOptions, 'queries'>,
-) => {
-  cleanup();
-
-  return render(ui, { wrapper: ThemeProvider, ...options });
-};
 
 const waitRender = async (
   ui: React.ReactElement,
   options?: Omit<RenderOptions, 'queries'>,
 ): Promise<RenderResult> => {
-  const { container, ...rest } = customRender(ui, options);
+  const { container, ...rest } = render(ui, options);
 
   await act(async () => {
     await Promise.resolve(container);
@@ -31,4 +20,4 @@ const waitRender = async (
 
 export * from '@testing-library/react';
 
-export { customRender as render, waitRender };
+export { render, waitRender };