@trops/dash-core 0.1.145 → 0.1.146

package/dist/index.esm.js

@@ -5647,10 +5647,10 @@ var syntax = SyntaxError;
 var type = TypeError;
 
 /** @type {import('./gOPD')} */
-var gOPD$5 = Object.getOwnPropertyDescriptor;
+var gOPD$6 = Object.getOwnPropertyDescriptor;
 
 /** @type {import('.')} */
-var $gOPD$2 = gOPD$5;
+var $gOPD$2 = gOPD$6;
 
 if ($gOPD$2) {
 	try {
@@ -5785,7 +5785,7 @@ defineProperties$1.supportsDescriptors = !!supportsDescriptors$2;
 
 var defineProperties_1 = defineProperties$1;
 
-var callBind$6 = {exports: {}};
+var callBind$7 = {exports: {}};
 
 /** @type {import('.')} */
 var esObjectAtoms = Object;
@@ -6085,78 +6085,60 @@ var callBindApplyHelpers = function callBindBasic(args) {
 	return $actualApply(bind$3, $call$1, args);
 };
 
-var get;
-var hasRequiredGet;
+var callBind$6 = callBindApplyHelpers;
+var gOPD$5 = gopd$1;
 
-function requireGet () {
-	if (hasRequiredGet) return get;
-	hasRequiredGet = 1;
-
-	var callBind = callBindApplyHelpers;
-	var gOPD = gopd$1;
-
-	var hasProtoAccessor;
-	try {
-		// eslint-disable-next-line no-extra-parens, no-proto
-		hasProtoAccessor = /** @type {{ __proto__?: typeof Array.prototype }} */ ([]).__proto__ === Array.prototype;
-	} catch (e) {
-		if (!e || typeof e !== 'object' || !('code' in e) || e.code !== 'ERR_PROTO_ACCESS') {
-			throw e;
-		}
+var hasProtoAccessor;
+try {
+	// eslint-disable-next-line no-extra-parens, no-proto
+	hasProtoAccessor = /** @type {{ __proto__?: typeof Array.prototype }} */ ([]).__proto__ === Array.prototype;
+} catch (e) {
+	if (!e || typeof e !== 'object' || !('code' in e) || e.code !== 'ERR_PROTO_ACCESS') {
+		throw e;
 	}
-
-	// eslint-disable-next-line no-extra-parens
-	var desc = !!hasProtoAccessor && gOPD && gOPD(Object.prototype, /** @type {keyof typeof Object.prototype} */ ('__proto__'));
-
-	var $Object = Object;
-	var $getPrototypeOf = $Object.getPrototypeOf;
-
-	/** @type {import('./get')} */
-	get = desc && typeof desc.get === 'function'
-		? callBind([desc.get])
-		: typeof $getPrototypeOf === 'function'
-			? /** @type {import('./get')} */ function getDunder(value) {
-				// eslint-disable-next-line eqeqeq
-				return $getPrototypeOf(value == null ? value : $Object(value));
-			}
-			: false;
-	return get;
 }
 
-var getProto$3;
-var hasRequiredGetProto;
+// eslint-disable-next-line no-extra-parens
+var desc = !!hasProtoAccessor && gOPD$5 && gOPD$5(Object.prototype, /** @type {keyof typeof Object.prototype} */ ('__proto__'));
+
+var $Object$3 = Object;
+var $getPrototypeOf = $Object$3.getPrototypeOf;
 
-function requireGetProto () {
-	if (hasRequiredGetProto) return getProto$3;
-	hasRequiredGetProto = 1;
+/** @type {import('./get')} */
+var get = desc && typeof desc.get === 'function'
+	? callBind$6([desc.get])
+	: typeof $getPrototypeOf === 'function'
+		? /** @type {import('./get')} */ function getDunder(value) {
+			// eslint-disable-next-line eqeqeq
+			return $getPrototypeOf(value == null ? value : $Object$3(value));
+		}
+		: false;
 
-	var reflectGetProto = requireReflect_getPrototypeOf();
-	var originalGetProto = requireObject_getPrototypeOf();
+var reflectGetProto = requireReflect_getPrototypeOf();
+var originalGetProto = requireObject_getPrototypeOf();
 
-	var getDunderProto = requireGet();
+var getDunderProto = get;
 
-	/** @type {import('.')} */
-	getProto$3 = reflectGetProto
+/** @type {import('.')} */
+var getProto$3 = reflectGetProto
+	? function getProto(O) {
+		// @ts-expect-error TS can't narrow inside a closure, for some reason
+		return reflectGetProto(O);
+	}
+	: originalGetProto
 		? function getProto(O) {
+			if (!O || (typeof O !== 'object' && typeof O !== 'function')) {
+				throw new TypeError('getProto: not an object');
+			}
 			// @ts-expect-error TS can't narrow inside a closure, for some reason
-			return reflectGetProto(O);
+			return originalGetProto(O);
 		}
-		: originalGetProto
+		: getDunderProto
 			? function getProto(O) {
-				if (!O || (typeof O !== 'object' && typeof O !== 'function')) {
-					throw new TypeError('getProto: not an object');
-				}
 				// @ts-expect-error TS can't narrow inside a closure, for some reason
-				return originalGetProto(O);
+				return getDunderProto(O);
 			}
-			: getDunderProto
-				? function getProto(O) {
-					// @ts-expect-error TS can't narrow inside a closure, for some reason
-					return getDunderProto(O);
-				}
-				: null;
-	return getProto$3;
-}
+			: null;
 
 var call = Function.prototype.call;
 var $hasOwn = Object.prototype.hasOwnProperty;
@@ -6219,7 +6201,7 @@ var ThrowTypeError = $gOPD$1
 
 var hasSymbols$3 = hasSymbols$4();
 
-var getProto$2 = requireGetProto();
+var getProto$2 = getProto$3;
 var $ObjectGPO = requireObject_getPrototypeOf();
 var $ReflectGPO = requireReflect_getPrototypeOf();
 
@@ -6616,9 +6598,9 @@ var applyBind = function applyBind() {
 	} else {
 		module.exports.apply = applyBind$1;
 	} 
-} (callBind$6));
+} (callBind$7));
 
