fix: don't collide with parent if component contains drop zone

Author: chrisvxd

packages/core/components/DropZone/index.tsx

@@ -386,15 +386,15 @@ export const DropZoneEdit = forwardRef<HTMLDivElement, DropZoneProps>(
 
     useEffect(() => {
       if (registerLocalZone) {
-        registerLocalZone(zoneCompound, isEnabled);
+        registerLocalZone(zoneCompound, targetAccepted || isEnabled);
       }
 
       return () => {
         if (unregisterLocalZone) {
           unregisterLocalZone(zoneCompound);
         }
       };
-    }, [isEnabled, zoneCompound]);
+    }, [targetAccepted, isEnabled, zoneCompound]);
 
     const [contentIdsWithPreview, preview] = useContentIdsWithPreview(
       contentIds,

packages/core/lib/dnd/NestedDroppablePlugin.ts

@@ -210,8 +210,17 @@ export const findDeepestCandidate = (
 
     filteredCandidates.reverse();
 
-    const zone = getZoneId(filteredCandidates[0]);
-    const area = filteredCandidates[0]?.data.areaId;
+    const primaryCandidate = filteredCandidates[0];
+    const primaryCandidateData = primaryCandidate.data as
+      | ComponentDndData
+      | DropZoneDndData;
+    const primaryCandidateIsComponent =
+      "containsActiveZone" in primaryCandidateData;
+    const zone = getZoneId(primaryCandidate);
+    const area =
+      primaryCandidateIsComponent && primaryCandidateData.containsActiveZone
+        ? filteredCandidates[0].id
+        : filteredCandidates[0]?.data.areaId;
 
     return { zone, area };
   }