fix: fix previous commit

moxystudio · Aug 24, 2020 · 760c960 · 760c960
1 parent eec2276
commit 760c960
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/src/with-layout.js b/src/with-layout.js
@@ -32,7 +32,7 @@ const withLayout = (mapLayoutStateToLayoutTree, mapPropsToInitialLayoutState) =>
             const [layoutState, setLayoutState] = useObjectState(initialLayoutStateRef.current);
 
             useEffect(() => {
-                if (layoutState !== initialLayoutStateRef.current) {
+                if (layoutState !== initialLayoutStateRef.current && ProviderComponent === WithLayout) {
                     updateLayoutTree(mapLayoutStateToLayoutTree(layoutState));
                 }
             }, [layoutState, updateLayoutTree, ProviderComponent]);

diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
@@ -62,13 +62,15 @@ exports[`should not update layout if page is not the active Component of LayoutT
       </WithLayout(Home)>
     </main>
   </PrimaryLayout>
-  <WithLayout(Home)>
-    <Home>
+  <WithLayout(Foo)>
+    <Foo
+      setLayoutState={[Function]}
+    >
       <h1>
         Home
       </h1>
-    </Home>
-  </WithLayout(Home)>
+    </Foo>
+  </WithLayout(Foo)>
 </LayoutTree>
 `;
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -225,13 +225,21 @@ it('should fail if LayoutTree was not rendered', () => {
 it('should not update layout if page is not the active Component of LayoutTree', () => {
     jest.spyOn(console, 'error').mockImplementation(() => {});
 
+    const Foo = ({ setLayoutState }) => {
+        useEffect(() => {
+            setLayoutState({ variant: 'dark' });
+        }, [setLayoutState]);
+
+        return <h1>Home</h1>;
+    };
+
     const EnhancedHome = withLayout(<PrimaryLayout />)(Home);
-    const AnotherEnhancedHome = withLayout(<SecondaryLayout />)(Home);
+    const EnhancedFoo = withLayout(() => <SecondaryLayout />)(Foo);
 
     const render = jest.fn((tree) => (
         <>
             { tree }
-            { <AnotherEnhancedHome /> }
+            { <EnhancedFoo /> }
         </>
     ));