@lvce-editor/main-area-worker 9.2.0 → 9.4.0

package/dist/mainAreaWorkerMain.js

@@ -1716,6 +1716,8 @@ const Main$1 = 24;
 const Separator = 1;
 const None = 0;
 
+const Electron = 2;
+
 const ClipBoardWorker = 3400;
 const ExtensionHostWorker = 44;
 const IconThemeWorker = 7009;
@@ -3194,13 +3196,14 @@ const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
 
+const NoGroupId = -1;
 const handleContextMenu = async (state, rawGroupId, x, y) => {
   number(x);
   number(y);
-  if (!rawGroupId) {
+  if (rawGroupId === undefined) {
     return state;
   }
-  const groupId = Number.parseInt(rawGroupId, 10);
+  const groupId = rawGroupId === '' ? NoGroupId : Number.parseInt(rawGroupId, 10);
   if (Number.isNaN(groupId)) {
     return state;
   }
@@ -3458,8 +3461,7 @@ const handleResize = async (state, dimensions) => {
   // Resize all editor children to their new bounds
   const {
     layout,
-    tabHeight,
-    uid
+    tabHeight
   } = state;
   const {
     groups
@@ -3483,7 +3485,6 @@ const handleResize = async (state, dimensions) => {
       }
     }
   }
-  allResizeCommands.push(['Viewlet.setBounds', uid, x, y, width, height]);
   return allResizeCommands;
 };
 
@@ -3991,7 +3992,7 @@ const splitRight$1 = () => {
 const splitEditorGroup = () => {
   return i18nString(SplitEditorGroup);
 };
-const newWindow = () => {
+const newWindow$1 = () => {
   return i18nString(NewWindow);
 };
 const close = () => {
@@ -4065,13 +4066,27 @@ const menuEntrySeparator = {
   label: ''
 };
 
+const hasTargetGroup = groupId => {
+  return groupId !== undefined && groupId >= 0;
+};
 const getArgs = groupId => {
-  if (groupId === undefined) {
+  if (!hasTargetGroup(groupId)) {
     return undefined;
   }
   return [groupId];
 };
-const getMenuEntries$2 = groupId => {
+const getNewWindowMenuEntries = state => {
+  if (state.platform !== Electron) {
+    return [];
+  }
+  return [menuEntrySeparator, {
+    command: 'MainArea.newWindow',
+    flags: None,
+    id: 'newWindow',
+    label: newWindow$1()
+  }];
+};
+const getMenuEntries$2 = (state, groupId) => {
   const groupArgs = getArgs(groupId);
   const entries = [{
     args: [QuickPick, 'file'],
@@ -4103,13 +4118,8 @@ const getMenuEntries$2 = groupId => {
     flags: None,
     id: 'splitRight',
     label: splitRight$1()
-  }, menuEntrySeparator, {
-    command: 'Main.newWindow',
-    flags: None,
-    id: 'newWindow',
-    label: newWindow()
-  }];
-  if (groupId === undefined) {
+  }, ...getNewWindowMenuEntries(state)];
+  if (!hasTargetGroup(groupId)) {
     return entries;
   }
   return [...entries, menuEntrySeparator, {
@@ -4259,7 +4269,7 @@ const getMenuEntries$1 = state => {
 const getMenuEntries = async (state, props) => {
   switch (props.menuId) {
     case Main$1:
-      return getMenuEntries$2(props.groupId);
+      return getMenuEntries$2(state, props.groupId);
     case Tab:
       return getMenuEntries$1(state);
     default:
@@ -4267,6 +4277,11 @@ const getMenuEntries = async (state, props) => {
   }
 };
 
+const newWindow = async state => {
+  await invoke('Main.newWindow');
+  return state;
+};
+
 const openUris = async (state, uris) => {
   if (uris.length === 0) {
     return state;
@@ -4295,19 +4310,54 @@ const refresh = state => {
   };
 };
 
-const getCss = () => {
+const getEditorGroupCss = layout => {
+  const groupSizeVariable = layout.direction === Vertical ? '--EditorGroupHeight' : '--EditorGroupWidth';
+  return layout.groups.map(group => {
+    return `.EditorGroup[data-groupId="${group.id}"] {
+  ${groupSizeVariable}: ${group.size}%;
+}`;
+  });
+};
+const getSashCss = layout => {
+  if (layout.groups.length <= 1) {
+    return [];
+  }
+  const sashPositionVariable = layout.direction === Horizontal ? '--SashLeft' : '--SashTop';
+  const rules = [];
+  let sashOffset = 0;
+  for (let i = 1; i < layout.groups.length; i++) {
+    sashOffset += layout.groups[i - 1].size;
+    const beforeGroupId = layout.groups[i - 1].id;
+    const afterGroupId = layout.groups[i].id;
+    const sashId = create(beforeGroupId, afterGroupId);
+    rules.push(`.Sash[data-sashId="${sashId}"] {
+  ${sashPositionVariable}: ${sashOffset}%;
+}`);
+  }
+  return rules;
+};
+const getCss = layout => {
   const rules = [`.MainArea {
 }`, `.editor-groups-container {
   overflow: auto;
 }`, `.EditorGroup {
   min-width: 250px;
+  width: var(--EditorGroupWidth, auto);
+  height: var(--EditorGroupHeight, auto);
+}`, `.SashVertical {
+  left: var(--SashLeft);
+}`, `.SashHorizontal {
+  top: var(--SashTop);
 }`];
+  if (layout) {
+    rules.push(...getEditorGroupCss(layout), ...getSashCss(layout));
+  }
   const css = rules.join('\n');
   return css;
 };
 
 const renderCss = (oldState, newState) => {
-  const css = getCss();
+  const css = getCss(newState.layout);
   return [SetCss, newState.uid, css];
 };
 
@@ -4610,6 +4660,36 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
+const HandleContextMenu = 2;
+const HandleClickAction = 10;
+const HandleClick = 11;
+const HandleClickClose = 12;
+const HandleClickTab = 13;
+const HandleTabContextMenu = 14;
+const HandleHeaderDoubleClick = 15;
+const HandleSashPointerDown = 16;
+const HandleSashPointerMove = 17;
+const HandleSashPointerUp = 18;
+
+const MIN_GROUP_WIDTH_PX = 250;
+const getSashOffset = (layout, groupIndex, width) => {
+  const {
+    direction,
+    groups
+  } = layout;
+  const percentOffset = groups.slice(0, groupIndex).reduce((total, group) => total + group.size, 0);
+  if (direction !== Horizontal || !width || !Number.isFinite(width)) {
+    return `${percentOffset}%`;
+  }
+  const effectiveGroupSizes = groups.map(group => Math.max(group.size / 100 * width, MIN_GROUP_WIDTH_PX));
+  const hasOverflowingGroups = effectiveGroupSizes.some((size, index) => size !== groups[index].size / 100 * width);
+  if (!hasOverflowingGroups) {
+    return `${percentOffset}%`;
+  }
+  const pixelOffset = effectiveGroupSizes.slice(0, groupIndex).reduce((total, size) => total + size, 0);
+  return `${pixelOffset}px`;
+};
+
 const renderContent = content => {
   return [{
     childCount: 1,
@@ -4622,17 +4702,6 @@ const renderContent = content => {
   }, text(content)];
 };
 
-const HandleContextMenu = 2;
-const HandleClickAction = 10;
-const HandleClick = 11;
-const HandleClickClose = 12;
-const HandleClickTab = 13;
-const HandleTabContextMenu = 14;
-const HandleHeaderDoubleClick = 15;
-const HandleSashPointerDown = 16;
-const HandleSashPointerMove = 17;
-const HandleSashPointerUp = 18;
-
 const renderError = errorMessage => {
   return [{
     childCount: 2,
@@ -4895,6 +4964,7 @@ const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizePr
   return [{
     childCount: 2,
     className: EditorGroup,
+    'data-groupId': String(group.id),
     style,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled), {
@@ -4924,7 +4994,7 @@ const renderSash = (direction, sashId, style) => {
   }];
 };
 
-const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty) => {
+const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty = 'width') => {
   return [{
     childCount: 1,
     className: Main,
@@ -4932,24 +5002,6 @@ const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty) => {
   }, ...renderEditorGroup(layout.groups[0], 0, splitButtonEnabled, sizeProperty)];
 };
 
-const MIN_GROUP_WIDTH_PX = 250;
-const getSashOffset = (layout, groupIndex, width) => {
-  const {
-    direction,
-    groups
-  } = layout;
-  const percentOffset = groups.slice(0, groupIndex).reduce((total, group) => total + group.size, 0);
-  if (direction !== Horizontal || !width || !Number.isFinite(width)) {
-    return `${percentOffset}%`;
-  }
-  const effectiveGroupSizes = groups.map(group => Math.max(group.size / 100 * width, MIN_GROUP_WIDTH_PX));
-  const hasOverflowingGroups = effectiveGroupSizes.some((size, index) => size !== groups[index].size / 100 * width);
-  if (!hasOverflowingGroups) {
-    return `${percentOffset}%`;
-  }
-  const pixelOffset = effectiveGroupSizes.slice(0, groupIndex).reduce((total, size) => total + size, 0);
-  return `${pixelOffset}px`;
-};
 const getMainAreaVirtualDom = (layout, splitButtonEnabled = false, width = 0) => {
   const {
     direction,
@@ -4963,6 +5015,20 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false, width = 0) =>
   const isSplit = groups.length > 1;
   const directionClassName = isSplit ? direction === Horizontal ? EditorGroupsVertical : EditorGroupsHorizontal : '';
   const editorGroupsContainerClassName = directionClassName ? `${EDITOR_GROUPS_CONTAINER} ${directionClassName}` : EDITOR_GROUPS_CONTAINER;
+  if (groups.length === 0) {
+    return [{
+      childCount: 1,
+      className: Main,
+      type: Div
+    }, {
+      childCount: 0,
+      className: editorGroupsContainerClassName,
+      'data-groupId': '',
+      onContextMenu: HandleContextMenu,
+      role: None$1,
+      type: Div
+    }];
+  }
   let childCount = 0;
   for (let i = 0; i < groups.length; i++) {
     if (i > 0) {
@@ -5110,18 +5176,18 @@ const save = async state => {
   });
 };
 
+const getFilteredGroups = groups => {
+  return groups.map(group => ({
+    ...group,
+    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://'))
+  })).filter(group => group.tabs.length > 0);
+};
+
 const saveState = state => {
   const {
     layout
   } = state;
-
-  // Filter out untitled editors from tabs
-  const filteredGroups = layout.groups.map(group => ({
-    ...group,
-    tabs: group.tabs.filter(tab => !tab.uri?.startsWith('untitled://'))
-  }))
-  // Remove groups that become empty after filtering
-  .filter(group => group.tabs.length > 0);
+  const filteredGroups = getFilteredGroups(layout.groups);
 
   // Update activeGroupId if it points to a removed group
   const {
@@ -5314,6 +5380,7 @@ const commandMap = {
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
   'MainArea.newFile': wrapCommand(newFile),
+  'MainArea.newWindow': wrapCommand(newWindow),
   'MainArea.openInput': wrapCommand(openInput),
   'MainArea.openUri': wrapCommand(openUri),
   'MainArea.openUris': wrapCommand(openUris),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.2.0",
+  "version": "9.4.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",