@lvce-editor/panel-worker 2.13.1 → 2.13.3

package/dist/panelWorkerMain.js

@@ -96,6 +96,12 @@ const object = value => {
     throw new AssertionError('expected value to be of type object');
   }
 };
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
 const string = value => {
   const type = getType(value);
   if (type !== String$1) {
@@ -1111,12 +1117,12 @@ const create$2 = rpcId => {
   };
 };
 
-const Tab = 'tab';
+const Tab$1 = 'tab';
 const TabList = 'tablist';
 const ToolBar = 'toolbar';
 
 const Audio = 0;
-const Button = 1;
+const Button$1 = 1;
 const Col = 2;
 const ColGroup = 3;
 const Div = 4;
@@ -1207,7 +1213,7 @@ const VirtualDomElements = {
   Audio,
   BlockQuote,
   Br,
-  Button,
+  Button: Button$1,
   Canvas,
   Circle,
   Cite,
@@ -1284,8 +1290,18 @@ const VirtualDomElements = {
   Video
 };
 
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
+const Tab = 13;
+
+const Separator = 1;
+const None = 0;
+const Checked = 2;
+const Unchecked = 3;
+
 const RendererProcess = 1670;
 const RendererWorker = 1;
 
@@ -1300,6 +1316,13 @@ const {
   invoke: invoke$1,
   set: set$2
 } = create$2(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
+};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1560,12 +1583,14 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     actionsUid: 0,
     assetDir,
+    availableViews: [],
     badgeCounts: {},
     childUid: 0,
     currentViewletId: '',
     errorCount: 0,
     headerHeight: 35,
     height,
+    hiddenViews: [],
     initial: true,
     maximized: false,
     platform,
@@ -1632,6 +1657,60 @@ const getCurrentViewletId = state => {
   return currentViewletId;
 };
 
+const menuEntrySeparator = {
+  command: '',
+  flags: Separator,
+  id: 'separator',
+  label: ''
+};
+
+const getViewMenuItemFlags = (state, view) => {
+  const {
+    views
+  } = state;
+  return views.includes(view) ? Checked : Unchecked;
+};
+const getViewMenuEntry = (state, view) => {
+  const {
+    uid
+  } = state;
+  return {
+    args: [uid, view],
+    command: 'Panel.toggleViewVisibility',
+    flags: getViewMenuItemFlags(state, view),
+    id: `panelTab.${view}`,
+    label: view
+  };
+};
+const getTabMenuEntries = state => {
+  const {
+    availableViews
+  } = state;
+  return [...availableViews.map(view => getViewMenuEntry(state, view)), menuEntrySeparator, {
+    command: 'Layout.maximizePanel',
+    flags: None,
+    id: 'panel.maximize',
+    label: 'Maximize Panel'
+  }, {
+    command: 'Layout.hidePanel',
+    flags: None,
+    id: 'panel.hide',
+    label: 'Hide Panel'
+  }];
+};
+const getMenuEntries = (state, props) => {
+  switch (props.menuId) {
+    case Tab:
+      return getTabMenuEntries(state);
+    default:
+      return [];
+  }
+};
+
+const getMenuIds = () => {
+  return [Tab];
+};
+
 const state = {
   connected: false
 };
@@ -1713,6 +1792,22 @@ const handleProblemsSummaryChange = (state, summary) => {
   return setBadgeCount(state, Problems, count);
 };
 
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const handleTabContextMenu = async (state, _button, x, y) => {
+  number(x);
+  number(y);
+  const {
+    uid
+  } = state;
+  await show2(uid, Tab, x, y, {
+    menuId: Tab
+  });
+  return state;
+};
+
 const handleClickClose = async state => {
   await invoke$1('Layout.hidePanel');
   return state;
@@ -1791,6 +1886,21 @@ const getUid = () => {
   return Math.random();
 };
 
+const pending = new Map();
+const add = (uid, childUid) => {
+  let children = pending.get(uid);
+  if (!children) {
+    children = new Set();
+    pending.set(uid, children);
+  }
+  children.add(childUid);
+};
+const take = uid => {
+  const children = pending.get(uid);
+  pending.delete(uid);
+  return children ? [...children] : [];
+};
+
 const command = 'SaveState.saveViewletStateWithStorageId';
 const isCommandNotFoundError = error => {
   if (!(error instanceof Error)) {
@@ -1816,6 +1926,7 @@ const openViewlet = async (state, id, focus = false, uri = '') => {
   const {
     childUid: currentChildUid,
     currentViewletId,
+    uid,
     views
   } = state;
   if (!views.includes(id)) {
@@ -1829,7 +1940,7 @@ const openViewlet = async (state, id, focus = false, uri = '') => {
   const index = views.indexOf(id);
   await createViewlet(id, childUid, tabId, actionsUid, childDimensions, uri, focus);
   if (currentChildUid > 0) {
-    await invoke$1('Viewlet.dispose', currentChildUid);
+    add(uid, currentChildUid);
   }
   return {
     ...state,
@@ -1846,14 +1957,21 @@ const loadContent = (state, savedState, workspaceUri = '') => {
     currentViewletId: activeViewletId
   } = state;
   const savedViewletId = getSavedViewletId(savedState);
-  const views = getPanelViews(workspaceUri);
+  const availableViews = getPanelViews(workspaceUri);
+  const hiddenViews = (savedState?.hiddenViews || []).filter(view => availableViews.includes(view));
+  let views = availableViews.filter(view => !hiddenViews.includes(view));
+  if (views.length === 0 && availableViews.length > 0) {
+    views = [availableViews[0]];
+  }
   let currentViewletId = savedViewletId;
   if (!views.includes(currentViewletId)) {
     currentViewletId = views.includes(activeViewletId) ? activeViewletId : views[0];
   }
   const loaded = {
     ...state,
+    availableViews,
     currentViewletId,
+    hiddenViews: availableViews.filter(view => !views.includes(view)),
     views
   };
   return openViewlet(loaded, currentViewletId);
@@ -1875,13 +1993,24 @@ const selectRaw = async (state, rawIndex) => {
 
 const toggleView = async (state, name, uri = '') => {
   const {
+    availableViews,
     currentViewletId,
+    hiddenViews,
     views
   } = state;
-  const index = views.indexOf(name);
-  if (index === -1) {
+  if (!availableViews.includes(name)) {
     return state;
   }
+  if (!views.includes(name)) {
+    const nextHiddenViews = hiddenViews.filter(view => view !== name);
+    const nextViews = availableViews.filter(view => !nextHiddenViews.includes(view));
+    return selectIndex({
+      ...state,
+      hiddenViews: nextHiddenViews,
+      views: nextViews
+    }, nextViews.indexOf(name), uri);
+  }
+  const index = views.indexOf(name);
   if (name === currentViewletId) {
     return state;
   }
@@ -2201,6 +2330,7 @@ const HandleClickMaximize = 'handleClickMaximize';
 const HandleClickUnmaximize = 'handleClickUnmaximize';
 const HandleClickSelectTab = 'HandleClickSelectTab';
 const HandleClickTab = 'HandleClickTab';
+const HandleTabContextMenu = 'HandleTabContextMenu';
 
 const emptyObject = {};
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2252,7 +2382,7 @@ const getGlobalActionsDom = state => {
     className: IconButton,
     onClick: maximizeOnClick,
     title: maximizeLabel,
-    type: Button
+    type: Button$1
   }, {
     childCount: 0,
     className: mergeClassNames(MaskIcon, maximizeIcon),
@@ -2263,7 +2393,7 @@ const getGlobalActionsDom = state => {
     className: IconButton,
     onClick: HandleClickClose,
     title: close(),
-    type: Button
+    type: Button$1
   }, closeIconNode];
 };
 
@@ -2290,8 +2420,9 @@ const createPanelTab = (tab, badgeCount, isSelected) => {
     className,
     name: tab,
     onClick: HandleClickTab,
-    role: Tab,
-    type: Button
+    onContextMenu: HandleTabContextMenu,
+    role: Tab$1,
+    type: Button$1
   };
   const dom = [tabDom, text(label)];
   if (badgeCount) {
@@ -2385,13 +2516,33 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const render2 = (uid, diffResult) => {
+const hideViewlet = async uid => {
+  try {
+    const commands = await invoke$1('Viewlet.hide', uid);
+    if (Array.isArray(commands)) {
+      return commands;
+    }
+  } catch (error) {
+    // Older renderers do not support deferred container disposal yet.
+    if (!(error instanceof Error) || !error.message.includes('Viewlet.hide') || !error.message.toLowerCase().includes('not found')) {
+      throw error;
+    }
+  }
+  const commands = await invoke$1('Viewlet.dispose', uid, true);
+  return Array.isArray(commands) ? commands : [];
+};
+
+const render2 = async (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get(uid);
   set$1(uid, newState, newState);
-  const commands = applyRender(oldState, newState, diffResult);
+  const commands = [...applyRender(oldState, newState, diffResult)];
+  // Keep referenced DOM nodes until the parent patches have replaced them.
+  for (const childUid of take(uid)) {
+    commands.push(...(await hideViewlet(childUid)));
+  }
   if (!isConnected()) return commands;
   return renderDirect(uid, commands);
 };
@@ -2416,6 +2567,10 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickTab,
     params: ['selectName', TargetName]
+  }, {
+    name: HandleTabContextMenu,
+    params: ['handleTabContextMenu', Button, ClientX, ClientY],
+    preventDefault: true
   }];
 };
 
@@ -2444,11 +2599,13 @@ const resize = async (state, dimensions) => {
 const saveState = async state => {
   const {
     childUid,
-    currentViewletId
+    currentViewletId,
+    hiddenViews
   } = state;
   await saveViewletState(childUid, currentViewletId);
   return {
-    currentViewletId
+    currentViewletId,
+    hiddenViews
   };
 };
 
@@ -2483,6 +2640,49 @@ const applyComponentState = (currentState, state) => {
 };
 const setComponentState = wrapCommand(applyComponentState);
 
+const toggleViewVisibility = async (state, name) => {
+  const {
+    availableViews,
+    currentViewletId,
+    hiddenViews,
+    views
+  } = state;
+  if (!availableViews.includes(name)) {
+    return state;
+  }
+  if (!views.includes(name)) {
+    const nextHiddenViews = hiddenViews.filter(view => view !== name);
+    const nextViews = availableViews.filter(view => !nextHiddenViews.includes(view));
+    const nextState = {
+      ...state,
+      hiddenViews: nextHiddenViews,
+      selectedIndex: nextViews.indexOf(currentViewletId),
+      views: nextViews
+    };
+    if (views.length === 0) {
+      return openViewlet(nextState, name);
+    }
+    return nextState;
+  }
+  if (views.length <= 1) {
+    return state;
+  }
+  const nextViews = views.filter(view => view !== name);
+  const nextHiddenViews = availableViews.filter(view => !nextViews.includes(view));
+  const nextState = {
+    ...state,
+    hiddenViews: nextHiddenViews,
+    selectedIndex: nextViews.indexOf(currentViewletId),
+    views: nextViews
+  };
+  if (currentViewletId !== name) {
+    return nextState;
+  }
+  const index = views.indexOf(name);
+  const nextView = nextViews[Math.min(index, nextViews.length - 1)];
+  return openViewlet(nextState, nextView);
+};
+
 const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
 const commandMap = {
   'Panel.create': create,
@@ -2490,6 +2690,9 @@ const commandMap = {
   'Panel.getCommandIds': getCommandIds,
   'Panel.getComponentState': getComponentState,
   'Panel.getCurrentViewletId': wrapGetter(getCurrentViewletId),
+  'Panel.getMenuEntries': wrapGetter(getMenuEntries),
+  'Panel.getMenuEntries2': wrapGetter(getMenuEntries),
+  'Panel.getMenuIds': getMenuIds,
   'Panel.handleBlur': wrapCommand(handleBlur),
   'Panel.handleClickClose': wrapCommand(handleClickClose),
   'Panel.handleClickMaximize': wrapCommand(handleClickMaximize),
@@ -2498,6 +2701,7 @@ const commandMap = {
   'Panel.handleMessagePort': handleDirectMessagePort,
   'Panel.handlePanelLayoutChanged': wrapCommand(handlePanelLayoutChanged),
   'Panel.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
+  'Panel.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'Panel.loadContent': wrapCommand(loadContent),
   'Panel.openViewlet': wrapCommand(openViewlet),
   'Panel.render2': render2,
@@ -2510,7 +2714,8 @@ const commandMap = {
   'Panel.setBadgeCount': wrapCommand(setBadgeCount),
   'Panel.setComponentState': setComponentState,
   'Panel.terminate': terminate,
-  'Panel.toggleView': wrapCommand(toggleView)
+  'Panel.toggleView': wrapCommand(toggleView),
+  'Panel.toggleViewVisibility': wrapCommand(toggleViewVisibility)
 };
 
 const listen = async () => {

package/package.json

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