@lvce-editor/main-area-worker 9.28.1 → 9.29.0

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, {
@@ -4083,8 +4102,11 @@ const getGroupSegments = (groups, parentDirection) => {
     if (group.direction !== undefined && group.direction !== parentDirection) {
       const startIndex = index;
       const nestedGroups = [group];
+      const {
+        segmentId
+      } = group;
       index++;
-      while (index < groups.length && groups[index].direction === group.direction) {
+      while (index < groups.length && groups[index].direction === group.direction && groups[index].segmentId === segmentId) {
         nestedGroups.push(groups[index]);
         index++;
       }
@@ -4176,6 +4198,7 @@ const splitWithinMatchingNestedDirection = (state, groups, sourceGroup, groupId,
   const newGroup = {
     ...baseNewGroup,
     direction: splitLayoutDirection,
+    segmentId: sourceGroup.segmentId,
     size: Number((sourceGroup.size / 2).toFixed(6))
   };
   const insertIndex = isTrailingSplit(direction) ? sourceIndex + 1 : sourceIndex;
@@ -4185,15 +4208,18 @@ const splitWithinMatchingNestedDirection = (state, groups, sourceGroup, groupId,
 const splitStandaloneSourceIntoNestedDirection = (state, groups, sourceGroup, groupId, newGroupId, direction, splitLayoutDirection, baseNewGroup) => {
   const sourceIndex = groups.findIndex(group => group.id === groupId);
   const halfSize = Number((sourceGroup.size / 2).toFixed(6));
+  const segmentId = sourceGroup.segmentId ?? sourceGroup.id;
   const updatedSourceGroup = {
     ...sourceGroup,
     direction: splitLayoutDirection,
     focused: false,
+    segmentId,
     size: halfSize
   };
   const newGroup = {
     ...baseNewGroup,
     direction: splitLayoutDirection,
+    segmentId,
     size: Number((sourceGroup.size - halfSize).toFixed(6))
   };
   const replacementGroups = isTrailingSplit(direction) ? [updatedSourceGroup, newGroup] : [newGroup, updatedSourceGroup];
@@ -4329,7 +4355,10 @@ const handleClickCloseTab = async (state, rawGroupIndex, rawIndex) => {
   return closeTabAndSave(state, groupId, tabId);
 };
 
-const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
+const handleClickTab = async (state, groupIndexRaw, indexRaw, button = 0) => {
+  if (button !== 0) {
+    return state;
+  }
   if (!groupIndexRaw || !indexRaw) {
     return state;
   }
@@ -4360,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';
@@ -4583,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;
@@ -4859,7 +4899,7 @@ const isValidTab = tab => {
 };
 
 const isValidEditorGroup = group => {
-  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && (group.direction === undefined || isLayoutDirection(group.direction)) && typeof group.focused === 'boolean' && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
+  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && (group.activeTabId === undefined || typeof group.activeTabId === 'number') && (group.direction === undefined || isLayoutDirection(group.direction)) && typeof group.focused === 'boolean' && (group.segmentId === undefined || typeof group.segmentId === 'number') && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
 };
 
 const isValidMainAreaLayout = layout => {
@@ -5095,6 +5135,24 @@ const handleWorkspaceChange = async (state, _workspacePath, savedState) => {
   return loadContent(state, savedState);
 };
 
+const handleWorkspaceRefresh = async (state, deletedUris = []) => {
+  const deleted = new Set(deletedUris);
+  let newState = state;
+  for (const group of state.layout.groups) {
+    for (const tab of group.tabs) {
+      if (tab.editorInput?.type === 'editor' && deleted.has(tab.editorInput.uri)) {
+        newState = await closeTabWithViewlet(newState, group.id, tab.id);
+      }
+    }
+  }
+  return newState;
+};
+const handleWorkspaceRefreshWithContext = async (context, deletedUris = []) => {
+  const state = context.getState();
+  const newState = await handleWorkspaceRefresh(state, deletedUris);
+  await context.updateState(() => newState);
+};
+
 const hasActiveTextEditor = state => {
   const activeTab = getActiveTab(state);
   return activeTab?.tab.editorInput?.type === 'editor';
@@ -5926,6 +5984,7 @@ const HandleHeaderDoubleClick = 15;
 const HandleSashPointerDown = 16;
 const HandleSashPointerMove = 17;
 const HandleSashPointerUp = 18;
+const HandleDoubleClick = 19;
 
 const renderContent = content => {
   return [{
@@ -6092,6 +6151,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,
@@ -6452,7 +6512,10 @@ const renderEventListeners = () => {
     params: ['handleClickCloseTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }, {
     name: HandleClickTab,
-    params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+    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],
@@ -6576,6 +6639,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) {
@@ -6611,10 +6682,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;
@@ -6745,6 +6816,7 @@ const setEditorLayout = (state, direction, slots) => {
       ...group,
       direction: slot.direction,
       focused,
+      segmentId: slot.segmentId,
       size: slot.size
     };
   });
@@ -6808,39 +6880,51 @@ const setEditorLayoutThreeRows = state => {
   }]);
 };
 const setEditorLayoutGrid = state => {
+  const leftSegmentId = create$2();
+  const rightSegmentId = create$2();
   return setEditorLayout(state, Horizontal, [{
     direction: Vertical,
+    segmentId: leftSegmentId,
     size: 25
   }, {
     direction: Vertical,
+    segmentId: leftSegmentId,
     size: 25
   }, {
     direction: Vertical,
+    segmentId: rightSegmentId,
     size: 25
   }, {
     direction: Vertical,
+    segmentId: rightSegmentId,
     size: 25
   }]);
 };
 const setEditorLayoutTwoRowsRight = state => {
+  const segmentId = create$2();
   return setEditorLayout(state, Horizontal, [{
     size: 50
   }, {
     direction: Vertical,
+    segmentId,
     size: 25
   }, {
     direction: Vertical,
+    segmentId,
     size: 25
   }]);
 };
 const setEditorLayoutTwoColumnsBottom = state => {
+  const segmentId = create$2();
   return setEditorLayout(state, Vertical, [{
     size: 50
   }, {
     direction: Horizontal,
+    segmentId,
     size: 25
   }, {
     direction: Horizontal,
+    segmentId,
     size: 25
   }]);
 };
@@ -7046,6 +7130,7 @@ const commandMap = {
   'MainArea.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
   'MainArea.handleUriChange': wrapSerialCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapSerialCommand(handleWorkspaceChange),
+  'MainArea.handleWorkspaceRefresh': wrapAsyncCommand(handleWorkspaceRefreshWithContext),
   'MainArea.hasActiveTextEditor': wrapGetter(hasActiveTextEditor),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapSerialCommand(loadContent),

package/package.json

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