Address some storybook warnings

GoogleForCreators · Dec 2, 2023 · ab6c0e3 · ab6c0e3
1 parent 06704fa
commit ab6c0e3
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 45 deletions.
diff --git a/.storybook/main.cjs b/.storybook/main.cjs
@@ -29,25 +29,24 @@ module.exports = {
     '../packages/dashboard/src/**/stories/index.js',
     '../packages/story-editor/src/**/stories/index.js',
     '../packages/wp-dashboard/src/**/stories/index.js',
-    '../packages/wp-story-editor/src/**/stories/index.js',
     '../packages/activation-notice/src/**/stories/index.js',
     '../packages/design-system/src/**/stories/index.js',
     '../packages/animation/src/**/stories/*.js',
   ],
-  storyIndexers: (indexers) => {
-    const indexer = (fileName, opts) => {
+  experimental_indexers: (indexers) => {
+    const createIndex = async (fileName, opts) => {
       const code = readFileSync(fileName, {
         encoding: 'utf-8',
       });
       return loadCsf(code, {
         ...opts,
         fileName,
-      }).parse();
+      }).parse().indexInputs;
     };
     return [
       {
         test: /stories\/.*\.js$/,
-        indexer,
+        createIndex,
       },
       ...(indexers || []),
     ];
@@ -66,7 +65,6 @@ module.exports = {
         toolbars: true,
       },
     },
-    '@storybook/addon-storysource',
   ],
   framework: {
     name: '@storybook/react-webpack5',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
     "@storybook/addon-docs": "^7.6.3",
     "@storybook/addon-essentials": "^7.6.3",
     "@storybook/addon-links": "^7.6.3",
-    "@storybook/addon-storysource": "^7.6.3",
     "@storybook/addon-viewport": "^7.6.3",
     "@storybook/client-api": "^7.6.3",
     "@storybook/client-logger": "^7.6.3",

diff --git a/packages/design-system/src/components/circularProgress/stories/index.js b/packages/design-system/src/components/circularProgress/stories/index.js
@@ -17,7 +17,7 @@
 /**
  * Internal dependencies
  */
-import CircularProgress from '..';
+import CircularProgress from '../circular';
 
 export default {
   title: 'Stories Editor/Components/Circular Progress',

diff --git a/packages/design-system/src/components/menu/stories/index.js b/packages/design-system/src/components/menu/stories/index.js
@@ -32,7 +32,7 @@ import {
   nestedDropDownOptions,
   reallyLongOptions,
 } from '../../../storybookUtils/sampleData';
-import { getOptions } from '../utils';
+import { getGroups } from '../utils';
 
 export default {
   title: 'DesignSystem/Components/Menu',
@@ -92,10 +92,10 @@ const styleOverrideForAnimationEffectMenu = css`
   }
 `;
 
-const _basicDropDownOptions = getOptions(basicDropDownOptions);
-const _effectChooserOptions = getOptions(effectChooserOptions);
-const _nestedDropDownOptions = getOptions(nestedDropDownOptions);
-const _reallyLongOptions = getOptions(reallyLongOptions);
+const _basicDropDownOptions = getGroups(basicDropDownOptions);
+const _effectChooserOptions = getGroups(effectChooserOptions);
+const _nestedDropDownOptions = getGroups(nestedDropDownOptions);
+const _reallyLongOptions = getGroups(reallyLongOptions);
 
 export const _default = {
   render: function Render({ onMenuItemClick, ...args }) {

diff --git a/packages/design-system/src/components/tooltip/stories/index.js b/packages/design-system/src/components/tooltip/stories/index.js
@@ -26,7 +26,8 @@ import { useCallback, useEffect, useState } from '@googleforcreators/react';
 import { theme } from '../../../theme';
 import { Table } from '../../../icons';
 import { Button, ButtonSize, ButtonType, ButtonVariant } from '../../button';
-import { BaseTooltip as Tooltip, Placement } from '..';
+import { Placement } from '../../popup';
+import { Tooltip } from '..';
 import { Text } from '../../typography';
 
 export default {

diff --git a/packages/story-editor/src/components/checklistCard/stories/index.js b/packages/story-editor/src/components/checklistCard/stories/index.js
@@ -23,7 +23,7 @@ import {
   Text,
   Link,
   List,
-  BaseTooltip,
+  Tooltip as BaseTooltip,
 } from '@googleforcreators/design-system';
 
 /**

diff --git a/packages/story-editor/src/components/tablist/stories/index.js b/packages/story-editor/src/components/tablist/stories/index.js
@@ -20,23 +20,26 @@ import styled from 'styled-components';
 import {
   TextSize,
   Link,
-  BaseTooltip,
+  Tooltip as BaseTooltip,
   Text,
 } from '@googleforcreators/design-system';
+
 /**
  * Internal dependencies
  */
 import { useState } from '@googleforcreators/react';
 import { Thumbnail, THUMBNAIL_TYPES } from '../../thumbnail';
 import { THUMBNAIL_BG } from '../../thumbnail/stories/demoThumbnails';
-import { CARD_TYPE } from '../../checklistCard/constants';
 import { StyledVideoOptimizationIcon } from '../../checklistCard/styles';
-import { DefaultCtaButton } from '../../checklistCard/defaultCtaButton';
-import { DefaultFooterText } from '../../checklistCard/defaultFooterText';
 import { Tablist } from '../styles';
 import TablistPanel from '../tablistPanel';
 import { CheckboxCta } from '../../checklistCard/checkboxCta';
-import { ChecklistCard } from '../../checklistCard';
+import {
+  ChecklistCard,
+  CARD_TYPE,
+  DefaultCtaButton,
+  DefaultFooterText,
+} from '../../checklistCard';
 import { PANEL_STATES } from '../constants';
 
 export default {

diff --git a/packages/story-editor/src/components/thumbnail/stories/index.js b/packages/story-editor/src/components/thumbnail/stories/index.js
@@ -17,7 +17,11 @@
  * External dependencies
  */
 import styled from 'styled-components';
-import { BaseTooltip, Icons } from '@googleforcreators/design-system';
+import {
+  Tooltip as BaseTooltip,
+  Icons,
+} from '@googleforcreators/design-system';
+
 /**
  * Internal dependencies
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import { @@
       Text,
       Link,
       List,
-      BaseTooltip,
+      Tooltip as BaseTooltip,
     } from '@googleforcreators/design-system';
     /**
@@ Expand Down @@