remove page{Doc|Folder|Workspace} if exists in pageProps merge data

villers3 · May 16, 2022 · 8920d35 · 8920d35
1 parent 3fd7035
commit 8920d35
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/cloud/lib/stores/pageStore/store.tsx b/src/cloud/lib/stores/pageStore/store.tsx
@@ -31,9 +31,27 @@ function usePageDataStore(pageProps: any, navigatingBetweenPage: boolean) {
   const pageDataRef = useCommittedRef(pageData)
 
   useEffect(() => {
-    setPageData((old: any) =>
-      pageProps.merge === true ? { ...old, ...pageProps } : pageProps
-    )
+    setPageData((old: any) => {
+      if (pageProps.merge !== true) {
+        return pageProps
+      }
+
+      if (
+        pageProps.pageDoc != null ||
+        pageProps.pageFolder != null ||
+        pageProps.pageWorkspace != null
+      ) {
+        return {
+          ...old,
+          pageDoc: undefined,
+          pageFolder: undefined,
+          pageWorkspace: undefined,
+          ...pageProps,
+        }
+      }
+
+      return { ...old, ...pageProps }
+    })
   }, [pageProps])
 
   const setPartialPageData = useCallback(