@trops/dash-core 0.1.182 → 0.1.184

package/dist/index.js

@@ -27582,7 +27582,7 @@ var STATUS = {
  * @returns {Object} WebSocket provider interface
  */
 var useWebSocketProvider = function useWebSocketProvider(providerType) {
-  var _app$providers;
+  var _dashApi$api, _app$providers;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _options$autoConnect = options.autoConnect,
     autoConnect = _options$autoConnect === void 0 ? true : _options$autoConnect,
@@ -27629,6 +27629,10 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
   var maxMessagesRef = React.useRef(maxMessages);
   maxMessagesRef.current = maxMessages;
   var dashApi = app === null || app === void 0 ? void 0 : app.dashApi;
+  // Access the raw preload bridge (mainApi) for the webSocket sub-API.
+  // dashApi is an ElectronDashboardApi wrapper; the webSocket methods
+  // live on the underlying mainApi object (dashApi.api).
+  var wsApi = dashApi === null || dashApi === void 0 || (_dashApi$api = dashApi.api) === null || _dashApi$api === void 0 ? void 0 : _dashApi$api.webSocket;
 
   // Get the widget data
   var widgetData = widgetContext === null || widgetContext === void 0 ? void 0 : widgetContext.widgetData;
@@ -27680,7 +27684,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           }
           return _context2.abrupt("return");
         case 1:
-          if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !provider)) {
+          if (!(!wsApi || !provider)) {
             _context2.next = 2;
             break;
           }
@@ -27709,7 +27713,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           }
           _context2.prev = 5;
           _context2.next = 6;
