Merge branch 'next' into 16756-argTypes-storiesOf

storybookjs · Nov 26, 2021 · 465a4be · 465a4be
2 parents 7e89d72 + 1799997
commit 465a4be
Show file tree

Hide file tree

Showing 62 changed files with 635 additions and 569 deletions.
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -81,7 +81,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Accessibility",

diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -79,7 +79,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Actions",

diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -77,7 +77,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Backgrounds",

diff --git a/addons/controls/package.json b/addons/controls/package.json
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/register.js",
   "storybook": {
     "displayName": "Controls",

diff --git a/addons/docs/package.json b/addons/docs/package.json
@@ -202,7 +202,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Docs",

diff --git a/addons/docs/src/blocks/Story.tsx b/addons/docs/src/blocks/Story.tsx
@@ -111,6 +111,14 @@ export const getStoryProps = <TFramework extends AnyFramework>(
   };
 };
 
+function makeGate(): [Promise<void>, () => void] {
+  let open;
+  const gate = new Promise<void>((r) => {
+    open = r;
+  });
+  return [gate, open];
+}
+
 const Story: FunctionComponent<StoryProps> = (props) => {
   const context = useContext(DocsContext);
   const channel = addons.getChannel();
@@ -145,16 +153,31 @@ const Story: FunctionComponent<StoryProps> = (props) => {
     return () => cleanup && cleanup();
   }, [story]);
 
-  if (!story) {
-    return <StorySkeleton />;
-  }
+  const [storyFnRan, onStoryFnRan] = makeGate();
+  const [rendered, onRendered] = makeGate();
+  useEffect(onRendered);
 
   // If we are rendering a old-style inline Story via `PureStory` below, we want to emit
   // the `STORY_RENDERED` event when it renders. The modern mode below calls out to
   // `Preview.renderStoryToDom()` which itself emits the event.
-  const storyProps = getStoryProps(props, story, context, () =>
-    channel.emit(Events.STORY_RENDERED, storyId)
-  );
+  if (story && !global?.FEATURES?.modernInlineRender) {
+    // We need to wait for two things before we can consider the story rendered:
+    //  (a) React's `useEffect` hook needs to fire. This is needed for React stories, as
+    //      decorators of the form `<A><B/></A>` will not actually execute `B` in the first
+    //      call to the story function.
+    //  (b) The story function needs to actually have been called.
+    //      Certain frameworks (i.e.angular) don't actually render the component in the very first
+    //      React render cycle, so we need to wait for the framework to actually do that
+    Promise.all([storyFnRan, rendered]).then(() => {
+      channel.emit(Events.STORY_RENDERED, storyId);
+    });
+  }
+
+  if (!story) {
+    return <StorySkeleton />;
+  }
+
+  const storyProps = getStoryProps(props, story, context, onStoryFnRan);
   if (!storyProps) {
     return null;
   }

diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -93,6 +93,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/addons/interactions/package.json b/addons/interactions/package.json
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Interactions",

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -76,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Jest",

diff --git a/addons/links/package.json b/addons/links/package.json
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Links",

diff --git a/addons/measure/package.json b/addons/measure/package.json
@@ -71,7 +71,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Measure",

diff --git a/addons/outline/package.json b/addons/outline/package.json
@@ -76,7 +76,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Outline",

diff --git a/addons/storyshots/storyshots-core/package.json b/addons/storyshots/storyshots-core/package.json
@@ -151,7 +151,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "storybook": {
     "displayName": "Storyshots",
     "icon": "https://user-images.githubusercontent.com/263385/101991676-48cdf300-3c7c-11eb-8aa1-944dab6ab29b.png",

diff --git a/addons/storyshots/storyshots-puppeteer/package.json b/addons/storyshots/storyshots-puppeteer/package.json
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448"
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344"
 }
diff --git a/addons/storysource/package.json b/addons/storysource/package.json
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Storysource",

diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json
@@ -67,7 +67,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/register.js",
   "storybook": {
     "displayName": "Toolbars",

diff --git a/addons/viewport/package.json b/addons/viewport/package.json
@@ -69,7 +69,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/preview.js",
   "storybook": {
     "displayName": "Viewport",

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -138,5 +138,5 @@
     "access": "public"
   },
   "builders": "dist/ts3.9/builders/builders.json",
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448"
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344"
 }
diff --git a/app/ember/package.json b/app/ember/package.json
@@ -66,6 +66,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/html/package.json b/app/html/package.json
@@ -71,6 +71,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/preact/package.json b/app/preact/package.json
@@ -74,6 +74,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/react/package.json b/app/react/package.json
@@ -96,6 +96,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/server/package.json b/app/server/package.json
@@ -75,6 +75,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/svelte/package.json b/app/svelte/package.json
@@ -75,6 +75,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/vue/package.json b/app/vue/package.json
@@ -83,6 +83,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/vue3/package.json b/app/vue3/package.json
@@ -81,6 +81,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/app/web-components/package.json b/app/web-components/package.json
@@ -79,6 +79,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/client/index.js"
 }
diff --git a/docs/versions/next.json b/docs/versions/next.json
@@ -1 +1 @@
-{"version":"6.4.0-rc.8","info":{"plain":"### Bug Fixes\n\n- Interactions: Fix duplicate rows in waitFor ([#16465](https://github.com/storybookjs/storybook/pull/16465))\n- Core: Fix channel options so that they are merged in correct order ([#16764](https://github.com/storybookjs/storybook/pull/16764))\n\n### Dependency Upgrades\n\n- Add missing peer dependencies ([#16551](https://github.com/storybookjs/storybook/pull/16551))"}}
+{"version":"6.4.0-rc.9","info":{"plain":"### Features\n\n- Angular: Add styles and stylePreprocessorOptions to angular builder ([#16675](https://github.com/storybookjs/storybook/pull/16675))\n\n### Bug Fixes\n\n- Interactions: Unlock controls when play function is finished ([#16784](https://github.com/storybookjs/storybook/pull/16784))\n\n### Maintenance\n\n- Misc: Cleanup typescript webpack types ([#16780](https://github.com/storybookjs/storybook/pull/16780))"}}
diff --git a/lib/addons/package.json b/lib/addons/package.json
@@ -59,6 +59,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/public_api.js"
 }
diff --git a/lib/api/package.json b/lib/api/package.json
@@ -71,6 +71,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/builder-webpack4/package.json b/lib/builder-webpack4/package.json
@@ -131,6 +131,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/builder-webpack5/package.json b/lib/builder-webpack5/package.json
@@ -117,6 +117,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json
@@ -51,6 +51,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json
@@ -49,6 +49,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/channels/package.json b/lib/channels/package.json
@@ -47,6 +47,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/cli-sb/package.json b/lib/cli-sb/package.json
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448"
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344"
 }
diff --git a/lib/cli-storybook/package.json b/lib/cli-storybook/package.json
@@ -32,5 +32,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448"
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344"
 }
diff --git a/lib/cli/package.json b/lib/cli/package.json
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448"
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344"
 }
diff --git a/lib/client-api/package.json b/lib/client-api/package.json
@@ -68,6 +68,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/client-logger/package.json b/lib/client-logger/package.json
@@ -46,6 +46,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/codemod/package.json b/lib/codemod/package.json
@@ -62,6 +62,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/components/package.json b/lib/components/package.json
@@ -76,6 +76,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }
diff --git a/lib/core-client/package.json b/lib/core-client/package.json
@@ -74,6 +74,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0be6dde43b848e310e705a4354c6c8abe0431448",
+  "gitHead": "d5236ddaafc17b739a8b546fd65603dd09142344",
   "sbmodern": "dist/modern/index.js"
 }