IMPROVE the double theming

storybookjs · Jun 25, 2020 · b383c17 · b383c17
1 parent 7a1bba1
commit b383c17
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 56 deletions.
diff --git a/examples/official-storybook/preview.js b/examples/official-storybook/preview.js
@@ -1,7 +1,15 @@
-import React, { Fragment } from 'react';
+import React, { Fragment, useEffect } from 'react';
 import { isChromatic } from 'chromatic';
 import { addDecorator, addParameters } from '@storybook/react';
-import { Global, ThemeProvider, themes, createReset, convert, styled } from '@storybook/theming';
+import {
+  Global,
+  ThemeProvider,
+  themes,
+  createReset,
+  convert,
+  styled,
+  useTheme,
+} from '@storybook/theming';
 import { withCssResources } from '@storybook/addon-cssresources';
 import { DocsPage } from '@storybook/addon-docs/blocks';
 
@@ -26,18 +34,6 @@ addHeadWarning('dotenv-file-not-loaded', 'Dotenv file not loaded');
 
 addDecorator(withCssResources);
 
-const themeDecorator = (storyFn, { globalArgs: { theme } }) => {
-  const selectedTheme = theme === 'dark' ? themes.dark : themes.light;
-  return (
-    <ThemeProvider theme={convert(selectedTheme)}>
-      <Global styles={createReset} />
-      {storyFn()}
-    </ThemeProvider>
-  );
-};
-
-addDecorator(themeDecorator);
-
 const ThemeBlock = styled.div(
   {
     position: 'absolute',
@@ -66,27 +62,75 @@ const ThemeBlock = styled.div(
         }
 );
 
-addDecorator((storyFn) =>
-  isChromatic() ? (
-    <Fragment>
-      <ThemeProvider theme={convert(themes.light)}>
-        <Global styles={createReset} />
-      </ThemeProvider>
-      <ThemeProvider theme={convert(themes.light)}>
-        <ThemeBlock side="left">{storyFn()}</ThemeBlock>
-      </ThemeProvider>
-      <ThemeProvider theme={convert(themes.dark)}>
-        <ThemeBlock side="right">{storyFn()}</ThemeBlock>
-      </ThemeProvider>
-    </Fragment>
-  ) : (
-    <ThemeProvider theme={convert(themes.light)}>
-      <Global styles={createReset} />
-      {storyFn()}
-    </ThemeProvider>
-  )
+const ThemeStack = styled.div(
+  {
+    position: 'relative',
+    minHeight: 'calc(50vh - 15px)',
+  },
+  ({ theme }) => ({
+    background: theme.background.app,
+    color: theme.color.defaultText,
+  })
 );
 
+const ThemedSetRoot = () => {
+  const theme = useTheme();
+
+  useEffect(() => {
+    document.body.style.background = theme.background.app;
+    document.body.style.color = theme.defaultText;
+    return () => {
+      //
+    };
+  });
+
+  return null;
+};
+
+addDecorator((storyFn, { globalArgs: { theme = 'light' } }) => {
+  switch (theme) {
+    case 'side-by-side': {
+      return (
+        <Fragment>
+          <ThemeProvider theme={convert(themes.light)}>
+            <Global styles={createReset} />
+          </ThemeProvider>
+          <ThemeProvider theme={convert(themes.light)}>
+            <ThemeBlock side="left">{storyFn()}</ThemeBlock>
+          </ThemeProvider>
+          <ThemeProvider theme={convert(themes.dark)}>
+            <ThemeBlock side="right">{storyFn()}</ThemeBlock>
+          </ThemeProvider>
+        </Fragment>
+      );
+    }
+    case 'stacked': {
+      return (
+        <Fragment>
+          <ThemeProvider theme={convert(themes.light)}>
+            <Global styles={createReset} />
+          </ThemeProvider>
+          <ThemeProvider theme={convert(themes.light)}>
+            <ThemeStack side="left">{storyFn()}</ThemeStack>
+          </ThemeProvider>
+          <ThemeProvider theme={convert(themes.dark)}>
+            <ThemeStack side="right">{storyFn()}</ThemeStack>
+          </ThemeProvider>
+        </Fragment>
+      );
+    }
+    default: {
+      return (
+        <ThemeProvider theme={convert(themes[theme])}>
+          <Global styles={createReset} />
+          <ThemedSetRoot />
+          {storyFn()}
+        </ThemeProvider>
+      );
+    }
+  }
+});
+
 addParameters({
   a11y: {
     config: {},
@@ -99,14 +143,6 @@ addParameters({
     storySort: (a, b) =>
       a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, undefined, { numeric: true }),
   },
-  backgrounds: {
-    default: 'storybook app',
-    values: [
-      { name: 'storybook app', value: themes.light.appBg },
-      { name: 'light', value: '#eeeeee' },
-      { name: 'dark', value: '#222222' },
-    ],
-  },
   docs: {
     theme: themes.light,
     page: () => <DocsPage subtitleSlot={({ kind }) => `Subtitle: ${kind}`} />,
@@ -127,13 +163,14 @@ export const globalArgTypes = {
   theme: {
     name: 'Theme',
     description: 'Global theme for components',
-    defaultValue: null,
+    defaultValue: isChromatic() ? 'stacked' : 'light',
     toolbar: {
       icon: 'circlehollow',
-      // items: ['light', 'dark'],
       items: [
         { value: 'light', icon: 'circlehollow', title: 'light' },
         { value: 'dark', icon: 'circle', title: 'dark' },
+        { value: 'side-by-side', icon: 'sidebar', title: 'side by side' },
+        { value: 'stacked', icon: 'bottombar', title: 'stacked' },
       ],
     },
   },

diff --git a/lib/ui/src/components/sidebar/Sidebar.stories.tsx b/lib/ui/src/components/sidebar/Sidebar.stories.tsx
@@ -123,16 +123,3 @@ export const isEmpty = () => (
 export const withRefs = () => (
   <Sidebar storiesConfigured menu={menu} stories={stories} isLoading refs={refs} />
 );
-
-export const darkWithRefs = () => (
-  <ThemeProvider theme={ensureTheme(themes.dark)}>
-    <Sidebar storiesConfigured menu={menu} stories={stories} isLoading refs={refs} />
-  </ThemeProvider>
-);
-
-darkWithRefs.parameters = {
-  backgrounds: {
-    default: 'dark',
-    values: [{ name: 'dark', value: '#222222', default: true }],
-  },
-};