@lvce-editor/main-area-worker 9.30.0 → 9.30.2

package/dist/mainAreaWorkerMain.js

@@ -1739,6 +1739,8 @@ const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
 const SetPatches = 'Viewlet.setPatches';
 
+const FocusEditorText = 12;
+
 const {
   set: set$4
 } = create$3(ClipBoardWorker);
@@ -1786,6 +1788,10 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
+const confirm = async (message, options) => {
+  const result = await invoke('ConfirmPrompt.prompt', message, options);
+  return result;
+};
 const writeClipBoardText = async text => {
   await invoke('ClipBoard.writeText', /* text */text);
 };
@@ -2231,18 +2237,25 @@ const closeTabWithViewlet = async (state, groupId, tabId) => {
   const newState = closeTab(state, groupId, tabId);
   const group = state.layout.groups.find(g => g.id === groupId);
   const wasActiveTab = group?.activeTabId === tabId;
-  if (wasActiveTab) {
-    const newGroup = newState.layout.groups.find(g => g.id === groupId);
-    const newActiveTabId = newGroup?.activeTabId;
-    if (newActiveTabId !== undefined) {
-      const {
-        commands: switchCommands,
-        newState: switchedState
-      } = switchViewlet(newState);
-      commands.push(...switchCommands);
-      await executeViewletCommands(commands);
-      return switchedState;
+  const newGroup = wasActiveTab ? newState.layout.groups.find(candidate => candidate.id === groupId) : undefined;
+  const newActiveTabId = newGroup?.activeTabId;
+  if (wasActiveTab && commands.length > 0) {
+    if (newActiveTabId === undefined) {
+      return {
+        ...newState,
+        pendingViewletUpdate: {
+          disposal: tab.editorUid
+        }
+      };
     }
+    const newActiveTab = newGroup?.tabs.find(candidate => candidate.id === newActiveTabId);
+    return {
+      ...newState,
+      pendingViewletUpdate: {
+        disposal: tab.editorUid,
+        focus: newActiveTab?.editorUid === -1 ? undefined : newActiveTab?.editorUid
+      }
+    };
   }
   if (commands.length > 0) {
     await executeViewletCommands(commands);
@@ -2254,24 +2267,45 @@ const saveEditor = async editorUid => {
   return invoke('Editor.save', editorUid);
 };
 
+const promptSave = async title => {
+  const shouldSave = await confirm(`Do you want to save the changes you made to ${title}?`, {
+    cancelMessage: 'More Options',
+    confirmMessage: 'Save',
+    title: 'Save Changes'
+  });
+  if (shouldSave) {
+    return 'save';
+  }
+  const shouldDiscard = await confirm(`Discard the changes you made to ${title}?`, {
+    cancelMessage: 'Cancel',
+    confirmMessage: "Don't Save",
+    title: 'Save Changes'
+  });
+  return shouldDiscard ? 'discard' : 'cancel';
+};
 const closeTabAndSave = async (state, groupId, tabId) => {
   const tab = findTabInState(state, groupId, tabId);
   if (!tab) {
     return state;
   }
   if (tab.editorUid !== -1 && tab.isDirty) {
-    const editorState = await saveEditor(tab.editorUid);
-    if (editorState?.modified !== false) {
+    const savePromptResult = await promptSave(tab.title);
+    if (savePromptResult === 'cancel') {
       return state;
     }
-    if (tab.uri) {
-      await handleModifiedStatusChange$1(tab.uri, false);
+    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 (tab.uri?.startsWith('simple-browser://')) {
-    return closeTabWithViewlet(state, groupId, tabId);
-  }
-  return closeTab(state, groupId, tabId);
+  return closeTabWithViewlet(state, groupId, tabId);
 };
 
 const getFocusedGroup = state => {
@@ -2649,9 +2683,13 @@ const isEqual = (oldState, newState) => {
 const RenderItems = 4;
 const RenderCss = 10;
 const RenderIncremental = 11;
+const RenderPendingViewletUpdate = 12;
 
-const modules = [isEqual, isEqual$1];
-const numbers = [RenderIncremental, RenderCss];
+const isPendingViewletUpdateEqual = (oldState, newState) => {
+  return newState.pendingViewletUpdate === undefined;
+};
+const modules = [isEqual, isEqual$1, isPendingViewletUpdateEqual];
+const numbers = [RenderIncremental, RenderCss, RenderPendingViewletUpdate];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -6494,6 +6532,15 @@ const renderIncremental = (oldState, newState) => {
   return [SetPatches, newState.uid, patches];
 };
 
+const renderPendingViewletUpdate = (oldState, newState) => {
+  const update = newState.pendingViewletUpdate;
+  newState.pendingViewletUpdate = undefined;
+  setTimeout(() => {
+    void invoke('Viewlet.dispose', update.disposal).catch(() => {});
+  }, 50);
+  return update.focus === undefined ? [] : ['Viewlet.setFocusContext', update.focus, FocusEditorText, 0, update.focus, 'Editor'];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderCss:
@@ -6502,6 +6549,8 @@ const getRenderer = diffType => {
       return renderIncremental;
     case RenderItems:
       return renderItems;
+    case RenderPendingViewletUpdate:
+      return renderPendingViewletUpdate;
     default:
       throw new Error('unknown renderer');
   }

package/package.json

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