destructure and coerce earlier

apache · Sep 16, 2020 · 531c36c · 531c36c
1 parent 41f2391
commit 531c36c
Showing 1 changed file with 21 additions and 14 deletions.
diff --git a/superset-frontend/src/dashboard/util/getComponentWidthFromDrop.js b/superset-frontend/src/dashboard/util/getComponentWidthFromDrop.js
@@ -37,42 +37,49 @@ export default function getComponentWidthFromDrop({
     return component.meta.width;
   }
 
-  const draggingWidth = getDetailedComponentWidth({
+  const {
+    width: draggingWidth,
+    minimumWidth: minDraggingWidth,
+  } = getDetailedComponentWidth({
     component,
     components,
   });
 
-  const destinationWidth = getDetailedComponentWidth({
+  const {
+    width: destinationWidth,
+    occupiedWidth: draggingOccupiedWidth,
+  } = getDetailedComponentWidth({
     id: destination.id,
     components,
   });
 
-  let destinationCapacity =
-    destinationWidth.width - destinationWidth.occupiedWidth;
+  let destinationCapacity = Number(destinationWidth - draggingOccupiedWidth);
 
-  if (Number.isNaN(Number(destinationCapacity))) {
-    const grandparentWidth = getDetailedComponentWidth({
+  if (Number.isNaN(destinationCapacity)) {
+    const {
+      width: grandparentWidth,
+      occupiedWidth: grandparentOccupiedWidth,
+    } = getDetailedComponentWidth({
       id: findParentId({
         childId: destination.id,
         layout: components,
       }),
       components,
     });
 
-    destinationCapacity =
-      grandparentWidth.width - grandparentWidth.occupiedWidth;
+    destinationCapacity = Number(grandparentWidth - grandparentOccupiedWidth);
   }
 
   if (
-    Number.isNaN(Number(destinationCapacity)) ||
-    Number.isNaN(Number(draggingWidth.width))
+    Number.isNaN(destinationCapacity) ||
+    Number.isNaN(Number(draggingWidth))
   ) {
-    return draggingWidth.width;
+    return draggingWidth;
   }
-  if (destinationCapacity >= draggingWidth.width) {
-    return draggingWidth.width;
+  if (destinationCapacity >= draggingWidth) {
+    return draggingWidth;
   }
-  if (destinationCapacity >= draggingWidth.minimumWidth) {
+  if (destinationCapacity >= minDraggingWidth) {
     return destinationCapacity;
   }