refactor: unregister path when component unmounts

measuredco · Jan 19, 2025 · e2139f5 · e2139f5
1 parent b781b5a
commit e2139f5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/packages/core/components/DragDropContext/index.tsx b/packages/core/components/DragDropContext/index.tsx
@@ -326,6 +326,19 @@ const DragDropContextClient = ({
     [data, setPathData]
   );
 
+  const unregisterPath = useCallback(
+    (id: string) => {
+      setPathData((latestPathData = {}) => {
+        const newPathData = { ...latestPathData };
+
+        delete newPathData[id];
+
+        return newPathData;
+      });
+    },
+    [data, setPathData]
+  );
+
   const initialSelector = useRef<{ zone: string; index: number }>(undefined);
 
   return (
@@ -578,6 +591,7 @@ const DragDropContextClient = ({
                 areaId: "root",
                 depth: 0,
                 registerPath,
+                unregisterPath,
                 pathData,
                 path: [],
               }}

diff --git a/packages/core/components/DraggableComponent/index.tsx b/packages/core/components/DraggableComponent/index.tsx
@@ -306,6 +306,10 @@ export const DraggableComponent = ({
       },
       componentType
     );
+
+    return () => {
+      ctx?.unregisterPath?.(id);
+    };
   }, [id, zoneCompound, index, componentType]);
 
   const CustomActionBar = useMemo(

diff --git a/packages/core/components/DropZone/context.tsx b/packages/core/components/DropZone/context.tsx
@@ -33,6 +33,7 @@ export type DropZoneContext<UserConfig extends Config = Config> = {
   activeZones?: Record<string, boolean>;
   pathData?: PathData;
   registerPath?: (id: string, selector: ItemSelector, label: string) => void;
+  unregisterPath?: (id: string) => void;
   mode?: "edit" | "render";
   depth: number;
   registerLocalZone?: (zone: string, active: boolean) => void; // A zone as it pertains to the current area