@lvce-editor/main-area-worker 9.63.1 → 9.64.1

package/dist/mainAreaWorkerMain.js

@@ -598,6 +598,9 @@ const restoreExistingError = (error, currentStack) => {
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
+  Object.assign(restoredError, {
+    code: error.code
+  });
   const parentStack = getParentStack(error);
   setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
@@ -617,9 +620,13 @@ const applyDataProperties = (restoredError, error) => {
     // @ts-ignore
     restoredError.codeFrame = error.data.codeFrame;
   }
-  if (error.data.code) {
+  if (typeof error.data.code === 'string' || typeof error.data.code === 'number') {
     // @ts-ignore
-    restoredError.code = error.data.code;
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.data.code,
+      writable: true
+    });
   }
   if (error.data.type) {
     // @ts-ignore
@@ -641,6 +648,13 @@ const applyDirectProperties = (restoredError, error) => {
 };
 const restoreMessageError = (error, _currentStack) => {
   const restoredError = constructError(error.message, error.type, error.name);
+  if (typeof error.code === 'string' || typeof error.code === 'number') {
+    Object.defineProperty(restoredError, 'code', {
+      configurable: true,
+      value: error.code,
+      writable: true
+    });
+  }
   if (error.data) {
     applyDataProperties(restoredError, error);
   } else {
@@ -719,7 +733,7 @@ const getErrorProperty = (error, prettyError) => {
   return {
     code: Custom,
     data: {
-      code: prettyError.code,
+      code: prettyError.code ?? error?.code,
       codeFrame: prettyError.codeFrame,
       name: prettyError.name,
       stack: getStack(prettyError),
@@ -756,7 +770,12 @@ const getErrorResponseSimple = (id, error) => {
   return {
     error: {
       code: Custom,
-      data: error,
+      data: error instanceof Error ? {
+        ...error,
+        code: 'code' in error ? error.code : undefined,
+        stack: error.stack,
+        type: error.name
+      } : error,
       // @ts-ignore
       message: error.message
     },
@@ -1779,14 +1798,42 @@ const getActiveFileUri = state => {
   return editorInput && 'uri' in editorInput ? editorInput.uri : '';
 };
 
+const getActiveTab = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const activeGroup = groups.find(group => group.focused);
+  if (!activeGroup || !activeGroup.activeTabId) {
+    return undefined;
+  }
+  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
+  if (!activeTab) {
+    return undefined;
+  }
+  return {
+    groupId: activeGroup.id,
+    tab: activeTab
+  };
+};
+
+const hasActiveTextEditor = state => {
+  const activeTab = getActiveTab(state);
+  return activeTab?.tab.editorInput?.type === 'editor';
+};
+
 const notifyActiveEditorChange = async (oldState, newState) => {
   const oldUri = getActiveFileUri(oldState);
   const newUri = getActiveFileUri(newState);
-  if (oldUri === newUri) {
+  const oldIsTextEditor = hasActiveTextEditor(oldState);
+  const newIsTextEditor = hasActiveTextEditor(newState);
+  if (oldUri === newUri && oldIsTextEditor === newIsTextEditor) {
     return;
   }
   try {
-    await invoke$1(newState.applicationId, 'Layout.handleActiveEditorChange', newUri);
+    await invoke$1(newState.applicationId, 'Layout.handleActiveEditorChange', newUri, newIsTextEditor);
   } catch (error) {
     console.warn('Failed to notify viewlets about active editor change', error);
   }
@@ -2745,27 +2792,6 @@ const diff2 = uid => {
   return result;
 };
 
-const getActiveTab = state => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  const activeGroup = groups.find(group => group.focused);
-  if (!activeGroup || !activeGroup.activeTabId) {
-    return undefined;
-  }
-  const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
-  if (!activeTab) {
-    return undefined;
-  }
-  return {
-    groupId: activeGroup.id,
-    tab: activeTab
-  };
-};
-
 const state = {
   connected: false
 };
@@ -3787,8 +3813,7 @@ const EditorGroupsHorizontal = 'EditorGroupsHorizontal';
 const EditorGroupsVertical = 'EditorGroupsVertical';
 const EditorContainer = 'EditorContainer';
 const EditorGroupActions = 'EditorGroupActions';
-const EditorGroupActionButton = 'EditorGroupActionButton';
-const SplitEditorGroupButton = 'SplitEditorGroupButton';
+const SplitEditorGroupButton = 'EditorGroupActionButton SplitEditorGroupButton';
 const MaskIconPreview = 'MaskIcon MaskIconPreview';
 const MaskIconCircleFilled = 'MaskIcon MaskIconCircleFilled';
 const MaskIconClose = 'MaskIcon MaskIconClose';
@@ -3857,6 +3882,10 @@ const getDragOverlayVirtualDom = () => {
   return dragOverlayVirtualDom;
 };
 
+const getEditorGroupClassName = groupId => {
+  return `EditorGroup-${String(groupId).replaceAll('.', '-')}`;
+};
+
 const offsetsMatch = (first, second) => {
   return Math.abs(first - second) < 1e-6;
 };
@@ -3905,10 +3934,6 @@ const getSashCorner = layout => {
   };
 };
 
-const getEditorGroupClassName = groupId => {
-  return `EditorGroup-${groupId}`;
-};
-
 const CloseGroup = 'close-group';
 const ConfigureLargeFileLimit = 'configure-large-file-limit';
 const OpenLargeFile = 'open-large-file';
@@ -4421,7 +4446,7 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
   if (splitButtonEnabled) {
     buttons.push({
       childCount: 1,
-      className: mergeClassNames(EditorGroupActionButton, SplitEditorGroupButton),
+      className: SplitEditorGroupButton,
       'data-action': SplitRight$1,
       'data-groupId': String(group.id),
       name: SplitRight$1,
@@ -4490,14 +4515,13 @@ const renderWaterMark = groupId => {
 
 const Focusable = 0;
 
-const renderEmptyEditorGroup = (group, groupIndex, style, closeButtonEnabled = true) => {
+const renderEmptyEditorGroup = (group, groupIndex, closeButtonEnabled = true) => {
   const closeButtonDom = closeButtonEnabled ? renderEmptyGroupCloseButton(group) : [];
   return [{
     childCount: closeButtonEnabled ? 2 : 1,
     className: mergeClassNames(EditorGroupEmpty, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
     onContextMenu: HandleContextMenu,
-    style,
     tabIndex: Focusable,
     type: Div
   }, ...closeButtonDom, ...renderWaterMark(group.id)];
@@ -4508,19 +4532,17 @@ const editorContainerNode = {
   className: EditorContainer,
   type: Div
 };
-const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizeProperty = 'width', closeButtonEnabled = true, tabDropIndicator) => {
+const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, closeButtonEnabled = true, tabDropIndicator) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
-  const style = `${sizeProperty}:${group.size}%;`;
   const hasTabs = group.tabs.length > 0;
   const hasEmptyGroupCloseButton = !hasTabs;
   if (hasEmptyGroupCloseButton) {
-    return renderEmptyEditorGroup(group, groupIndex, style, closeButtonEnabled);
+    return renderEmptyEditorGroup(group, groupIndex, closeButtonEnabled);
   }
   return [{
     childCount: 2,
     className: mergeClassNames(EditorGroup, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
-    style,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled, tabDropIndicator), editorContainerNode, ...renderEditor(activeTab)];
 };
@@ -4545,6 +4567,7 @@ const renderSash = (direction, sashId) => {
   }, {
     childCount: 0,
     className: getSashBorderClassName(direction),
+    'data-sashId': sashId,
     type: Div
   }];
 };
@@ -4568,11 +4591,11 @@ const mainNode$1 = {
   onDrop: HandleDrop,
   type: Div
 };
-const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty = 'width', tabDropIndicator) => {
+const renderSingleEditorGroup = (layout, splitButtonEnabled, tabDropIndicator) => {
   const {
     groups
   } = layout;
-  return [mainNode$1, ...renderEditorGroup(groups[0], 0, splitButtonEnabled, sizeProperty, false, tabDropIndicator)];
+  return [mainNode$1, ...renderEditorGroup(groups[0], 0, splitButtonEnabled, false, tabDropIndicator)];
 };
 
 const create = (beforeGroupId, afterGroupId) => {
@@ -4624,14 +4647,10 @@ const addDragOverlay = (dom, dragOverlay) => {
     childCount: dom[0].childCount + 1
   }, dom[1], ...dom.slice(2), getDragOverlayVirtualDom()];
 };
-const getSizeProperty = direction => {
-  return direction === Vertical ? 'height' : 'width';
-};
 const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropIndicator) => {
   const segments = getGroupSegments(groups, direction);
   const children = [];
   let childCount = 0;
-  const sizeProperty = getSizeProperty(direction);
   for (let i = 0; i < segments.length; i++) {
     const segment = segments[i];
     if (i > 0) {
@@ -4643,16 +4662,14 @@ const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropInd
       childCount++;
     }
     if (segment.direction === undefined) {
-      children.push(...renderEditorGroup(segment.groups[0], segment.startIndex, splitButtonEnabled, sizeProperty, true, tabDropIndicator));
+      children.push(...renderEditorGroup(segment.groups[0], segment.startIndex, splitButtonEnabled, true, tabDropIndicator));
       childCount++;
       continue;
     }
     const nestedDirection = segment.direction;
-    const nestedSizeProperty = getSizeProperty(nestedDirection);
     const nestedChildCount = segment.groups.length + segment.groups.length - 1;
     const nestedChildren = [];
     let nestedCount = 0;
-    const segmentSize = getSegmentSize(segment);
     for (let j = 0; j < segment.groups.length; j++) {
       if (j > 0) {
         const beforeGroupId = segment.groups[j - 1].id;
@@ -4662,18 +4679,13 @@ const renderSegmentChildren = (direction, groups, splitButtonEnabled, tabDropInd
         nestedCount++;
       }
       const group = segment.groups[j];
-      const normalizedSize = Number((group.size / segmentSize * 100).toFixed(6));
-      nestedChildren.push(...renderEditorGroup({
-        ...group,
-        size: normalizedSize
-      }, segment.startIndex + j, splitButtonEnabled, nestedSizeProperty, true, tabDropIndicator));
+      nestedChildren.push(...renderEditorGroup(group, segment.startIndex + j, splitButtonEnabled, true, tabDropIndicator));
       nestedCount++;
     }
     children.push({
       childCount: nestedChildCount,
-      className: getContainerClassName(nestedDirection, segment.groups.length),
+      className: mergeClassNames(getContainerClassName(nestedDirection, segment.groups.length), `${getEditorGroupClassName(segment.groups[0].id)}-Segment`),
       role: None$2,
-      style: `${sizeProperty}:${segmentSize}%;`,
       type: Div
     });
     children.push(...nestedChildren);
@@ -4690,9 +4702,8 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false, dragOverlay,
     direction,
     groups
   } = layout;
-  const sizeProperty = getSizeProperty(direction);
   if (groups.length === 1) {
-    return addDragOverlay(renderSingleEditorGroup(layout, splitButtonEnabled, sizeProperty, tabDropIndicator), dragOverlay);
+    return addDragOverlay(renderSingleEditorGroup(layout, splitButtonEnabled, tabDropIndicator), dragOverlay);
   }
   const editorGroupsContainerClassName = getContainerClassName(direction, groups.length);
   if (groups.length === 0) {
@@ -7781,11 +7792,6 @@ const handleWorkspaceRefreshWithContext = async (context, refresh = {}) => {
   }
 };
 
-const hasActiveTextEditor = state => {
-  const activeTab = getActiveTab(state);
-  return activeTab?.tab.editorInput?.type === 'editor';
-};
-
 const getTabs = group => {
   return group.tabs;
 };
@@ -8105,17 +8111,34 @@ const getDragOverlayCss = dragOverlay => {
 }`];
 };
 
+const getSizeCss = (className, direction, size) => {
+  const width = direction === Vertical ? 100 : size;
+  const height = direction === Vertical ? size : 100;
+  return `.${className} {
+  width: ${width}%;
+  height: ${height}%;
+}`;
+};
 const getEditorGroupCss = layout => {
   const {
     direction,
     groups
   } = layout;
-  const groupSizeVariable = direction === Vertical ? '--EditorGroupHeight' : '--EditorGroupWidth';
-  return groups.map(group => {
-    return `.${getEditorGroupClassName(group.id)} {
-  ${groupSizeVariable}: ${group.size}%;
-}`;
-  });
+  const rules = [];
+  for (const segment of getGroupSegments(groups, direction)) {
+    if (segment.direction === undefined) {
+      const group = segment.groups[0];
+      rules.push(getSizeCss(getEditorGroupClassName(group.id), direction, group.size));
+      continue;
+    }
+    const segmentSize = getSegmentSize(segment);
+    rules.push(getSizeCss(`${getEditorGroupClassName(segment.groups[0].id)}-Segment`, direction, segmentSize));
+    for (const group of segment.groups) {
+      const normalizedSize = Number((group.size / segmentSize * 100).toFixed(6));
+      rules.push(getSizeCss(getEditorGroupClassName(group.id), segment.direction, normalizedSize));
+    }
+  }
+  return rules;
 };
 
 const MIN_GROUP_WIDTH_PX = 250;

package/package.json

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