@trops/dash-core 0.1.145 → 0.1.147

package/dist/index.js

@@ -19879,9 +19879,11 @@ function _unsupportedIterableToArray$7(r, a) { if (r) { if ("string" == typeof r
 function _arrayLikeToArray$7(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$l(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$l(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$l(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$l(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var DraggableCellBody = function DraggableCellBody(_ref) {
+var DraggableDroppableCellBody = function DraggableDroppableCellBody(_ref) {
   var cellNumber = _ref.cellNumber,
     gridContainerId = _ref.gridContainerId,
+    onMoveWidgetToCell = _ref.onMoveWidgetToCell,
+    hasSpan = _ref.hasSpan,
     children = _ref.children,
     padding = _ref.padding;
   var _useDrag = reactDnd.useDrag(function () {
@@ -19889,7 +19891,8 @@ var DraggableCellBody = function DraggableCellBody(_ref) {
         type: GRID_CELL_WIDGET_TYPE,
         item: {
           cellNumber: cellNumber,
-          gridContainerId: gridContainerId
+          gridContainerId: gridContainerId,
+          hasSpan: hasSpan
         },
         collect: function collect(monitor) {
           return {
@@ -19897,17 +19900,50 @@ var DraggableCellBody = function DraggableCellBody(_ref) {
           };
         }
       };
-    }, [cellNumber, gridContainerId]),
+    }, [cellNumber, gridContainerId, hasSpan]),
     _useDrag2 = _slicedToArray(_useDrag, 2),
     isDragging = _useDrag2[0].isDragging,
     drag = _useDrag2[1];
-  return /*#__PURE__*/jsxRuntime.jsx("div", {
-    ref: drag,
-    className: "flex-1 min-h-0 overflow-auto ".concat(padding, " ").concat(isDragging ? "opacity-30" : ""),
+  var _useDrop = reactDnd.useDrop(function () {
+      return {
+        accept: GRID_CELL_WIDGET_TYPE,
+        canDrop: function canDrop(dragItem) {
+          if (dragItem.gridContainerId !== gridContainerId) return false;
+          if (dragItem.cellNumber === cellNumber) return false;
+          if (dragItem.hasSpan || hasSpan) return false;
+          return true;
+        },
+        drop: function drop(dragItem) {
+          if (onMoveWidgetToCell) onMoveWidgetToCell(gridContainerId, dragItem.cellNumber, cellNumber);
+        },
+        collect: function collect(monitor) {
+          return {
+            isOver: monitor.isOver(),
+            canDrop: monitor.canDrop()
+          };
+        }
+      };
+    }, [cellNumber, gridContainerId, onMoveWidgetToCell, hasSpan]),
+    _useDrop2 = _slicedToArray(_useDrop, 2),
+    _useDrop2$ = _useDrop2[0],
+    isOver = _useDrop2$.isOver,
+    canDrop = _useDrop2$.canDrop,
+    drop = _useDrop2[1];
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    ref: function ref(node) {
+      return drag(drop(node));
+    },
+    className: "flex-1 min-h-0 overflow-auto ".concat(padding, " ").concat(isDragging ? "opacity-30" : "", " ").concat(isOver && canDrop ? "ring-2 ring-blue-500 ring-inset" : ""),
     style: {
       cursor: "grab"
     },
-    children: children
+    children: [children, isOver && canDrop && /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "absolute inset-0 flex items-center justify-center bg-blue-600/30 rounded pointer-events-none",
+      children: /*#__PURE__*/jsxRuntime.jsx("span", {
+        className: "text-sm font-bold text-blue-200",
+        children: "Swap"
+      })
+    })]
   });
 };
 var DroppableEmptyCell = function DroppableEmptyCell(_ref2) {
@@ -19916,7 +19952,7 @@ var DroppableEmptyCell = function DroppableEmptyCell(_ref2) {
     onMoveWidgetToCell = _ref2.onMoveWidgetToCell,
     onDropWidgetFromSidebar = _ref2.onDropWidgetFromSidebar,
     children = _ref2.children;
-  var _useDrop = reactDnd.useDrop(function () {
+  var _useDrop3 = reactDnd.useDrop(function () {
       return {
         accept: [GRID_CELL_WIDGET_TYPE, SIDEBAR_WIDGET_TYPE],
         canDrop: function canDrop(dragItem, monitor) {
@@ -19940,11 +19976,11 @@ var DroppableEmptyCell = function DroppableEmptyCell(_ref2) {
         }
       };
     }, [cellNumber, gridContainerId, onMoveWidgetToCell, onDropWidgetFromSidebar]),
-    _useDrop2 = _slicedToArray(_useDrop, 2),
-    _useDrop2$ = _useDrop2[0],
-    isOver = _useDrop2$.isOver,
-    canDrop = _useDrop2$.canDrop,
-    drop = _useDrop2[1];
+    _useDrop4 = _slicedToArray(_useDrop3, 2),
+    _useDrop4$ = _useDrop4[0],
+    isOver = _useDrop4$.isOver,
+    canDrop = _useDrop4$.canDrop,
+    drop = _useDrop4[1];
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     ref: drop,
     className: "flex-1 min-h-0 relative flex flex-col ".concat(isOver && canDrop ? "ring-2 ring-green-500 ring-inset bg-green-900/20" : ""),
@@ -20974,9 +21010,11 @@ var LayoutGridContainer = /*#__PURE__*/React.memo(function (_ref3) {
         onDelete: cellComponent ? function () {
           if (onClickRemove) onClickRemove(cellComponent.id);
         } : undefined
-      }), cellComponent && isWidgetResolvable(cellComponent.component) ? /*#__PURE__*/jsxRuntime.jsx(DraggableCellBody, {
+      }), cellComponent && isWidgetResolvable(cellComponent.component) ? /*#__PURE__*/jsxRuntime.jsx(DraggableDroppableCellBody, {
         cellNumber: cellNumber,
         gridContainerId: id,
+        onMoveWidgetToCell: onMoveWidgetToCell,
+        hasSpan: !!(cellDef.span && (cellDef.span.row && cellDef.span.row > 1 || cellDef.span.col && cellDef.span.col > 1)),
         padding: "p-3",
         children: renderedWidget
       }) : /*#__PURE__*/jsxRuntime.jsx(DroppableEmptyCell, {
@@ -24747,8 +24785,9 @@ var DashboardModel = /*#__PURE__*/function () {
       var gridContainer = this.getComponentById(itemId);
       var grid = gridContainer.grid;
       var componentId = grid[sourceCellNumber].component;
+      var targetComponentId = grid[targetCellNumber].component;
       grid[targetCellNumber].component = componentId;
-      grid[sourceCellNumber].component = null;
+      grid[sourceCellNumber].component = targetComponentId;
       this.updateLayoutItem(gridContainer);
     }
   }, {