@lvce-editor/main-area-worker 9.28.2 → 9.29.1

package/dist/mainAreaWorkerMain.js

@@ -2261,7 +2261,10 @@ const closeTabAndSave = async (state, groupId, tabId) => {
   }
   if (tab.editorUid !== -1 && tab.isDirty) {
     const editorState = await saveEditor(tab.editorUid);
-    if (!editorState?.modified && tab.uri) {
+    if (editorState?.modified !== false) {
+      return state;
+    }
+    if (tab.uri) {
       await handleModifiedStatusChange$1(tab.uri, false);
     }
   }
@@ -3673,6 +3676,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
             ...tab,
             editorInput,
             editorType,
+            editorUid: create$2(),
             errorMessage: '',
             icon: '',
             isDirty: false,
@@ -3922,6 +3926,18 @@ const updateTabIcon = async (context, readyState, tabId) => {
   }
 };
 
+const getExistingTabState = (state, existingTab, preview) => {
+  const focusedState = focusEditorGroup(state, existingTab.groupId);
+  const pinnedState = !preview && existingTab.tab.isPreview ? updateTab(focusedState, existingTab.tab.id, {
+    isPreview: false
+  }) : focusedState;
+  return switchTab(pinnedState, existingTab.groupId, existingTab.tab.id);
+};
+const getActivePreviewEditorUid = state => {
+  const activeGroup = state.layout.activeGroupId === undefined ? state.layout.groups.find(group => group.focused) : state.layout.groups.find(group => group.id === state.layout.activeGroupId);
+  const activeTab = activeGroup?.tabs.find(tab => tab.id === activeGroup.activeTabId);
+  return activeTab?.isPreview ? activeTab.editorUid : -1;
+};
 const openInputWithContext = async (context, options) => {
   const state = context.getState();
   object(state);
@@ -3937,17 +3953,20 @@ const openInputWithContext = async (context, options) => {
   const existingTab = findTabByUri(currentState, uri);
   const shouldRetryExistingTab = !!existingTab && existingTab.tab.loadingState === 'error';
   if (existingTab && !shouldRetryExistingTab) {
-    const focusedState = focusEditorGroup(currentState, existingTab.groupId);
-    const switchedState = switchTab(focusedState, existingTab.groupId, existingTab.tab.id);
+    const switchedState = getExistingTabState(currentState, existingTab, preview);
     await context.updateState(() => switchedState);
     return;
   }
+  const replacedEditorUid = getActivePreviewEditorUid(currentState);
   const previousTabId = getActiveTabId(currentState);
   const {
     stateWithTab,
     tabId
   } = getStateWithTab(currentState, editorInput, existingTab, shouldRetryExistingTab, uri, preview, title, editorType);
   await context.updateState(() => stateWithTab);
+  if (replacedEditorUid !== -1) {
+    await disposeEditors([replacedEditorUid]);
+  }
   if (await isDirectoryEditorInput(editorInput)) {
     const latestState = context.getState();
     const errorState = updateTab(latestState, tabId, {
@@ -4370,9 +4389,19 @@ const handleContextMenu = async (state, rawGroupId, x, y) => {
   return state;
 };
 
-const handleDoubleClick = async state => {
-  // TODO: implement handleDoubleClick
-  return state;
+const handleDoubleClick = (state, groupIndexRaw, indexRaw) => {
+  if (!groupIndexRaw || !indexRaw) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(groupIndexRaw);
+  const tabIndex = Number.parseInt(indexRaw);
+  const tab = state.layout.groups[groupIndex]?.tabs[tabIndex];
+  if (!tab?.isPreview) {
+    return state;
+  }
+  return updateTab(state, tab.id, {
+    isPreview: false
+  });
 };
 
 const EditorGroupHeader = 'EditorGroupHeader';
@@ -4593,7 +4622,8 @@ const handleModifiedStatusChange = (state, uri, newStatus) => {
         if (tab.uri === uri) {
           return {
             ...tab,
-            isDirty: newStatus
+            isDirty: newStatus,
+            isPreview: newStatus ? false : tab.isPreview
           };
         }
         return tab;
@@ -4810,6 +4840,15 @@ const handleUriChange = async (state, oldUri, newUri) => {
     groups
   } = layout;
   const newTitle = getLabel(newUri);
+  const editorUriUpdates = [];
+  for (const group of groups) {
+    for (const tab of group.tabs) {
+      if (tab.uri === oldUri && tab.editorType === 'text' && tab.editorUid !== -1) {
+        editorUriUpdates.push(invoke('Editor.handleUriChange', tab.editorUid, newUri));
+      }
+    }
+  }
+  await Promise.all(editorUriUpdates);
   const updatedGroups = groups.map(group => {
     return {
       ...group,
@@ -5954,6 +5993,7 @@ const HandleHeaderDoubleClick = 15;
 const HandleSashPointerDown = 16;
 const HandleSashPointerMove = 17;
 const HandleSashPointerUp = 18;
+const HandleDoubleClick = 19;
 
 const renderContent = content => {
   return [{
@@ -6120,6 +6160,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onContextMenu: HandleTabContextMenu,
+    onDblClick: HandleDoubleClick,
     onMouseDown: HandleClickTab,
     role: 'tab',
     title: tab.uriTitle || tab.uri || tab.title,
@@ -6481,6 +6522,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickTab,
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index', Button$1]
+  }, {
+    name: HandleDoubleClick,
+    params: ['handleDoubleClick', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }, {
     name: HandleContextMenu,
     params: ['handleContextMenu', 'event.target.dataset.groupId', ClientX, ClientY],
@@ -6604,6 +6648,14 @@ const reopenEditorWith = async context => {
   }
 };
 
+const settingsUri = 'app://settings.json';
+const saveEditorAndHandleSettingsChange = async tab => {
+  const editorState = await saveEditor(tab.editorUid);
+  if (!editorState?.modified && tab.uri === settingsUri) {
+    await invoke('Layout.handleSettingsChanged');
+  }
+  return editorState;
+};
 const getLatestStoredState = (uid, fallbackState, referenceTabId, referenceTabUri, allowMissingReference = false) => {
   const stateFromStore = get(uid);
   if (!stateFromStore) {
@@ -6639,10 +6691,10 @@ const save = async state => {
     return currentState;
   }
   if (!tab.isDirty) {
-    await saveEditor(tab.editorUid);
+    await saveEditorAndHandleSettingsChange(tab);
     return getLatestStoredState(state.uid, currentState, tab.id, tab.uri);
   }
-  const editorState = await saveEditor(tab.editorUid);
+  const editorState = await saveEditorAndHandleSettingsChange(tab);
   const latestState = getLatestStoredState(state.uid, currentState, tab.id, tab.uri);
   if (editorState?.modified) {
     return latestState;

package/package.json

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