Merge pull request #18130 from quickgiant/quickgiant.canvas-current-s…

…election-crash Addon-docs: Fix Canvas block CURRENT_SELECTION handling
storybookjs · May 4, 2022 · ff00d58 · ff00d58
2 parents 45e37e4 + e53a3be
commit ff00d58
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/addons/docs/src/blocks/Canvas.tsx b/addons/docs/src/blocks/Canvas.tsx
@@ -11,6 +11,7 @@ import { DocsContext, DocsContextProps } from './DocsContext';
 import { SourceContext, SourceContextProps } from './SourceContainer';
 import { getSourceProps, SourceState } from './Source';
 import { useStories } from './useStory';
+import { CURRENT_SELECTION } from './types';
 
 export { SourceState };
 
@@ -53,7 +54,10 @@ const getPreviewProps = (
   );
   const sourceProps = getSourceProps({ ids: targetIds }, docsContext, sourceContext);
   if (!sourceState) sourceState = sourceProps.state;
-  const stories = useStories(targetIds, docsContext);
+  const storyIds = targetIds.map((targetId) =>
+    targetId === CURRENT_SELECTION ? docsContext.id : targetId
+  );
+  const stories = useStories(storyIds, docsContext);
   isLoading = stories.some((s) => !s);
 
   return {