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

package/dist/mainAreaWorkerMain.js

@@ -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: [],
@@ -3397,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 = {
@@ -5602,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.6",
+  "version": "9.67.7",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",