fix: External portals

theopensystemslab · Nov 15, 2024 · bd7d1fe · bd7d1fe
1 parent 35b47f3
commit bd7d1fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/editor.planx.uk/src/hooks/useScrollOnPreviousURLMatch.ts b/editor.planx.uk/src/hooks/useScrollOnPreviousURLMatch.ts
@@ -2,15 +2,17 @@ import { useTheme } from "@mui/material/styles";
 import { useStore } from "pages/FlowEditor/lib/store";
 import { useEffect, useRef } from "react";
 
-const useScrollOnPreviousURLMatch = <T extends HTMLElement>(id: string) => {
+const useScrollOnPreviousURLMatch = <T extends HTMLElement>(
+  urlMatcher: string,
+) => {
   const previousURL = useStore((state) => state.previousURL);
   const ref = useRef<T | null>(null);
   const theme = useTheme();
 
   useEffect(() => {
     if (!ref.current) return;
 
-    const isReturningFromPortal = previousURL?.endsWith(id);
+    const isReturningFromPortal = previousURL?.endsWith(urlMatcher);
     if (!isReturningFromPortal) return;
 
     // Center node
@@ -31,7 +33,7 @@ const useScrollOnPreviousURLMatch = <T extends HTMLElement>(id: string) => {
     };
 
     ref.current.animate(keyframes, animationOptions);
-  }, [previousURL, id, theme]);
+  }, [previousURL, urlMatcher, theme]);
 
   return ref;
 };

diff --git a/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Portal.tsx b/editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Portal.tsx
@@ -18,7 +18,7 @@ import Question from "./Question";
 const ExternalPortal: React.FC<any> = (props) => {
   const [href, setHref] = useState("Loading...");
 
-  const ref = useScrollOnPreviousURLMatch<HTMLLIElement>(props.id);
+  const ref = useScrollOnPreviousURLMatch<HTMLLIElement>(href);
 
   const addExternalPortal = useStore.getState().addExternalPortal;