@lvce-editor/panel-worker 1.6.0 → 1.8.0

package/dist/panelWorkerMain.js

@@ -64,7 +64,7 @@ const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
 const String = 4;
-const Boolean = 5;
+const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
 const Unknown = 8;
@@ -85,7 +85,7 @@ const getType = value => {
       }
       return Object$1;
     case 'boolean':
-      return Boolean;
+      return Boolean$1;
     default:
       return Unknown;
   }
@@ -463,12 +463,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -624,27 +624,27 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
@@ -655,8 +655,8 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
 };
 const create$7 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
@@ -666,14 +666,14 @@ const getSuccessResponse = (message, result) => {
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -703,35 +703,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -792,7 +792,6 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
@@ -886,6 +885,7 @@ const create$3 = async ({
 };
 
 const Tab = 'tab';
+const TabList = 'tablist';
 const ToolBar = 'toolbar';
 
 const Button = 1;
@@ -893,9 +893,10 @@ const Div = 4;
 const Text = 12;
 const Reference = 100;
 
+const TargetName = 'event.target.name';
+
 const RendererWorker = 1;
 
-const SetDom2 = 'Viewlet.setDom2';
 const SetPatches = 'Viewlet.setPatches';
 
 const createMockRpc = ({
@@ -1093,7 +1094,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.assetDir === newState.assetDir && oldState.initial === newState.initial && oldState.currentViewletId === newState.currentViewletId && oldState.selectedIndex === newState.selectedIndex && oldState.views === newState.views;
+  return oldState.assetDir === newState.assetDir && oldState.initial === newState.initial && oldState.currentViewletId === newState.currentViewletId && oldState.selectedIndex === newState.selectedIndex && oldState.views === newState.views && oldState.childUid === newState.childUid && oldState.actionsUid === newState.actionsUid;
 };
 
 const RenderItems = 4;
@@ -1204,7 +1205,10 @@ const loadContent = (state, savedState) => {
 };
 
 const selectIndex = async (state, index) => {
-  await openViewlet(state, state.views[index]);
+  const {
+    views
+  } = state;
+  await openViewlet(state, views[index]);
   return {
     ...state,
     selectedIndex: index
@@ -1239,6 +1243,21 @@ const toggleView = async (state, name) => {
   return selectIndex(state, index);
 };
 
+const selectName = async (state, name) => {
+  if (!name) {
+    return state;
+  }
+  const index = state.views.indexOf(name);
+  if (index === -1) {
+    return state;
+  }
+  return selectIndex(state, index);
+};
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const text = data => {
   return {
     childCount: 0,
@@ -1567,6 +1586,7 @@ const getActionsDom = newState => {
 const HandleClickClose = 'handleClickClose';
 const HandleClickMaximize = 'handleClickMaximize';
 const HandleClickSelectTab = 'HandleClickSelectTab';
+const HandleClickTab = 'HandleClickTab';
 
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
@@ -1594,7 +1614,7 @@ const getGlobalActionsDom = () => {
   return [{
     childCount: 2,
     className: PanelToolBar,
-    role: 'toolbar',
+    role: ToolBar,
     type: Div
   }, {
     ariaLabel: maximize(),
@@ -1605,7 +1625,7 @@ const getGlobalActionsDom = () => {
     type: Button
   }, {
     childCount: 0,
-    className: `${MaskIcon} ${MaskIconChevronUp}`,
+    className: mergeClassNames(MaskIcon, MaskIconChevronUp),
     type: Div
   }, {
     ariaLabel: close(),
@@ -1616,7 +1636,7 @@ const getGlobalActionsDom = () => {
     type: Button
   }, {
     childCount: 0,
-    className: `${MaskIcon} ${MaskIconClose}`,
+    className: mergeClassNames(MaskIcon, MaskIconClose),
     type: Div
   }];
 };
@@ -1628,6 +1648,7 @@ const getTabClassName = isSelected => {
   }
   return className;
 };
+
 const createPanelTab = (tab, badgeCount, isSelected, index) => {
   const label = tab;
   const className = getTabClassName(isSelected);
@@ -1638,7 +1659,7 @@ const createPanelTab = (tab, badgeCount, isSelected, index) => {
     className,
     'data-index': index,
     name: tab,
-    onClick: HandleClickSelectTab,
+    onClick: HandleClickTab,
     role: Tab,
     type: Button
   };
@@ -1673,6 +1694,7 @@ const getPanelHeaderDom = newState => {
   }, {
     childCount: newState.views.length,
     className: PanelTabs,
+    role: TabList,
     type: Div
   }, ...tabsDom, ...getActionsDom(newState), ...getGlobalActionsDom()];
 };
@@ -1693,19 +1715,18 @@ const getPanelDom = newState => {
 
 const renderItems = (oldState, newState) => {
   const {
-    initial,
-    uid
+    initial
   } = newState;
   if (initial) {
-    return [SetDom2, uid, []];
+    return [];
   }
   const dom = getPanelDom(newState);
-  return [SetDom2, uid, dom];
+  return dom;
 };
 
 const renderIncremental = (oldState, newState) => {
-  const oldDom = renderItems(oldState, oldState)[2];
-  const newDom = renderItems(newState, newState)[2];
+  const oldDom = renderItems(oldState, oldState);
+  const newDom = renderItems(newState, newState);
   const patches = diffTree(oldDom, newDom);
   return [SetPatches, newState.uid, patches];
 };
@@ -1753,6 +1774,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickSelectTab,
     params: ['selectIndexRaw', 'event.target.dataset.index']
+  }, {
+    name: HandleClickTab,
+    params: ['selectName', TargetName]
   }];
 };
 
@@ -1803,6 +1827,7 @@ const commandMap = {
   'Panel.saveState': wrapGetter(saveState),
   'Panel.selectIndex': wrapCommand(selectIndex),
   'Panel.selectIndexRaw': wrapCommand(selectRaw),
+  'Panel.selectName': wrapCommand(selectName),
   'Panel.setBadgeCount': wrapCommand(setBadgeCount),
   'Panel.terminate': terminate,
   'Panel.toggleView': wrapCommand(toggleView)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/panel-worker",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "Panel Worker",
   "repository": {
     "type": "git",