@lvce-editor/main-area-worker 9.67.5 → 9.67.7

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;
 };
@@ -2107,11 +2107,20 @@ const findTabById = (state, tabId) => {
   return undefined;
 };
 
-const switchViewlet = async (state, fromTabId, toTabId) => {
+const switchViewlet = async (state, fromTabId, toTabId, waitForBlur = true) => {
   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');
+    const blur = invoke$1(state.applicationId, 'Viewlet.executeViewletCommand', previous.editorUid, 'handleBlur');
+    if (waitForBlur) {
+      await blur;
+    } else {
+      // Opening a new editor can originate inside the outgoing editor's command queue.
+      // Waiting for blur there would deadlock the navigation command.
+      void blur.catch(() => {
+        // The outgoing editor may have been disposed while blur was queued.
+      });
+    }
   }
   return {
     commands: [],
@@ -2308,19 +2317,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'
@@ -2328,13 +2326,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;
@@ -3374,11 +3406,12 @@ const selectTab = async (state, groupIndex, index) => {
   } = selectedTabData;
   const normalizedTab = normalizeTabEditorInput(tab);
   const isAlreadyActive = activeGroupId === groupId && group.activeTabId === tabId;
-  if (isAlreadyActive && !shouldLoadContentForTab(normalizedTab)) {
+  const needsLoading = shouldLoadContentForTab(normalizedTab);
+  const needsViewlet = normalizedTab.editorUid === -1 && Boolean(normalizedTab.uri);
+  if (isAlreadyActive && !needsLoading && !needsViewlet) {
     return state;
   }
   const previousTabId = getActiveTabId$1(state);
-  const needsLoading = shouldLoadContentForTab(normalizedTab);
   const requestId = needsLoading ? getNextRequestId() : 0;
   const updatedGroups = getUpdatedGroups(groups, groupIndex, needsLoading, tabId);
   let newState = {
@@ -5579,7 +5612,7 @@ const openInputWithContext = async (context, options) => {
     let intermediateState = stateWithViewlet;
     const {
       newState: switchedState
-    } = await switchViewlet(intermediateState, previousTabId, tabId);
+    } = await switchViewlet(intermediateState, previousTabId, tabId, false);
     intermediateState = switchedState;
     await context.updateState(() => intermediateState);
     const tabWithViewlet = findTabById(intermediateState, tabId);

package/package.json

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