@lvce-editor/panel-worker 1.5.0 → 1.7.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;
   }
@@ -886,15 +886,17 @@ const create$3 = async ({
 };
 
 const Tab = 'tab';
+const ToolBar = 'toolbar';
 
 const Button = 1;
 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 = ({
@@ -1080,6 +1082,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
     initial: true,
     platform,
     selectedIndex: -1,
+    tabs: [],
     uid,
     views: [],
     warningCount: 0,
@@ -1091,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;
@@ -1126,6 +1129,7 @@ const handleClickClose = async state => {
 };
 
 const handleClickMaximize = async state => {
+  await invoke('Layout.maximizePanel');
   return state;
 };
 
@@ -1201,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
@@ -1236,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,
@@ -1551,7 +1573,7 @@ const getActionsDom = newState => {
     return [{
       childCount: 0,
       className: Actions,
-      role: 'toolbar',
+      role: ToolBar,
       type: Div
     }];
   }
@@ -1564,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;
@@ -1591,7 +1614,7 @@ const getGlobalActionsDom = () => {
   return [{
     childCount: 2,
     className: PanelToolBar,
-    role: 'toolbar',
+    role: ToolBar,
     type: Div
   }, {
     ariaLabel: maximize(),
@@ -1602,7 +1625,7 @@ const getGlobalActionsDom = () => {
     type: Button
   }, {
     childCount: 0,
-    className: `${MaskIcon} ${MaskIconChevronUp}`,
+    className: mergeClassNames(MaskIcon, MaskIconChevronUp),
     type: Div
   }, {
     ariaLabel: close(),
@@ -1613,26 +1636,32 @@ const getGlobalActionsDom = () => {
     type: Button
   }, {
     childCount: 0,
-    className: `${MaskIcon} ${MaskIconClose}`,
+    className: mergeClassNames(MaskIcon, MaskIconClose),
     type: Div
   }];
 };
 
-const createPanelTab = (tab, badgeCount, isSelected, index) => {
-  const label = tab;
+const getTabClassName = isSelected => {
   let className = PanelTab;
   if (isSelected) {
     className += ' ' + PanelTabSelected;
   }
+  return className;
+};
+
+const createPanelTab = (tab, badgeCount, isSelected, index) => {
+  const label = tab;
+  const className = getTabClassName(isSelected);
   const childCount = badgeCount ? 2 : 1;
   const tabDom = {
     ariaSelected: isSelected,
     childCount,
     className,
     'data-index': index,
+    name: tab,
     onClick: HandleClickSelectTab,
     role: Tab,
-    type: Div
+    type: Button
   };
   const dom = [tabDom, text(label)];
   if (badgeCount) {
@@ -1644,6 +1673,7 @@ const createPanelTab = (tab, badgeCount, isSelected, index) => {
   }
   return dom;
 };
+
 const getPanelTabsVirtualDom = (tabs, selectedIndex, badgeCounts) => {
   const dom = [];
   for (let i = 0; i < tabs.length; i++) {
@@ -1655,24 +1685,29 @@ const getPanelTabsVirtualDom = (tabs, selectedIndex, badgeCounts) => {
   return dom;
 };
 
-const getPanelDom = newState => {
-  const {
-    childUid
-  } = newState;
+const getPanelHeaderDom = newState => {
   const tabsDom = getPanelTabsVirtualDom(newState.views, newState.selectedIndex, newState.badgeCounts);
   return [{
-    childCount: 2,
-    className: Panel,
-    type: Div
-  }, {
     childCount: 3,
     className: PanelHeader,
     type: Div
   }, {
     childCount: newState.views.length,
     className: PanelTabs,
+    role: 'tablist',
+    type: Div
+  }, ...tabsDom, ...getActionsDom(newState), ...getGlobalActionsDom()];
+};
+
+const getPanelDom = newState => {
+  const {
+    childUid
+  } = newState;
+  return [{
+    childCount: 2,
+    className: Panel,
     type: Div
-  }, ...tabsDom, ...getActionsDom(newState), ...getGlobalActionsDom(), {
+  }, ...getPanelHeaderDom(newState), {
     type: Reference,
     uid: childUid
   }];
@@ -1680,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];
 };
@@ -1740,6 +1774,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickSelectTab,
     params: ['selectIndexRaw', 'event.target.dataset.index']
+  }, {
+    name: HandleClickTab,
+    params: ['selectName', TargetName]
   }];
 };
 
@@ -1790,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.5.0",
+  "version": "1.7.0",
   "description": "Panel Worker",
   "repository": {
     "type": "git",