@trops/dash-core 0.1.274 → 0.1.276

package/dist/index.js

@@ -45278,7 +45278,7 @@ var useInstalledWidgets = function useInstalledWidgets() {
   var uninstallWidget = React.useCallback(/*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(widgetName) {
       var _window$mainApi2;
-      var cMap, keysToRemove, _t2;
+      var widget, packageId, cMap, keysToRemove, _t2;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -45289,17 +45289,22 @@ var useInstalledWidgets = function useInstalledWidgets() {
             return _context2.abrupt("return");
           case 1:
             _context2.prev = 1;
-            // Remove matching ComponentManager entries so the widget
+            // Resolve packageId — widgetName may be a CM key (e.g. "AnalogClockWidget")
+            // but the registry is keyed by scoped package ID (e.g. "@trops/clock").
+            widget = widgets.find(function (w) {
+              return w.name === widgetName;
+            });
+            packageId = (widget === null || widget === void 0 ? void 0 : widget.packageId) || widgetName; // Remove matching ComponentManager entries so the widget
             // doesn't reappear as a "builtin" ghost after uninstall.
             cMap = ComponentManager.componentMap() || {};
             keysToRemove = Object.keys(cMap).filter(function (key) {
-              return cMap[key]._sourcePackage === widgetName;
+              return cMap[key]._sourcePackage === packageId;
             });
             keysToRemove.forEach(function (key) {
               return delete cMap[key];
             });
             _context2.next = 2;
-            return window.mainApi.widgets.uninstall(widgetName);
+            return window.mainApi.widgets.uninstall(packageId);
           case 2:
             _context2.next = 3;
             return refresh();
@@ -45319,7 +45324,7 @@ var useInstalledWidgets = function useInstalledWidgets() {
     return function (_x) {
       return _ref2.apply(this, arguments);
     };
-  }(), [refresh]);
+  }(), [refresh, widgets]);
   React.useEffect(function () {
     refresh();
     var handleWidgetsUpdated = function handleWidgetsUpdated() {
@@ -45635,15 +45640,25 @@ var WidgetsSection = function WidgetsSection(_ref) {
   // ── Uninstall with usage check ──────────────────────────────────────
 
   function handleDeleteRequest(widget) {
-    var usage = findWidgetUsage(widget.componentNames, workspaces);
+    // Find all sibling widgets in the same package (uninstall is package-level)
+    var siblings = widget.packageId && widget.source === "installed" ? widgets.filter(function (w) {
+      return w.packageId === widget.packageId && w.name !== widget.name;
+    }) : [];
+    var allComponentNames = [].concat(_toConsumableArray(widget.componentNames), _toConsumableArray(siblings.flatMap(function (s) {
+      return s.componentNames;
+    })));
+    var usage = findWidgetUsage(allComponentNames, workspaces);
     setDeleteUsage(usage);
-    setDeleteTarget(widget);
+    setDeleteTarget(_objectSpread$6(_objectSpread$6({}, widget), {}, {
+      _siblings: siblings
+    }));
   }
   function handleConfirmDelete() {
     return _handleConfirmDelete.apply(this, arguments);
   }
   function _handleConfirmDelete() {
     _handleConfirmDelete = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var allNames;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -45657,7 +45672,11 @@ var WidgetsSection = function WidgetsSection(_ref) {
             _context.next = 2;
             return uninstallWidget(deleteTarget.name);
           case 2:
-            if (selectedWidgetName === deleteTarget.name) {
+            // Clear selection if it was the target or any sibling
+            allNames = [deleteTarget.name].concat(_toConsumableArray((deleteTarget._siblings || []).map(function (s) {
+              return s.name;
+            })));
+            if (allNames.includes(selectedWidgetName)) {
               setSelectedWidgetName(null);
             }
             _context.next = 4;
@@ -46126,6 +46145,9 @@ var WidgetsSection = function WidgetsSection(_ref) {
 
   var paragraphStyles = DashReact.getStylesForItem(DashReact.themeObjects.PARAGRAPH, currentTheme);
   var deleteWidgetLabel = (deleteTarget === null || deleteTarget === void 0 ? void 0 : deleteTarget.displayName) || (deleteTarget === null || deleteTarget === void 0 ? void 0 : deleteTarget.name) || "";
+  var deleteSiblings = (deleteTarget === null || deleteTarget === void 0 ? void 0 : deleteTarget._siblings) || [];
+  var deletePackageLabel = deleteTarget !== null && deleteTarget !== void 0 && deleteTarget.packageId ? deleteTarget.packageId.replace(/^@[^/]+\//, "") : "";
+  var hasPackageSiblings = deleteSiblings.length > 0;
   return /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
     children: [/*#__PURE__*/jsxRuntime.jsx(SectionLayout, {
       listContent: listContent,
@@ -46143,8 +46165,8 @@ var WidgetsSection = function WidgetsSection(_ref) {
         setDeleteTarget(null);
         setDeleteUsage([]);
       },
-      title: "Uninstall Widget"
-    }, deleteUsage.length === 0 ? {
+      title: hasPackageSiblings ? "Uninstall Package" : "Uninstall Widget"
+    }, !hasPackageSiblings && deleteUsage.length === 0 ? {
       message: "Are you sure you want to uninstall \"".concat(deleteWidgetLabel, "\"?")
     } : {}), {}, {
       confirmLabel: "Uninstall",
@@ -46154,27 +46176,48 @@ var WidgetsSection = function WidgetsSection(_ref) {
         setDeleteTarget(null);
         setDeleteUsage([]);
       },
-      children: deleteUsage.length > 0 && /*#__PURE__*/jsxRuntime.jsxs("div", {
+      children: (hasPackageSiblings || deleteUsage.length > 0) && /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: paragraphStyles.textColor || "",
-        children: [/*#__PURE__*/jsxRuntime.jsxs("p", {
-          className: "text-sm leading-relaxed",
-          children: ["\"", deleteWidgetLabel, "\" is currently used in ", deleteUsage.length, " ", "dashboard", deleteUsage.length !== 1 ? "s" : "", ". Uninstalling will leave orphaned layout items on these dashboards."]
-        }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-          className: "mt-2 space-y-1",
-          children: [/*#__PURE__*/jsxRuntime.jsx("span", {
-            className: "text-xs font-semibold opacity-70",
-            children: "Affected dashboards:"
-          }), deleteUsage.map(function (u) {
-            return /*#__PURE__*/jsxRuntime.jsxs("div", {
-              className: "text-xs opacity-60 flex items-center gap-1.5 pl-2",
-              children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
-                icon: "triangle-exclamation",
-                className: "h-3 w-3 text-yellow-500"
-              }), u.workspaceName, " ", /*#__PURE__*/jsxRuntime.jsxs("span", {
-                className: "opacity-50",
-                children: ["(", u.count, " instance", u.count !== 1 ? "s" : "", ")"]
-              })]
-            }, u.workspaceId);
+        children: [hasPackageSiblings && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/jsxRuntime.jsxs("p", {
+            className: "text-sm leading-relaxed",
+            children: ["\"", deleteWidgetLabel, "\" is part of the", " ", /*#__PURE__*/jsxRuntime.jsx("span", {
+              className: "font-semibold",
+              children: deletePackageLabel
+            }), " ", "package. Uninstalling will remove all", " ", deleteSiblings.length + 1, " widgets in this package:"]
+          }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            className: "mt-2 mb-2 space-y-1",
+            children: [deleteTarget].concat(_toConsumableArray(deleteSiblings)).map(function (w) {
+              return /*#__PURE__*/jsxRuntime.jsxs("div", {
+                className: "text-xs opacity-60 flex items-center gap-1.5 pl-2",
+                children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
+                  icon: "puzzle-piece",
+                  className: "h-3 w-3"
+                }), w.displayName || w.name]
+              }, w.name);
+            })
+          })]
+        }), deleteUsage.length > 0 && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [/*#__PURE__*/jsxRuntime.jsxs("p", {
+            className: "text-sm leading-relaxed",
+            children: [hasPackageSiblings ? "These widgets are" : "\"".concat(deleteWidgetLabel, "\" is"), " ", "currently used in ", deleteUsage.length, " dashboard", deleteUsage.length !== 1 ? "s" : "", ". Uninstalling will leave orphaned layout items on these dashboards."]
+          }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+            className: "mt-2 space-y-1",
+            children: [/*#__PURE__*/jsxRuntime.jsx("span", {
+              className: "text-xs font-semibold opacity-70",
+              children: "Affected dashboards:"
+            }), deleteUsage.map(function (u) {
+              return /*#__PURE__*/jsxRuntime.jsxs("div", {
+                className: "text-xs opacity-60 flex items-center gap-1.5 pl-2",
+                children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
+                  icon: "triangle-exclamation",
+                  className: "h-3 w-3 text-yellow-500"
+                }), u.workspaceName, " ", /*#__PURE__*/jsxRuntime.jsxs("span", {
+                  className: "opacity-50",
+                  children: ["(", u.count, " instance", u.count !== 1 ? "s" : "", ")"]
+                })]
+              }, u.workspaceId);
+            })]
           })]
         })]
       })