@storybook/addon-docs 6.4.0-alpha.35 → 6.4.0-alpha.39

package/dist/cjs/blocks/Source.js

@@ -131,7 +131,7 @@ var getSourceProps = function getSourceProps(props, docsContext, sourceContext)
   var targetIds = multiProps.ids || [targetId];
   var stories = (0, _useStory.useStories)(targetIds, docsContext);
 
-  if (!stories) {
+  if (!stories.every(Boolean)) {
     return {
       error: _components.SourceError.SOURCE_UNAVAILABLE,
       state: SourceState.NONE

package/dist/cjs/blocks/SourceContainer.js

@@ -79,11 +79,15 @@ var SourceContainer = function SourceContainer(_ref) {
   (0, _react.useEffect)(function () {
     var handleSnippetRendered = function handleSnippetRendered(id, newItem) {
       if (newItem !== sources[id]) {
-        var newSources = Object.assign({}, sources, _defineProperty({}, id, newItem));
+        setSources(function (current) {
+          var newSources = Object.assign({}, current, _defineProperty({}, id, newItem));
 
-        if (!(0, _fastDeepEqual.default)(sources, newSources)) {
-          setSources(newSources);
-        }
+          if (!(0, _fastDeepEqual.default)(current, newSources)) {
+            return newSources;
+          }
+
+          return current;
+        });
       }
     };
 

package/dist/cjs/blocks/Story.js

@@ -124,6 +124,8 @@ var getStoryProps = function getStoryProps(_ref4, story, context) {
 exports.getStoryProps = getStoryProps;
 
 var Story = function Story(props) {
+  var _global$FEATURES;
+
   var context = (0, _react.useContext)(_DocsContext.DocsContext);
   var ref = (0, _react.useRef)();
   var story = (0, _useStory.useStory)(getStoryId(props, context), context); // Ensure we wait until this story is properly rendered in the docs context.
@@ -178,7 +180,7 @@ var Story = function Story(props) {
     return null;
   }
 
-  if (_global.default !== null && _global.default !== void 0 && _global.default.FEATURES.modernInlineRender) {
+  if (_global.default !== null && _global.default !== void 0 && (_global$FEATURES = _global.default.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.modernInlineRender) {
     // We do this so React doesn't complain when we replace the span in a secondary render
     var htmlContents = "<span data-is-loading-indicator=\"true\">loading story...</span>"; // FIXME: height/style/etc. lifted from PureStory
 

package/dist/cjs/blocks/useStory.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.useStory = useStory;
 exports.useStories = useStories;
 
+require("regenerator-runtime/runtime.js");
+
 require("core-js/modules/es.promise.js");
 
 require("core-js/modules/es.object.to-string.js");
@@ -30,8 +32,16 @@ require("core-js/modules/web.dom-collections.iterator.js");
 
 require("core-js/modules/es.array.map.js");
 
+require("core-js/modules/es.object.assign.js");
+
 var _react = require("react");
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -50,19 +60,42 @@ function useStory(storyId, context) {
 }
 
 function useStories(storyIds, context) {
-  var _useState = (0, _react.useState)(null),
+  var _useState = (0, _react.useState)({}),
       _useState2 = _slicedToArray(_useState, 2),
-      stories = _useState2[0],
+      storiesById = _useState2[0],
       setStories = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    Promise.all(storyIds.map(function (storyId) {
-      return context.loadStory(storyId);
-    })).then(function (loadedStories) {
-      if (!stories) {
-        setStories(loadedStories);
-      }
-    });
+    Promise.all(storyIds.map( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(storyId) {
+        var story;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return context.loadStory(storyId);
+
+              case 2:
+                story = _context.sent;
+                setStories(function (current) {
+                  return Object.assign({}, current, _defineProperty({}, storyId, story));
+                });
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }()));
+  }, storyIds);
+  return storyIds.map(function (storyId) {
+    return storiesById[storyId];
   });
-  return stories;
 }

package/dist/esm/blocks/Source.js

@@ -88,7 +88,7 @@ export var getSourceProps = function getSourceProps(props, docsContext, sourceCo
   var targetIds = multiProps.ids || [targetId];
   var stories = useStories(targetIds, docsContext);
 
-  if (!stories) {
+  if (!stories.every(Boolean)) {
     return {
       error: SourceError.SOURCE_UNAVAILABLE,
       state: SourceState.NONE

package/dist/esm/blocks/SourceContainer.js

@@ -43,11 +43,15 @@ export var SourceContainer = function SourceContainer(_ref) {
   useEffect(function () {
     var handleSnippetRendered = function handleSnippetRendered(id, newItem) {
       if (newItem !== sources[id]) {
-        var newSources = Object.assign({}, sources, _defineProperty({}, id, newItem));
+        setSources(function (current) {
+          var newSources = Object.assign({}, current, _defineProperty({}, id, newItem));
 
-        if (!deepEqual(sources, newSources)) {
-          setSources(newSources);
-        }
+          if (!deepEqual(current, newSources)) {
+            return newSources;
+          }
+
+          return current;
+        });
       }
     };
 

package/dist/esm/blocks/Story.js

@@ -69,6 +69,8 @@ export var getStoryProps = function getStoryProps(_ref4, story, context) {
 };
 
 var Story = function Story(props) {
+  var _global$FEATURES;
+
   var context = useContext(DocsContext);
   var ref = useRef();
   var story = useStory(getStoryId(props, context), context); // Ensure we wait until this story is properly rendered in the docs context.
@@ -123,7 +125,7 @@ var Story = function Story(props) {
     return null;
   }
 
-  if (global !== null && global !== void 0 && global.FEATURES.modernInlineRender) {
+  if (global !== null && global !== void 0 && (_global$FEATURES = global.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.modernInlineRender) {
     // We do this so React doesn't complain when we replace the span in a secondary render
     var htmlContents = "<span data-is-loading-indicator=\"true\">loading story...</span>"; // FIXME: height/style/etc. lifted from PureStory
 

package/dist/esm/blocks/useStory.js

@@ -1,9 +1,18 @@
+import "regenerator-runtime/runtime.js";
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.map.js";
+import "core-js/modules/es.object.assign.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
@@ -29,19 +38,42 @@ export function useStory(storyId, context) {
   return stories && stories[0];
 }
 export function useStories(storyIds, context) {
-  var _useState = useState(null),
+  var _useState = useState({}),
       _useState2 = _slicedToArray(_useState, 2),
-      stories = _useState2[0],
+      storiesById = _useState2[0],
       setStories = _useState2[1];
 
   useEffect(function () {
-    Promise.all(storyIds.map(function (storyId) {
-      return context.loadStory(storyId);
-    })).then(function (loadedStories) {
-      if (!stories) {
-        setStories(loadedStories);
-      }
-    });
+    Promise.all(storyIds.map( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(storyId) {
+        var story;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return context.loadStory(storyId);
+
+              case 2:
+                story = _context.sent;
+                setStories(function (current) {
+                  return Object.assign({}, current, _defineProperty({}, storyId, story));
+                });
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }()));
+  }, storyIds);
+  return storyIds.map(function (storyId) {
+    return storiesById[storyId];
   });
-  return stories;
 }

package/dist/modern/blocks/Source.js

@@ -90,7 +90,7 @@ export const getSourceProps = (props, docsContext, sourceContext) => {
   const targetIds = multiProps.ids || [targetId];
   const stories = useStories(targetIds, docsContext);
 
-  if (!stories) {
+  if (!stories.every(Boolean)) {
     return {
       error: SourceError.SOURCE_UNAVAILABLE,
       state: SourceState.NONE

package/dist/modern/blocks/SourceContainer.js

@@ -13,13 +13,17 @@ export const SourceContainer = ({
   useEffect(() => {
     const handleSnippetRendered = (id, newItem) => {
       if (newItem !== sources[id]) {
-        const newSources = Object.assign({}, sources, {
-          [id]: newItem
-        });
+        setSources(current => {
+          const newSources = Object.assign({}, current, {
+            [id]: newItem
+          });
+
+          if (!deepEqual(current, newSources)) {
+            return newSources;
+          }
 
-        if (!deepEqual(sources, newSources)) {
-          setSources(newSources);
-        }
+          return current;
+        });
       }
     };
 

package/dist/modern/blocks/Story.js

@@ -65,6 +65,8 @@ export const getStoryProps = ({
 };
 
 const Story = props => {
+  var _global$FEATURES;
+
   const context = useContext(DocsContext);
   const ref = useRef();
   const story = useStory(getStoryId(props, context), context); // Ensure we wait until this story is properly rendered in the docs context.
@@ -121,7 +123,7 @@ const Story = props => {
     return null;
   }
 
-  if (global !== null && global !== void 0 && global.FEATURES.modernInlineRender) {
+  if (global !== null && global !== void 0 && (_global$FEATURES = global.FEATURES) !== null && _global$FEATURES !== void 0 && _global$FEATURES.modernInlineRender) {
     // We do this so React doesn't complain when we replace the span in a secondary render
     const htmlContents = `<span data-is-loading-indicator="true">loading story...</span>`; // FIXME: height/style/etc. lifted from PureStory
 

package/dist/modern/blocks/useStory.js

@@ -4,13 +4,14 @@ export function useStory(storyId, context) {
   return stories && stories[0];
 }
 export function useStories(storyIds, context) {
-  const [stories, setStories] = useState(null);
+  const [storiesById, setStories] = useState({});
   useEffect(() => {
-    Promise.all(storyIds.map(storyId => context.loadStory(storyId))).then(loadedStories => {
-      if (!stories) {
-        setStories(loadedStories);
-      }
-    });
-  });
-  return stories;
+    Promise.all(storyIds.map(async storyId => {
+      const story = await context.loadStory(storyId);
+      setStories(current => Object.assign({}, current, {
+        [storyId]: story
+      }));
+    }));
+  }, storyIds);
+  return storyIds.map(storyId => storiesById[storyId]);
 }

package/dist/ts3.4/blocks/useStory.d.ts

@@ -1,5 +1,5 @@
 import { StoryId, AnyFramework } from '@storybook/csf';
 import { Story } from '@storybook/store';
 import { DocsContextProps } from './DocsContext';
-export declare function useStory<TFramework extends AnyFramework>(storyId: StoryId, context: DocsContextProps<TFramework>): Story<TFramework> | void;
-export declare function useStories<TFramework extends AnyFramework>(storyIds: StoryId[], context: DocsContextProps<TFramework>): Story<TFramework>[] | void;
+export declare function useStory<TFramework extends AnyFramework = AnyFramework>(storyId: StoryId, context: DocsContextProps<TFramework>): Story<TFramework> | void;
+export declare function useStories<TFramework extends AnyFramework = AnyFramework>(storyIds: StoryId[], context: DocsContextProps<TFramework>): (Story<TFramework> | void)[];

package/dist/ts3.9/blocks/useStory.d.ts

@@ -1,5 +1,5 @@
 import { StoryId, AnyFramework } from '@storybook/csf';
 import { Story } from '@storybook/store';
 import { DocsContextProps } from './DocsContext';
-export declare function useStory<TFramework extends AnyFramework>(storyId: StoryId, context: DocsContextProps<TFramework>): Story<TFramework> | void;
-export declare function useStories<TFramework extends AnyFramework>(storyIds: StoryId[], context: DocsContextProps<TFramework>): Story<TFramework>[] | void;
+export declare function useStory<TFramework extends AnyFramework = AnyFramework>(storyId: StoryId, context: DocsContextProps<TFramework>): Story<TFramework> | void;
+export declare function useStories<TFramework extends AnyFramework = AnyFramework>(storyIds: StoryId[], context: DocsContextProps<TFramework>): (Story<TFramework> | void)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-docs",
-  "version": "6.4.0-alpha.35",
+  "version": "6.4.0-alpha.39",
   "description": "Document component usage and properties in Markdown",
   "keywords": [
     "addon",
@@ -63,22 +63,22 @@
     "@mdx-js/loader": "^1.6.22",
     "@mdx-js/mdx": "^1.6.22",
     "@mdx-js/react": "^1.6.22",
-    "@storybook/addons": "6.4.0-alpha.35",
-    "@storybook/api": "6.4.0-alpha.35",
-    "@storybook/builder-webpack4": "6.4.0-alpha.35",
-    "@storybook/client-api": "6.4.0-alpha.35",
-    "@storybook/client-logger": "6.4.0-alpha.35",
-    "@storybook/components": "6.4.0-alpha.35",
-    "@storybook/core": "6.4.0-alpha.35",
-    "@storybook/core-events": "6.4.0-alpha.35",
+    "@storybook/addons": "6.4.0-alpha.39",
+    "@storybook/api": "6.4.0-alpha.39",
+    "@storybook/builder-webpack4": "6.4.0-alpha.39",
+    "@storybook/client-api": "6.4.0-alpha.39",
+    "@storybook/client-logger": "6.4.0-alpha.39",
+    "@storybook/components": "6.4.0-alpha.39",
+    "@storybook/core": "6.4.0-alpha.39",
+    "@storybook/core-events": "6.4.0-alpha.39",
     "@storybook/csf": "0.0.2--canary.68887a1.0",
-    "@storybook/csf-tools": "6.4.0-alpha.35",
-    "@storybook/node-logger": "6.4.0-alpha.35",
-    "@storybook/postinstall": "6.4.0-alpha.35",
-    "@storybook/preview-web": "6.4.0-alpha.35",
-    "@storybook/source-loader": "6.4.0-alpha.35",
-    "@storybook/store": "6.4.0-alpha.35",
-    "@storybook/theming": "6.4.0-alpha.35",
+    "@storybook/csf-tools": "6.4.0-alpha.39",
+    "@storybook/node-logger": "6.4.0-alpha.39",
+    "@storybook/postinstall": "6.4.0-alpha.39",
+    "@storybook/preview-web": "6.4.0-alpha.39",
+    "@storybook/source-loader": "6.4.0-alpha.39",
+    "@storybook/store": "6.4.0-alpha.39",
+    "@storybook/theming": "6.4.0-alpha.39",
     "acorn": "^7.4.1",
     "acorn-jsx": "^5.3.1",
     "acorn-walk": "^7.2.0",
@@ -107,11 +107,11 @@
     "@babel/core": "^7.12.10",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.27",
-    "@storybook/angular": "6.4.0-alpha.35",
-    "@storybook/html": "6.4.0-alpha.35",
-    "@storybook/react": "6.4.0-alpha.35",
-    "@storybook/vue": "6.4.0-alpha.35",
-    "@storybook/web-components": "6.4.0-alpha.35",
+    "@storybook/angular": "6.4.0-alpha.39",
+    "@storybook/html": "6.4.0-alpha.39",
+    "@storybook/react": "6.4.0-alpha.39",
+    "@storybook/vue": "6.4.0-alpha.39",
+    "@storybook/web-components": "6.4.0-alpha.39",
     "@types/cross-spawn": "^6.0.2",
     "@types/doctrine": "^0.0.3",
     "@types/enzyme": "^3.10.8",
@@ -141,12 +141,12 @@
     "zone.js": "^0.11.3"
   },
   "peerDependencies": {
-    "@storybook/angular": "6.4.0-alpha.35",
-    "@storybook/html": "6.4.0-alpha.35",
-    "@storybook/react": "6.4.0-alpha.35",
-    "@storybook/vue": "6.4.0-alpha.35",
-    "@storybook/vue3": "6.4.0-alpha.35",
-    "@storybook/web-components": "6.4.0-alpha.35",
+    "@storybook/angular": "6.4.0-alpha.39",
+    "@storybook/html": "6.4.0-alpha.39",
+    "@storybook/react": "6.4.0-alpha.39",
+    "@storybook/vue": "6.4.0-alpha.39",
+    "@storybook/vue3": "6.4.0-alpha.39",
+    "@storybook/web-components": "6.4.0-alpha.39",
     "lit": "^2.0.0-rc.1",
     "lit-html": "^1.4.1 || ^2.0.0-rc.3",
     "react": "^16.8.0 || ^17.0.0",
@@ -203,7 +203,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8f65635eb105c8ef3e6ffea3c9cf6668ad34705e",
+  "gitHead": "b1d5f20b2fb6c52f06a85cba6e644629d9bd2e15",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Docs",