Add cleanup to setFnrRef

navikt · Oct 6, 2023 · 61ef0be · 61ef0be
1 parent fce260c
commit 61ef0be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Provider.tsx b/src/Provider.tsx
@@ -20,10 +20,17 @@ export const useErVeileder = (): boolean => {
 export const FnrContext = React.createContext<undefined | string>(undefined);
 export const useFnr = () => useContext(FnrContext);
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const noOp = (_: string | undefined) => {};
 const Provider = ({ children, setFnrRef, fnr: propFnr }: Props) => {
     const [fnr, setFnr] = useState(propFnr);
     useEffect(() => {
         if (setFnrRef) setFnrRef(setFnr);
+        return () => {
+            if (setFnrRef) {
+                setFnrRef(noOp);
+            }
+        };
     }, []);
 
     const store = useMemo(createStore, [fnr]);

diff --git a/src/webcomponentWrapper.tsx b/src/webcomponentWrapper.tsx
@@ -31,7 +31,7 @@ export class DabAktivitetsplan extends HTMLElement {
         const fnr = this.getAttribute('data-fnr') ?? undefined;
         settLocalStorage(LocalStorageElement.FNR, fnr);
         ReactDOM.render(
-            <ModalProvider appElement={appRoot} rootElement={shadowDomFirstChild}>
+            <ModalProvider rootElement={shadowDomFirstChild}>
                 <Provider key={fnr} fnr={fnr} setFnrRef={(setFnr) => (this.setFnr = setFnr)}>
                     <App Routes={Routes} key={'1'} />
                 </Provider>