wip

dflex-js · Nov 3, 2023 · 94a92cc · 94a92cc
1 parent 3601461
commit 94a92cc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/packages/dflex-dnd/src/LayoutManager/DFlexDnDStore.ts b/packages/dflex-dnd/src/LayoutManager/DFlexDnDStore.ts
@@ -697,8 +697,7 @@ class DFlexDnDStore extends DFlexBaseStore {
   }
 
   private _reconcileSiblings(SK: string, syncAllSiblings: boolean): void {
-    const container = this.containers.get(SK)!;
-    const scroll = this.scrolls.get(SK)!;
+    const [container, scroll] = this.getContainers(SK);
 
     if (__DEV__) {
       if (!container) {
@@ -924,6 +923,13 @@ class DFlexDnDStore extends DFlexBaseStore {
     return undefined;
   }
 
+  getContainers(SK: string): [DFlexParentContainer, DFlexScrollContainer] {
+    const container = this.containers.get(SK)!;
+    const scroll = this.scrolls.get(SK)!;
+
+    return [container, scroll];
+  }
+
   cleanupSiblingsAttachments(BK: string, SK: string, depth: number): void {
     const scroll = this.scrolls.get(SK)!;
 

diff --git a/packages/dflex-dnd/src/Mechanism/DFlexMechanismController.ts b/packages/dflex-dnd/src/Mechanism/DFlexMechanismController.ts
@@ -877,10 +877,7 @@ class DFlexMechanismController extends DFlexScrollableElement {
       return false;
     }
 
-    const { containers, scrolls } = store;
-
-    const container = containers.get(SK)!;
-    const scroll = scrolls.get(SK)!;
+    const [container, scroll] = store.getContainers(SK)!;
 
     const viewportRect = container.getBoundaries();
 
@@ -944,7 +941,9 @@ class DFlexMechanismController extends DFlexScrollableElement {
 
     let isOutSiblingsContainer = false;
 
-    if (this._processScroll(x, y, SK)) {
+    const isHandledByScroll = this._processScroll(x, y, SK);
+
+    if (isHandledByScroll) {
       return;
     }
 

diff --git a/packages/dflex-dnd/test/__snapshots__/layoutManager.test.tsx.snap b/packages/dflex-dnd/test/__snapshots__/layoutManager.test.tsx.snap
@@ -109,11 +109,13 @@ DFlexDnDStore {
         "top": 0,
         "width": 0,
       },
-      "_siblingBoundaries": BoxNum {
+      "_siblingBoundaries": BoxRect {
         "bottom": 0,
+        "height": 0,
         "left": 0,
         "right": 0,
         "top": 0,
+        "width": 0,
       },
       "grid": PointNum {
         "x": 0,
@@ -142,11 +144,13 @@ DFlexDnDStore {
         "top": 0,
         "width": 0,
       },
-      "_siblingBoundaries": BoxNum {
+      "_siblingBoundaries": BoxRect {
         "bottom": 0,
+        "height": 0,
         "left": 0,
         "right": 0,
         "top": 0,
+        "width": 0,
       },
       "grid": PointNum {
         "x": 0,