@lvce-editor/main-area-worker 9.51.0 → 9.53.0

package/dist/mainAreaWorkerMain.js

@@ -1748,12 +1748,13 @@ const getIcons = async iconRequests => {
 
 const {
   invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$3
 } = create$3(RendererProcess);
 
 const {
   invoke: invoke$1,
-  invokeAndTransfer,
+  invokeAndTransfer: invokeAndTransfer$1,
   set: set$2
 } = create$3(RendererWorker);
 const handleModifiedStatusChange$1 = async (uri, modified) => {
@@ -1768,19 +1769,15 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
 };
 const sendMessagePortToClipBoardWorker$1 = async (port, rpcId) => {
   const command = 'ClipBoard.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
-};
-const sendMessagePortToDragAndDropWorker = async port => {
-  const command = 'DragAndDrop.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
 };
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
 };
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const readFile = async uri => {
   return invoke$1('FileSystem.readFile', uri);
@@ -2404,27 +2401,32 @@ const promptSave = async title => {
   });
   return shouldDiscard ? 'discard' : 'cancel';
 };
+const canCloseTab = async tab => {
+  if (tab.editorUid === -1 || !tab.isDirty) {
+    return true;
+  }
+  const savePromptResult = await promptSave(tab.title);
+  if (savePromptResult === 'cancel') {
+    return false;
+  }
+  if (savePromptResult === 'save') {
+    const editorState = await saveEditor(tab.editorUid);
+    if (editorState?.modified !== false) {
+      return false;
+    }
+    if (tab.uri) {
+      await handleModifiedStatusChange$1(tab.uri, false);
+    }
+  }
+  return savePromptResult === 'save' || savePromptResult === 'discard';
+};
 const closeTabAndSave = async (state, groupId, tabId) => {
   const tab = findTabInState(state, groupId, tabId);
   if (!tab) {
     return state;
   }
-  if (tab.editorUid !== -1 && tab.isDirty) {
-    const savePromptResult = await promptSave(tab.title);
-    if (savePromptResult === 'cancel') {
-      return state;
-    }
-    if (savePromptResult === 'save') {
-      const editorState = await saveEditor(tab.editorUid);
-      if (editorState?.modified !== false) {
-        return state;
-      }
-      if (tab.uri) {
-        await handleModifiedStatusChange$1(tab.uri, false);
-      }
-    } else if (savePromptResult !== 'discard') {
-      return state;
-    }
+  if (!(await canCloseTab(tab))) {
+    return state;
   }
   return closeTabWithViewlet(state, groupId, tabId);
 };
@@ -2488,6 +2490,16 @@ const closeAll$1 = async state => {
   return withEmptyGroups(addClosedTabs(state, entries));
 };
 
+const closeAllAndSave = async state => {
+  const tabs = state.layout.groups.flatMap(group => group.tabs);
+  for (const tab of tabs) {
+    if (!(await canCloseTab(tab))) {
+      return state;
+    }
+  }
+  return closeAll$1(state);
+};
+
 const redistributeSizesWithRemainder = groups => {
   const baseSize = Math.floor(100 / groups.length);
   const remainder = 100 % groups.length;
@@ -2910,6 +2922,9 @@ const isConnected = () => {
 const invoke = (method, ...params) => {
   return invoke$2(method, ...params);
 };
+const invokeAndTransfer = (method, ...params) => {
+  return invokeAndTransfer$2(method, ...params);
+};
 const set = rpc => {
   set$3(rpc);
   state.connected = true;
@@ -3214,6 +3229,9 @@ const findTabById = (state, tabId) => {
 const getSegmentSize = segment => {
   return segment.groups.reduce((total, group) => total + group.size, 0);
 };
+const getGroupSegment = (segments, groupId) => {
+  return segments.find(segment => segment.groups.some(group => group.id === groupId));
+};
 const getGroupSegments = (groups, parentDirection) => {
   const segments = [];
   let index = 0;
@@ -5433,7 +5451,7 @@ const handleHeaderDoubleClick = async (state, className, groupIndexRaw) => {
   return newFile(state);
 };
 
-const getAllTabs = layout => {
+const getAllTabs$1 = layout => {
   const {
     groups
   } = layout;
@@ -5453,7 +5471,7 @@ const loadFileIcons = async state => {
     groups
   } = layout;
   try {
-    const allTabs = getAllTabs(layout);
+    const allTabs = getAllTabs$1(layout);
     const {
       newFileIconCache
     } = await getFileIconsForTabs(allTabs, fileIconCache);
@@ -5790,6 +5808,7 @@ const handleSashPointerDown = async (state, sashId, clientX, clientY) => {
     layout
   } = state;
   const {
+    direction,
     groups
   } = layout;
   const beforeGroup = groups.find(group => group.id === parsed.beforeGroupId);
@@ -5800,13 +5819,20 @@ const handleSashPointerDown = async (state, sashId, clientX, clientY) => {
   if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) {
     return state;
   }
+  const segments = getGroupSegments(groups, direction);
+  const beforeSegment = getGroupSegment(segments, parsed.beforeGroupId);
+  const afterSegment = getGroupSegment(segments, parsed.afterGroupId);
+  if (!beforeSegment || !afterSegment) {
+    return state;
+  }
+  const isNestedSash = beforeSegment === afterSegment;
   return {
     ...state,
     sashDrag: {
       afterGroupId: parsed.afterGroupId,
-      afterSize: afterGroup.size,
+      afterSize: isNestedSash ? afterGroup.size : getSegmentSize(afterSegment),
       beforeGroupId: parsed.beforeGroupId,
-      beforeSize: beforeGroup.size,
+      beforeSize: isNestedSash ? beforeGroup.size : getSegmentSize(beforeSegment),
       sashId,
       startClientX: clientX,
       startClientY: clientY
@@ -5814,6 +5840,14 @@ const handleSashPointerDown = async (state, sashId, clientX, clientY) => {
   };
 };
 
+const resizeGroupInSegment = (segment, groupId, segmentSize) => {
+  const group = segment.groups.find(group => group.id === groupId);
+  if (!group) {
+    return undefined;
+  }
+  const previousSegmentSize = getSegmentSize(segment);
+  return round(group.size / previousSegmentSize * segmentSize);
+};
 const handleSashPointerMove = async (state, clientX, clientY) => {
   const {
     height,
@@ -5833,6 +5867,13 @@ const handleSashPointerMove = async (state, clientX, clientY) => {
     direction,
     groups
   } = layout;
+  const segments = getGroupSegments(groups, direction);
+  const beforeSegment = getGroupSegment(segments, sashDrag.beforeGroupId);
+  const afterSegment = getGroupSegment(segments, sashDrag.afterGroupId);
+  if (!beforeSegment || !afterSegment) {
+    return state;
+  }
+  const isNestedSash = beforeSegment === afterSegment;
   const axisSize = direction === Horizontal ? width : height;
   if (!axisSize) {
     return state;
@@ -5850,6 +5891,23 @@ const handleSashPointerMove = async (state, clientX, clientY) => {
   const beforeSize = clamp(sashDrag.beforeSize + deltaPercent, minGroupSize, totalResizableSize - minGroupSize);
   const afterSize = totalResizableSize - beforeSize;
   const newGroups = groups.map(group => {
+    if (!isNestedSash) {
+      const resizedBeforeGroupSize = resizeGroupInSegment(beforeSegment, group.id, beforeSize);
+      if (resizedBeforeGroupSize !== undefined) {
+        return {
+          ...group,
+          size: resizedBeforeGroupSize
+        };
+      }
+      const resizedAfterGroupSize = resizeGroupInSegment(afterSegment, group.id, afterSize);
+      if (resizedAfterGroupSize !== undefined) {
+        return {
+          ...group,
+          size: resizedAfterGroupSize
+        };
+      }
+      return group;
+    }
     if (group.id === sashDrag.beforeGroupId) {
       return {
         ...group,
@@ -6387,6 +6445,30 @@ const hasActiveTextEditor = state => {
   return activeTab?.tab.editorInput?.type === 'editor';
 };
 
+const getTabs = group => {
+  return group.tabs;
+};
+const getAllTabs = state => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.flatMap(getTabs);
+};
+
+const isDirty = tab => {
+  return tab.isDirty;
+};
+const getDirtyTabs = state => {
+  return getAllTabs(state).filter(isDirty);
+};
+
+const hasDirtyTabs = state => {
+  return getDirtyTabs(state).length > 0;
+};
+
 const initialize$1 = async () => {
   // Kept as a compatibility command for existing renderer startup code.
 };
@@ -8475,6 +8557,7 @@ const commandMap = {
   'Main.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
   'Main.closeAll': wrapSerialCommand(closeAll$1),
   'Main.closeAllEditors': wrapSerialCommand(closeAll$1),
+  'Main.closeAllEditorsAndSave': wrapSerialCommand(closeAllAndSave),
   'Main.closeFocusedTab': wrapSerialCommand(closeFocusedTab),
   'Main.closeOthers': wrapSerialCommand(closeOtherTabs),
   'Main.closeSaved': wrapSerialCommand(closeSaved$1),
@@ -8490,6 +8573,7 @@ const commandMap = {
   'Main.handleModifiedStatusChange': wrapAsyncCommand(handleModifiedStatusChangeWithContext),
   'Main.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
   'Main.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
+  'Main.hasDirtyTabs': wrapGetter(hasDirtyTabs),
   'Main.openInput': wrapSerialAsyncCommand(openInputWithContext),
   'Main.openUri': wrapSerialAsyncCommand(openUriWithContext),
   'Main.openUris': wrapSerialAsyncCommand(openUrisWithContext),
@@ -8500,6 +8584,7 @@ const commandMap = {
   'MainArea.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
   'MainArea.closeAll': wrapSerialCommand(closeAll$1),
   'MainArea.closeAllEditors': wrapSerialCommand(closeAll$1),
+  'MainArea.closeAllEditorsAndSave': wrapSerialCommand(closeAllAndSave),
   'MainArea.closeEditorGroup': wrapSerialCommand(closeEditorGroup$1),
   'MainArea.closeFocusedTab': wrapSerialCommand(closeFocusedTab),
   'MainArea.closeOthers': wrapSerialCommand(closeOtherTabs),
@@ -8553,6 +8638,7 @@ const commandMap = {
   'MainArea.handleWorkspaceChange': wrapSerialCommand(handleWorkspaceChange),
   'MainArea.handleWorkspaceRefresh': wrapAsyncCommand(handleWorkspaceRefreshWithContext),
   'MainArea.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
+  'MainArea.hasDirtyTabs': wrapGetter(hasDirtyTabs),
   'MainArea.initialize': initialize$1,
   'MainArea.loadContent': loadContentTracked,
   'MainArea.moveIntoNewWindow': wrapSerialCommand(moveIntoNewWindow),
@@ -8599,7 +8685,7 @@ const initializeClipBoardWorker = async () => {
 };
 
 const send$1 = async port => {
-  await sendMessagePortToDragAndDropWorker(port);
+  await invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
 const createDragAndDropWorkerRpc = async () => {
   return create$6({

package/package.json

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