-var callBindExports = callBind$6.exports;
+var callBindExports = callBind$7.exports;
 
 var GetIntrinsic$7 = getIntrinsic;
 
@@ -6917,7 +6899,7 @@ var getPolyfill$3 = polyfill$2;
 var gOPD$2 = gopd$1;
 var defineProperty = Object.defineProperty;
 var $TypeError$5 = esErrors;
-var getProto$1 = requireGetProto();
+var getProto$1 = getProto$3;
 var regex = /a/;
 
 var shim$3 = function shimFlags() {
@@ -9033,7 +9015,7 @@ var availableTypedArrays = availableTypedArrays$1;
 var callBind = callBindExports;
 var callBound$2 = callBound$i;
 var gOPD = gopd$1;
-var getProto = requireGetProto();
+var getProto = getProto$3;
 
 var $toString = callBound$2('Object.prototype.toString');
 var hasToStringTag = shams();
@@ -19879,9 +19861,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 = useDrag(function () {
@@ -19889,7 +19873,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 +19882,50 @@ var DraggableCellBody = function DraggableCellBody(_ref) {
           };
         }
       };
-    }, [cellNumber, gridContainerId]),
+    }, [cellNumber, gridContainerId, hasSpan]),
     _useDrag2 = _slicedToArray(_useDrag, 2),
     isDragging = _useDrag2[0].isDragging,
     drag = _useDrag2[1];
-  return /*#__PURE__*/jsx("div", {
-    ref: drag,
-    className: "flex-1 min-h-0 overflow-auto ".concat(padding, " ").concat(isDragging ? "opacity-30" : ""),
+  var _useDrop = 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__*/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__*/jsx("div", {
+      className: "absolute inset-0 flex items-center justify-center bg-blue-600/30 rounded pointer-events-none",
+      children: /*#__PURE__*/jsx("span", {
+        className: "text-sm font-bold text-blue-200",
+        children: "Swap"
+      })
+    })]
   });
 };
 var DroppableEmptyCell = function DroppableEmptyCell(_ref2) {
@@ -19916,7 +19934,7 @@ var DroppableEmptyCell = function DroppableEmptyCell(_ref2) {
     onMoveWidgetToCell = _ref2.onMoveWidgetToCell,
     onDropWidgetFromSidebar = _ref2.onDropWidgetFromSidebar,
     children = _ref2.children;
-  var _useDrop = useDrop(function () {
+  var _useDrop3 = useDrop(function () {
       return {
         accept: [GRID_CELL_WIDGET_TYPE, SIDEBAR_WIDGET_TYPE],
         canDrop: function canDrop(dragItem, monitor) {
@@ -19940,11 +19958,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__*/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 +20992,11 @@ var LayoutGridContainer = /*#__PURE__*/memo(function (_ref3) {
         onDelete: cellComponent ? function () {
           if (onClickRemove) onClickRemove(cellComponent.id);
         } : undefined
-      }), cellComponent && isWidgetResolvable(cellComponent.component) ? /*#__PURE__*/jsx(DraggableCellBody, {
+      }), cellComponent && isWidgetResolvable(cellComponent.component) ? /*#__PURE__*/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__*/jsx(DroppableEmptyCell, {
@@ -24747,8 +24767,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);
     }
   }, {