@lvce-editor/main-area-worker 9.67.4 → 9.67.6

package/dist/mainAreaWorkerMain.js

@@ -1531,7 +1531,7 @@ const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
 const readFile = async uri => {
   return invoke$2('FileSystem.readFile', uri);
 };
-const confirm$1 = async (message, options) => {
+const confirm = async (message, options) => {
   const result = await invoke$2('ConfirmPrompt.prompt', message, options);
   return result;
 };
@@ -2088,18 +2088,31 @@ const createViewletForTab = (state, tabId, viewletModuleId, bounds) => {
   return newState;
 };
 
-/**
- * Called when switching tabs.
- * With reference nodes, attachment/detachment is handled automatically by virtual DOM rendering.
- * No attach/detach commands needed - virtual DOM will render the correct reference at each position.
- */
-const switchViewlet = (state, fromTabId, toTabId) => {
-  // No commands needed - virtual DOM reference nodes handle attachment automatically
-  // Virtual DOM will:
-  // 1. Remove the old reference node from the previous active tab
-  // 2. Add the new reference node for the now-active tab
-  // This achieves the same effect as detach/attach without explicit commands
+const findTabById = (state, tabId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  for (const group of groups) {
+    const tab = group.tabs.find(t => t.id === tabId);
+    if (tab) {
+      return {
+        groupId: group.id,
+        tab
+      };
+    }
+  }
+  return undefined;
+};
 
+const switchViewlet = async (state, fromTabId, toTabId) => {
+  const previous = fromTabId === undefined ? undefined : findTabById(state, fromTabId)?.tab;
+  if (fromTabId !== toTabId && previous && previous.editorUid >= 0 && previous.loadingState === 'loaded' && previous.editorInput?.type === 'editor') {
+    // Browsers do not consistently emit blur when a focused editor reference is detached.
+    await invoke$1(state.applicationId, 'Viewlet.executeViewletCommand', previous.editorUid, 'handleBlur');
+  }
   return {
     commands: [],
     newState: state
@@ -2295,19 +2308,8 @@ const saveEditor = async (editorUid, skipFormatting = false) => {
   return invoke$2('Editor.save', editorUid);
 };
 
-const confirm = async (message, options) => {
-  try {
-    return await confirm$1(message, options);
-  } catch (error) {
-    const errorMessage = String(error);
-    if (!errorMessage.includes('ConfirmPrompt.prompt') || !errorMessage.includes('not found')) {
-      throw error;
-    }
-    return invoke$6('ConfirmPrompt.prompt', message, options);
-  }
-};
-const promptSave = async title => {
-  const shouldSave = await confirm(`Do you want to save the changes you made to ${title}?`, {
+const promptLegacy = async (message, discardPrompt) => {
+  const shouldSave = await confirm(message, {
     cancelMessage: 'More Options',
     confirmMessage: 'Save',
     title: 'Save Changes'
@@ -2315,13 +2317,47 @@ const promptSave = async title => {
   if (shouldSave) {
     return 'save';
   }
-  const shouldDiscard = await confirm(`Discard the changes you made to ${title}?`, {
+  const shouldDiscard = await confirm(discardPrompt, {
     cancelMessage: 'Cancel',
     confirmMessage: "Don't Save",
     title: 'Save Changes'
   });
   return shouldDiscard ? 'discard' : 'cancel';
 };
+const promptSave = async title => {
+  const message = `Do you want to save the changes you made to ${title}?`;
+  const discardPrompt = `Discard the changes you made to ${title}?`;
+  const options = {
+    cancelMessage: 'Cancel',
+    confirmMessage: 'Save',
+    discardMessage: "Don't Save",
+    discardPrompt,
+    title: 'Save Changes'
+  };
+  try {
+    const result = await invoke$2('ConfirmPrompt.prompt3', message, options);
+    if (['cancel', 'discard', 'save'].includes(result)) {
+      return result;
+    }
+  } catch (error) {
+    const errorMessage = String(error);
+    if (!errorMessage.includes('ConfirmPrompt.prompt3') || !errorMessage.includes('not found')) {
+      throw error;
+    }
+  }
+  try {
+    const result = await invoke$6('ConfirmPrompt.prompt3', message, options);
+    if (['cancel', 'discard', 'save'].includes(result)) {
+      return result;
+    }
+  } catch (error) {
+    const errorMessage = String(error);
+    if (!errorMessage.includes('ConfirmPrompt.prompt3') || !errorMessage.includes('not found')) {
+      throw error;
+    }
+  }
+  return promptLegacy(message, discardPrompt);
+};
 const canCloseTab = async tab => {
   if (tab.editorUid === -1 || !tab.isDirty) {
     return true;
@@ -3098,25 +3134,6 @@ const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
   });
 };
 
-const findTabById = (state, tabId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  for (const group of groups) {
-    const tab = group.tabs.find(t => t.id === tabId);
-    if (tab) {
-      return {
-        groupId: group.id,
-        tab
-      };
-    }
-  }
-  return undefined;
-};
-
 const getSegmentSize = segment => {
   return segment.groups.reduce((total, group) => total + group.size, 0);
 };
@@ -3383,7 +3400,7 @@ const selectTab = async (state, groupIndex, index) => {
   if (isAlreadyActive && !shouldLoadContentForTab(normalizedTab)) {
     return state;
   }
-  getActiveTabId$1(state);
+  const previousTabId = getActiveTabId$1(state);
   const needsLoading = shouldLoadContentForTab(normalizedTab);
   const requestId = needsLoading ? getNextRequestId() : 0;
   const updatedGroups = getUpdatedGroups(groups, groupIndex, needsLoading, tabId);
@@ -3398,7 +3415,7 @@ const selectTab = async (state, groupIndex, index) => {
   const {
     commands: switchCommands,
     newState: stateWithViewlet
-  } = switchViewlet(newState);
+  } = await switchViewlet(newState, previousTabId, tabId);
   newState = stateWithViewlet;
   const maybeCreatedState = await maybeCreateViewletForSelectedTab(state, newState, groupIndex, index, tabId, normalizedTab, uid, needsLoading, requestId, switchCommands);
   if (maybeCreatedState) {
@@ -3408,6 +3425,9 @@ const selectTab = async (state, groupIndex, index) => {
   if (switchCommands.length > 0) {
     await executeViewletCommands(switchCommands);
   }
+  if (!needsLoading) {
+    await focus(newState);
+  }
   return maybeStartLoading(state, newState, tabId, normalizedTab, needsLoading, requestId);
 };
 
@@ -5582,7 +5602,7 @@ const openInputWithContext = async (context, options) => {
     let intermediateState = stateWithViewlet;
     const {
       newState: switchedState
-    } = switchViewlet(intermediateState, previousTabId, tabId);
+    } = await switchViewlet(intermediateState, previousTabId, tabId);
     intermediateState = switchedState;
     await context.updateState(() => intermediateState);
     const tabWithViewlet = findTabById(intermediateState, tabId);
@@ -6959,7 +6979,7 @@ const newFile = async state => {
   }
 
   // Get previous active tab ID for viewlet switching
-  getActiveTabId(newState);
+  const previousTabId = getActiveTabId(newState);
 
   // Create a new empty tab
   const tabId = create$2();
@@ -6989,7 +7009,7 @@ const newFile = async state => {
   // Switch viewlet (detach old, attach new if ready)
   const {
     newState: switchedState
-  } = switchViewlet(intermediateState);
+  } = await switchViewlet(intermediateState, previousTabId, tabId);
   intermediateState = switchedState;
   set$1(uid, state, intermediateState);
 
@@ -9103,8 +9123,25 @@ const setEditorLayoutTwoColumnsBottom = state => {
   }]);
 };
 
+const splitEditorGroupAndResize = async (state, split, ...args) => {
+  const newState = split(state, ...args);
+  if (newState === state) {
+    return state;
+  }
+  await handleResize(newState, newState);
+  const editorUids = newState.layout.groups.flatMap(group => group.tabs.map(tab => tab.editorUid).filter(editorUid => editorUid !== -1));
+  for (const editorUid of editorUids) {
+    await invoke$2('Viewlet.requestRender', editorUid);
+  }
+  return newState;
+};
+
 const pendingLoads = new Map();
 const loadContent = wrapSerialCommand(loadContent$1);
+const splitDownAndResize = wrapSerialCommand((state, ...args) => splitEditorGroupAndResize(state, splitDown, ...args));
+const splitLeftAndResize = wrapSerialCommand((state, ...args) => splitEditorGroupAndResize(state, splitLeft, ...args));
+const splitRightAndResize = wrapSerialCommand((state, ...args) => splitEditorGroupAndResize(state, splitRight, ...args));
+const splitUpAndResize = wrapSerialCommand((state, ...args) => splitEditorGroupAndResize(state, splitUp, ...args));
 const loadContentTracked = async (uid, ...args) => {
   const loading = loadContent(uid, ...args);
   pendingLoads.set(uid, loading);
@@ -9159,7 +9196,7 @@ const commandMap = {
   'Main.restoreClosedTab': wrapSerialCommand(restoreClosedTab),
   'Main.save': wrapSerialCommand(save),
   'Main.saveState': wrapGetter(saveState),
-  'Main.splitRight': wrapSerialCommand(splitRight),
+  'Main.splitRight': splitRightAndResize,
   'MainArea.closeActiveEditor': wrapSerialCommand(closeActiveEditor),
   'MainArea.closeAll': wrapSerialCommand(closeAll$1),
   'MainArea.closeAllEditors': wrapSerialCommand(closeAll$1),
@@ -9251,10 +9288,10 @@ const commandMap = {
   'MainArea.setEditorLayoutTwoColumnsBottom': wrapSerialCommand(setEditorLayoutTwoColumnsBottom),
   'MainArea.setEditorLayoutTwoRows': wrapSerialCommand(setEditorLayoutTwoRows),
   'MainArea.setEditorLayoutTwoRowsRight': wrapSerialCommand(setEditorLayoutTwoRowsRight),
-  'MainArea.splitDown': wrapSerialCommand(splitDown),
-  'MainArea.splitLeft': wrapSerialCommand(splitLeft),
-  'MainArea.splitRight': wrapSerialCommand(splitRight),
-  'MainArea.splitUp': wrapSerialCommand(splitUp),
+  'MainArea.splitDown': splitDownAndResize,
+  'MainArea.splitLeft': splitLeftAndResize,
+  'MainArea.splitRight': splitRightAndResize,
+  'MainArea.splitUp': splitUpAndResize,
   'MainArea.terminate': terminate
 };
 

package/package.json

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