fix: sync up component context with story change

ccontrols · May 2, 2020 · 42944f2 · 42944f2
1 parent a38cf2f
commit 42944f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ui/blocks/src/context/block/BlockDataContext.tsx b/ui/blocks/src/context/block/BlockDataContext.tsx
@@ -41,6 +41,11 @@ export interface BlockDataContextProps {
    * add an observer for onChange events
    */
   removeObserver: (observer: StoreObserver) => void;
+
+  /**
+   * current story id
+   */
+  storyId: string;
 }
 //@ts-ignore
 export const BlockDataContext = React.createContext<BlockDataContextProps>({});
@@ -107,6 +112,7 @@ export const BlockDataContextProvider: React.FC<BlockDataContextInoutProps> = ({
   return (
     <BlockDataContext.Provider
       value={{
+        storyId,
         getStoryData,
         storyIdFromName,
         getComponents,

diff --git a/ui/blocks/src/context/components/ComponentsContext.tsx b/ui/blocks/src/context/components/ComponentsContext.tsx
@@ -28,19 +28,24 @@ export const useComponentsContext = ({
   of = CURRENT_STORY,
 }: ComponentInputProps): ComponentContextProps => {
   const {
+    storyId,
     getStoryData,
     getComponents,
     addObserver,
     removeObserver,
   } = React.useContext(BlockDataContext);
-  const [{ story, kind, component }, setStoryData] = useState(getStoryData());
+  const [{ story, kind, component }, setStoryData] = useState(
+    getStoryData(storyId),
+  );
 
   if (!story) {
     return {
       components: {},
     };
   }
-
+  useEffect(() => {
+    setStoryData(getStoryData(storyId));
+  }, [storyId]);
   useEffect(() => {
     const onChange = () => {
       //force refresh of context