@trops/dash-core 0.1.272 → 0.1.274

package/dist/index.js

@@ -23963,6 +23963,7 @@ var DraggableDroppableCellBody = function DraggableDroppableCellBody(_ref) {
   var cellNumber = _ref.cellNumber,
     gridContainerId = _ref.gridContainerId,
     onMoveWidgetToCell = _ref.onMoveWidgetToCell,
+    onDropWidgetFromSidebar = _ref.onDropWidgetFromSidebar,
     hasSpan = _ref.hasSpan,
     children = _ref.children,
     padding = _ref.padding;
@@ -23986,42 +23987,52 @@ var DraggableDroppableCellBody = function DraggableDroppableCellBody(_ref) {
     drag = _useDrag2[1];
   var _useDrop = reactDnd.useDrop(function () {
       return {
-        accept: GRID_CELL_WIDGET_TYPE,
-        canDrop: function canDrop(dragItem) {
+        accept: [GRID_CELL_WIDGET_TYPE, SIDEBAR_WIDGET_TYPE],
+        canDrop: function canDrop(dragItem, monitor) {
+          var itemType = monitor.getItemType();
+          if (itemType === SIDEBAR_WIDGET_TYPE) return true;
           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);
+        drop: function drop(dragItem, monitor) {
+          var itemType = monitor.getItemType();
+          if (itemType === SIDEBAR_WIDGET_TYPE) {
+            if (onDropWidgetFromSidebar) onDropWidgetFromSidebar(gridContainerId, cellNumber, dragItem.widgetKey);
+          } else {
+            if (onMoveWidgetToCell) onMoveWidgetToCell(gridContainerId, dragItem.cellNumber, cellNumber);
+          }
         },
         collect: function collect(monitor) {
           return {
             isOver: monitor.isOver(),
-            canDrop: monitor.canDrop()
+            canDrop: monitor.canDrop(),
+            itemType: monitor.getItemType()
           };
         }
       };
-    }, [cellNumber, gridContainerId, onMoveWidgetToCell, hasSpan]),
+    }, [cellNumber, gridContainerId, onMoveWidgetToCell, onDropWidgetFromSidebar, hasSpan]),
     _useDrop2 = _slicedToArray(_useDrop, 2),
     _useDrop2$ = _useDrop2[0],
     isOver = _useDrop2$.isOver,
     canDrop = _useDrop2$.canDrop,
+    itemType = _useDrop2$.itemType,
     drop = _useDrop2[1];
+  var isSidebarDrop = itemType === SIDEBAR_WIDGET_TYPE;
   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" : ""),
+    className: "flex-1 min-h-0 overflow-auto relative ".concat(padding, " ").concat(isDragging ? "opacity-30" : "", " ").concat(isOver && canDrop ? isSidebarDrop ? "ring-2 ring-green-500 ring-inset" : "ring-2 ring-blue-500 ring-inset" : ""),
     style: {
       cursor: "grab"
     },
     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",
+      className: "absolute inset-0 flex items-center justify-center ".concat(isSidebarDrop ? "bg-green-600/30" : "bg-blue-600/30", " rounded pointer-events-none"),
       children: /*#__PURE__*/jsxRuntime.jsx("span", {
-        className: "text-sm font-bold text-blue-200",
-        children: "Swap"
+        className: "text-sm font-bold ".concat(isSidebarDrop ? "text-green-200" : "text-blue-200"),
+        children: isSidebarDrop ? "Drop here" : "Swap"
       })
     })]
   });
@@ -25094,6 +25105,7 @@ var LayoutGridContainer = /*#__PURE__*/React.memo(function (_ref3) {
         cellNumber: cellNumber,
         gridContainerId: id,
         onMoveWidgetToCell: onMoveWidgetToCell,
+        onDropWidgetFromSidebar: onDropWidgetFromSidebar,
         hasSpan: !!(cellDef.span && (cellDef.span.row && cellDef.span.row > 1 || cellDef.span.col && cellDef.span.col > 1)),
         padding: "p-3",
         children: renderedWidget
@@ -45194,7 +45206,7 @@ var useInstalledWidgets = function useInstalledWidgets() {
         case 2:
           list = _context.sent;
           (list || []).forEach(function (w) {
-            registryByName[w.name] = w;
+            registryByName[w.packageId || w.name] = w;
           });
         case 3:
           installedFromCM = Object.keys(cMap).filter(function (key) {
@@ -45362,17 +45374,32 @@ function useWidgetUpdates() {
     if (installed.length === 0) return;
     checkedRef.current = true;
     setIsChecking(true);
-    var payload = installed.map(function (w) {
-      return {
-        name: w.name,
-        version: w.version
-      };
+
+    // Deduplicate by package — multiple widgets in the same package share one version
+    var pkgMap = new Map();
+    installed.forEach(function (w) {
+      var pkgId = w.packageId || w.name;
+      if (!pkgMap.has(pkgId)) {
+        pkgMap.set(pkgId, {
+          name: pkgId,
+          version: w.version
+        });
+      }
     });
+    var payload = Array.from(pkgMap.values());
     (_window$mainApi = window.mainApi) === null || _window$mainApi === void 0 || (_window$mainApi = _window$mainApi.registry) === null || _window$mainApi === void 0 || _window$mainApi.checkUpdates(payload).then(function (results) {
       if (Array.isArray(results) && results.length > 0) {
         var map = new Map();
         results.forEach(function (r) {
-          return map.set(r.name, r);
+          // Key by package ID (from result)
+          map.set(r.name, r);
+          // Also key by each widget's CM key so UI can look up by widget name
+          installed.forEach(function (w) {
+            var pkgId = w.packageId || w.name;
+            if (pkgId === r.name) {
+              map.set(w.name, r);
+            }
+          });
         });
         setUpdates(map);
       }
@@ -45385,7 +45412,7 @@ function useWidgetUpdates() {
   // Update a single widget by downloading the latest version
   var updateWidget = React.useCallback(/*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(name) {
-      var info, resolvedUrl;
+      var info, widget, packageId, resolvedUrl;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -45396,11 +45423,16 @@ function useWidgetUpdates() {
             }
             return _context.abrupt("return");
           case 1:
+            // Use packageId for install — name may be a CM key (widget-level)
+            widget = installedWidgets.find(function (w) {
+              return w.name === name;
+            });
+            packageId = (widget === null || widget === void 0 ? void 0 : widget.packageId) || info.name || name;
             setIsUpdating(name);
             _context.prev = 2;
-            resolvedUrl = info.downloadUrl.replace(/\{version\}/g, info.latestVersion).replace(/\{name\}/g, name);
+            resolvedUrl = info.downloadUrl.replace(/\{version\}/g, info.latestVersion).replace(/\{name\}/g, packageId);
             _context.next = 3;
-            return window.mainApi.widgets.install(name, resolvedUrl);
+            return window.mainApi.widgets.install(packageId, resolvedUrl);
           case 3:
             // Remove from updates map on success
             setUpdates(function (prev) {
@@ -45427,7 +45459,7 @@ function useWidgetUpdates() {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [updates, onUpdated]);
+  }(), [updates, onUpdated, installedWidgets]);
   return {
     updates: updates,
     isChecking: isChecking,