-          return dashApi.webSocket.getStatus(selectedProviderName);
+          return wsApi.getStatus(selectedProviderName);
         case 6:
           statusResult = _context2.sent;
           if (!((statusResult === null || statusResult === void 0 ? void 0 : statusResult.status) === "connected")) {
@@ -27786,7 +27790,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
                 case 0:
                   _context.prev = 0;
                   _context.next = 1;
-                  return dashApi.webSocket.connect(selectedProviderName, {
+                  return wsApi.connect(selectedProviderName, {
                     url: provider.wsConfig.url,
                     headers: provider.wsConfig.headers || null,
                     subprotocols: provider.wsConfig.subprotocols || null,
@@ -27866,7 +27870,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           return _context2.stop();
       }
     }, _callee2, null, [[5, 8], [10, 14], [18, 22]]);
-  })), [dashApi, provider, providerType, selectedProviderName, applyConnected]);
+  })), [wsApi, provider, providerType, selectedProviderName, applyConnected]);
 
   /**
    * Disconnect from the WebSocket server.
@@ -27877,7 +27881,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
     return _regeneratorRuntime.wrap(function (_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName)) {
+          if (!(!wsApi || !selectedProviderName)) {
             _context3.next = 1;
             break;
           }
@@ -27915,7 +27919,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           pendingConnects["delete"](selectedProviderName);
           _context3.prev = 4;
           _context3.next = 5;
-          return dashApi.webSocket.disconnect(selectedProviderName);
+          return wsApi.disconnect(selectedProviderName);
         case 5:
           _context3.next = 7;
           break;
@@ -27927,7 +27931,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           return _context3.stop();
       }
     }, _callee3, null, [[4, 6]]);
-  })), [dashApi, selectedProviderName]);
+  })), [wsApi, selectedProviderName]);
 
   /**
    * Send data through the WebSocket connection
@@ -27938,14 +27942,14 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            if (!(!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName)) {
+            if (!(!wsApi || !selectedProviderName)) {
               _context4.next = 1;
               break;
             }
             throw new Error("WebSocket not connected");
           case 1:
             _context4.next = 2;
-            return dashApi.webSocket.send(selectedProviderName, data);
+            return wsApi.send(selectedProviderName, data);
           case 2:
             result = _context4.sent;
             if (!result.error) {
@@ -27964,7 +27968,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [dashApi, selectedProviderName]);
+  }(), [wsApi, selectedProviderName]);
 
   // Keep a ref to connect so the auto-connect effect doesn't depend on it
   var connectRef = React.useRef(connect);
@@ -27972,7 +27976,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
 
   // Listen for incoming messages from main process
   React.useEffect(function () {
-    if (!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName) return;
+    if (!wsApi || !selectedProviderName) return;
     var handleMessage = function handleMessage(_event, payload) {
       if (payload.provider !== selectedProviderName) return;
       if (!mountedRef.current) return;
@@ -27987,15 +27991,15 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       setMessages(next);
       setLastMessage(msg);
     };
-    dashApi.webSocket.onMessage(handleMessage);
+    wsApi.onMessage(handleMessage);
     return function () {
-      return dashApi.webSocket.offMessage(handleMessage);
+      return wsApi.offMessage(handleMessage);
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
 
   // Listen for status changes from main process
   React.useEffect(function () {
-    if (!(dashApi !== null && dashApi !== void 0 && dashApi.webSocket) || !selectedProviderName) return;
+    if (!wsApi || !selectedProviderName) return;
     var handleStatusChange = function handleStatusChange(_event, payload) {
       if (payload.provider !== selectedProviderName) return;
       if (!mountedRef.current) return;
@@ -28032,11 +28036,11 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
         }
       }
     };
-    dashApi.webSocket.onStatusChange(handleStatusChange);
+    wsApi.onStatusChange(handleStatusChange);
     return function () {
-      return dashApi.webSocket.offStatusChange(handleStatusChange);
+      return wsApi.offStatusChange(handleStatusChange);
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
 
   // Auto-connect on mount or when provider selection changes
   React.useEffect(function () {
@@ -28053,7 +28057,7 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
       mountedRef.current = false;
 
       // Decrement consumer count; only disconnect if last consumer
-      if (connectedRef.current && dashApi !== null && dashApi !== void 0 && dashApi.webSocket && selectedProviderName) {
+      if (connectedRef.current && wsApi && selectedProviderName) {
         var state = connectionStates.get(selectedProviderName);
         if (state) {
           state.consumerCount = Math.max(0, state.consumerCount - 1);
@@ -28065,10 +28069,10 @@ var useWebSocketProvider = function useWebSocketProvider(providerType) {
           // Last consumer — disconnect
           connectionStates["delete"](selectedProviderName);
         }
-        dashApi.webSocket.disconnect(selectedProviderName)["catch"](function () {});
+        wsApi.disconnect(selectedProviderName)["catch"](function () {});
       }
     };
-  }, [dashApi, selectedProviderName]);
+  }, [wsApi, selectedProviderName]);
   return {
     isConnected: isConnected,
     isConnecting: isConnecting,
@@ -40517,17 +40521,44 @@ var ThemeDetail = function ThemeDetail(_ref6) {
 
 function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var ThemesSection = function ThemesSection(_ref) {
-  var _ref$onOpenThemeEdito = _ref.onOpenThemeEditor,
-    onOpenThemeEditor = _ref$onOpenThemeEdito === void 0 ? null : _ref$onOpenThemeEdito,
-    _ref$dashApi = _ref.dashApi,
-    dashApi = _ref$dashApi === void 0 ? null : _ref$dashApi,
-    _ref$credentials = _ref.credentials,
-    credentials = _ref$credentials === void 0 ? null : _ref$credentials,
-    _ref$createRequested = _ref.createRequested,
-    createRequested = _ref$createRequested === void 0 ? false : _ref$createRequested,
-    _ref$onCreateAcknowle = _ref.onCreateAcknowledged,
-    onCreateAcknowledged = _ref$onCreateAcknowle === void 0 ? null : _ref$onCreateAcknowle;
+var BackToChooser = function BackToChooser(_ref) {
+  var onClick = _ref.onClick,
+    children = _ref.children;
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "flex flex-col h-full overflow-hidden",
+    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "flex-shrink-0 px-4 pt-4",
+      children: /*#__PURE__*/jsxRuntime.jsxs("button", {
+        type: "button",
+        onClick: onClick,
+        className: "flex items-center gap-1.5 text-sm opacity-60 hover:opacity-100 transition-opacity",
+        children: [/*#__PURE__*/jsxRuntime.jsx(DashReact.FontAwesomeIcon, {
+          icon: "arrow-left",
+          className: "h-3 w-3"
+        }), /*#__PURE__*/jsxRuntime.jsx("span", {
+          children: "Back"
+        })]
+      })
+    }), /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "flex-1 min-h-0 overflow-y-auto",
+      children: children
+    })]
+  });
+};
+
+// ─── Main Component ──────────────────────────────────────────────────────
+
+var ThemesSection = function ThemesSection(_ref2) {
+  var _ref2$onOpenThemeEdit = _ref2.onOpenThemeEditor,
+    onOpenThemeEditor = _ref2$onOpenThemeEdit === void 0 ? null : _ref2$onOpenThemeEdit,
+    _ref2$dashApi = _ref2.dashApi,
+    dashApi = _ref2$dashApi === void 0 ? null : _ref2$dashApi,
+    _ref2$credentials = _ref2.credentials,
+    credentials = _ref2$credentials === void 0 ? null : _ref2$credentials,
+    _ref2$createRequested = _ref2.createRequested,
+    createRequested = _ref2$createRequested === void 0 ? false : _ref2$createRequested,
+    _ref2$onCreateAcknowl = _ref2.onCreateAcknowledged,
+    onCreateAcknowledged = _ref2$onCreateAcknowl === void 0 ? null : _ref2$onCreateAcknowl;
   var _useContext = React.useContext(DashReact.ThemeContext),
     themes = _useContext.themes,
     currentThemeKey = _useContext.themeKey,
@@ -40565,6 +40596,10 @@ var ThemesSection = function ThemesSection(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     enteredViaChooser = _useState12[0],
     setEnteredViaChooser = _useState12[1];
+  var _useState13 = React.useState(null),
+    _useState14 = _slicedToArray(_useState13, 2),
+    initialMethod = _useState14[0],
+    setInitialMethod = _useState14[1];
   var themeEntries = themes ? Object.entries(themes) : [];
   var appId = credentials === null || credentials === void 0 ? void 0 : credentials.appId;
   var rowStyles = DashReact.getStylesForItem(DashReact.themeObjects.PANEL_HEADER, currentTheme, {
@@ -40625,9 +40660,9 @@ var ThemesSection = function ThemesSection(_ref) {
     if (!dashApi || !appId) return;
     if (key === currentThemeKey) {
       var _themeEntries$find;
-      var otherKey = (_themeEntries$find = themeEntries.find(function (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 1),
-          k = _ref3[0];
+      var otherKey = (_themeEntries$find = themeEntries.find(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 1),
+          k = _ref4[0];
         return k !== key;
       })) === null || _themeEntries$find === void 0 ? void 0 : _themeEntries$find[0];
       if (otherKey) {
@@ -40743,10 +40778,10 @@ var ThemesSection = function ThemesSection(_ref) {
     }), /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "flex-1 overflow-y-auto min-h-0",
       children: /*#__PURE__*/jsxRuntime.jsxs(DashReact.Sidebar.Content, {
-        children: [themeEntries.map(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-            key = _ref5[0],
-            theme = _ref5[1];
+        children: [themeEntries.map(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 2),
+            key = _ref6[0],
+            theme = _ref6[1];
           var isActive = key === currentThemeKey;
           var isSelected = selectedThemeKey === key && generateMode === GENERATE_MODES.NONE && installMode !== "marketplace";
           return /*#__PURE__*/jsxRuntime.jsx(DashReact.Sidebar.Item, {
@@ -40807,38 +40842,57 @@ var ThemesSection = function ThemesSection(_ref) {
         setInstallMode("marketplace");
         setEnteredViaChooser(true);
       },
-      onCreateNew: function onCreateNew() {
-        setGenerateMode(GENERATE_MODES.WIZARD);
-      },
-      onCreateFromUrl: function onCreateFromUrl() {
-        setGenerateMode(GENERATE_MODES.FROM_URL);
+      onSelectMethod: function onSelectMethod(method) {
+        setInitialMethod(method);
+        if (method === "presets") setGenerateMode(GENERATE_MODES.PRESETS);else if (method === "color") setGenerateMode(GENERATE_MODES.COLOR);else if (method === "from-url") setGenerateMode(GENERATE_MODES.FROM_URL);else setGenerateMode(GENERATE_MODES.WIZARD);
       }
     });
   } else if (generateMode === GENERATE_MODES.WIZARD) {
-    detailContent = /*#__PURE__*/jsxRuntime.jsx(ThemeQuickCreate, {
-      wizardName: wizardName,
-      setWizardName: setWizardName,
-      wizardMethod: wizardMethod,
-      setWizardMethod: setWizardMethod,
-      wizardTheme: wizardTheme,
-      setWizardTheme: setWizardTheme,
-      onComplete: handleWizardComplete,
-      onExtract: handleUrlExtract,
-      onMapToTheme: handleUrlMapToTheme
+    detailContent = /*#__PURE__*/jsxRuntime.jsx(BackToChooser, {
+      onClick: function onClick() {
+        return setGenerateMode(GENERATE_MODES.CHOOSER);
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx(ThemeQuickCreate, {
+        wizardName: wizardName,
+        setWizardName: setWizardName,
+        wizardMethod: wizardMethod,
+        setWizardMethod: setWizardMethod,
+        wizardTheme: wizardTheme,
+        setWizardTheme: setWizardTheme,
+        onComplete: handleWizardComplete,
+        onExtract: handleUrlExtract,
+        onMapToTheme: handleUrlMapToTheme,
+        initialMethod: initialMethod
+      })
     });
   } else if (generateMode === GENERATE_MODES.PRESETS) {
-    detailContent = /*#__PURE__*/jsxRuntime.jsx(PresetGallery, {
-      onSelect: handleCreateFromPreset
+    detailContent = /*#__PURE__*/jsxRuntime.jsx(BackToChooser, {
+      onClick: function onClick() {
+        return setGenerateMode(GENERATE_MODES.CHOOSER);
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx(PresetGallery, {
+        onSelect: handleCreateFromPreset
+      })
     });
   } else if (generateMode === GENERATE_MODES.FROM_URL) {
-    detailContent = /*#__PURE__*/jsxRuntime.jsx(DashReact.ThemeFromUrlPane, {
-      onExtract: handleUrlExtract,
-      onMapToTheme: handleUrlMapToTheme,
-      onGenerate: handleUrlThemeGenerated
+    detailContent = /*#__PURE__*/jsxRuntime.jsx(BackToChooser, {
+      onClick: function onClick() {
+        return setGenerateMode(GENERATE_MODES.CHOOSER);
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx(DashReact.ThemeFromUrlPane, {
+        onExtract: handleUrlExtract,
+        onMapToTheme: handleUrlMapToTheme,
+        onGenerate: handleUrlThemeGenerated
+      })
     });
   } else if (generateMode === GENERATE_MODES.COLOR) {
-    detailContent = /*#__PURE__*/jsxRuntime.jsx(ColorHarmonyPicker, {
-      onGenerate: handleCreateFromHarmony
+    detailContent = /*#__PURE__*/jsxRuntime.jsx(BackToChooser, {
+      onClick: function onClick() {
+        return setGenerateMode(GENERATE_MODES.CHOOSER);
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx(ColorHarmonyPicker, {
+        onGenerate: handleCreateFromHarmony
+      })
     });
   } else if (selectedThemeKey && themes && themes[selectedThemeKey]) {
     detailContent = /*#__PURE__*/jsxRuntime.jsx(ThemeDetail, {