@lvce-editor/main-area-worker 9.67.0 → 9.67.2

package/dist/mainAreaWorkerMain.js

@@ -1822,7 +1822,7 @@ const getActiveTab = state => {
   const {
     groups
   } = layout;
-  const activeGroup = groups.find(group => group.focused);
+  const activeGroup = groups.find(group => group.isFocused);
   if (!activeGroup || !activeGroup.activeTabId) {
     return undefined;
   }
@@ -2353,7 +2353,7 @@ const closeTabAndSave = async (state, groupId, tabId) => {
 };
 
 const isFocused$1 = group => {
-  return group.focused;
+  return group.isFocused;
 };
 const getFocusedGroup = state => {
   const {
@@ -2452,7 +2452,7 @@ const closeEditorGroup$1 = (state, groupId) => {
 };
 
 const isFocused = group => {
-  return group.focused;
+  return group.isFocused;
 };
 const closeFocusedTab = async state => {
   const {
@@ -3076,7 +3076,7 @@ const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
     if (index !== groupIndex) {
       return {
         ...group,
-        focused: false
+        isFocused: false
       };
     }
     const tabs = needsLoading ? group.tabs.map(tab => {
@@ -3092,7 +3092,7 @@ const getUpdatedGroups = (groups, groupIndex, needsLoading, tabId) => {
     return {
       ...group,
       activeTabId: tabId,
-      focused: true,
+      isFocused: true,
       tabs
     };
   });
@@ -4787,7 +4787,7 @@ const focusEditorGroup = (state, groupId) => {
   } = layout;
   const updatedGroups = groups.map(group => ({
     ...group,
-    focused: group.id === groupId
+    isFocused: group.id === groupId
   }));
   return {
     ...state,
@@ -5109,9 +5109,9 @@ const createEmptyGroup$1 = (state, uri, requestId, preview = false, title = getL
   const newGroup = {
     activeTabId: newTab.id,
     direction,
-    focused: true,
     id: groupId,
     isEmpty: false,
+    isFocused: true,
     size: 100,
     tabs: [newTab]
   };
@@ -5166,7 +5166,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
     type: 'editor',
     uri
   };
-  // Find the active group (by activeGroupId or focused flag)
+  // Find the active group (by activeGroupId or isFocused flag)
   const {
     homeDirUri,
     layout
@@ -5175,7 +5175,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
     activeGroupId,
     groups
   } = layout;
-  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.isFocused) : groups.find(group => group.id === activeGroupId);
 
   // Generate a request ID for content loading
   const requestId = getNextRequestId();
@@ -5479,7 +5479,7 @@ const getActivePreviewEditorUid = state => {
     activeGroupId,
     groups
   } = layout;
-  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.isFocused) : groups.find(group => group.id === activeGroupId);
   const activeTab = activeGroup?.tabs.find(tab => tab.id === activeGroup.activeTabId);
   return activeTab?.isPreview ? activeTab.editorUid : -1;
 };
@@ -5712,12 +5712,12 @@ const focusGroup = (groups, groupId, activeTabId) => {
       return {
         ...group,
         activeTabId,
-        focused: true
+        isFocused: true
       };
     }
     return {
       ...group,
-      focused: false
+      isFocused: false
     };
   });
 };
@@ -5789,14 +5789,14 @@ const restoreIntoExistingGroup = (state, entry) => {
       return {
         ...currentGroup,
         activeTabId: restoredTab.id,
-        focused: true,
         isEmpty: false,
+        isFocused: true,
         tabs
       };
     }
     return {
       ...currentGroup,
-      focused: false
+      isFocused: false
     };
   });
   return {
@@ -5816,8 +5816,8 @@ const createRestoredGroup = entry => {
   return {
     ...entry.group,
     activeTabId: entry.tab.id,
-    focused: true,
     isEmpty: false,
+    isFocused: true,
     tabs: [getRestoredTab(entry.tab)]
   };
 };
@@ -5843,7 +5843,7 @@ const restoreIntoRecreatedGroup = (state, entry) => {
   const groupIndex = clampIndex(entry.groupIndex, 0, groups.length);
   const unfocusedGroups = groups.map(group => ({
     ...group,
-    focused: false
+    isFocused: false
   }));
   const insertedGroups = [...unfocusedGroups.slice(0, groupIndex), restoredGroup, ...unfocusedGroups.slice(groupIndex)];
   return {
@@ -5936,7 +5936,7 @@ const splitOnlyGroup = (state, groups, groupId, newGroupId, direction, splitLayo
       return {
         ...group,
         direction: splitLayoutDirection,
-        focused: false,
+        isFocused: false,
         size: 50
       };
     }
@@ -5963,7 +5963,7 @@ const splitWithinMatchingNestedDirection = (state, groups, sourceGroup, groupId,
     if (group.id === groupId) {
       return {
         ...group,
-        focused: false,
+        isFocused: false,
         size: Number((group.size / 2).toFixed(6))
       };
     }
@@ -5986,7 +5986,7 @@ const splitStandaloneSourceIntoNestedDirection = (state, groups, sourceGroup, gr
   const updatedSourceGroup = {
     ...sourceGroup,
     direction: splitLayoutDirection,
-    focused: false,
+    isFocused: false,
     segmentId,
     size: halfSize
   };
@@ -6006,7 +6006,7 @@ const splitAtRootLevel = (state, groups, groupId, newGroupId, direction, baseNew
       return {
         ...group,
         direction: state.layout.direction,
-        focused: false,
+        isFocused: false,
         size: 50
       };
     }
@@ -6040,9 +6040,9 @@ const splitEditorGroup = (state, groupId, direction) => {
   const baseNewGroup = {
     activeTabId: -1,
     direction: sourceGroup.direction,
-    focused: true,
     id: newGroupId,
     isEmpty: true,
+    isFocused: true,
     size: sourceGroup.size / 2,
     tabs: []
   };
@@ -6564,9 +6564,9 @@ const splitDown = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6601,9 +6601,9 @@ const splitLeft = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6637,9 +6637,9 @@ const splitRight = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6671,9 +6671,9 @@ const splitUp = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6915,7 +6915,7 @@ const newFile = async state => {
   } = layout;
 
   // Find the active group
-  const activeGroup = activeGroupId === -1 ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
+  const activeGroup = activeGroupId === -1 ? groups.find(group => group.isFocused) : groups.find(group => group.id === activeGroupId);
 
   // Prepare initial state
   let newState = state;
@@ -7632,7 +7632,7 @@ const isValidTab = tab => {
 };
 
 const isValidEditorGroup = group => {
-  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && typeof group.activeTabId === 'number' && 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';
+  return group && typeof group.id === 'number' && Array.isArray(group.tabs) && group.tabs.every(isValidTab) && typeof group.activeTabId === 'number' && isLayoutDirection(group.direction) && typeof group.isFocused === 'boolean' && (group.segmentId === undefined || typeof group.segmentId === 'number') && typeof group.size === 'number' && group.size > 0 && typeof group.isEmpty === 'boolean';
 };
 
 const isValidMainAreaLayout = layout => {
@@ -7705,10 +7705,15 @@ const tryRestoreLayout = savedState => {
     direction: layoutDirection,
     groups: rawLayout.groups.map(group => {
       const groupDirection = normalizeGroupDirection(group, layoutDirection);
+      const {
+        focused: legacyIsFocused,
+        ...groupWithoutLegacyFocus
+      } = group ?? {};
       return {
-        ...group,
+        ...groupWithoutLegacyFocus,
         activeTabId: group?.activeTabId === undefined ? -1 : group.activeTabId,
         direction: groupDirection,
+        isFocused: typeof group?.isFocused === 'boolean' ? group.isFocused : legacyIsFocused,
         tabs: Array.isArray(group?.tabs) ? group.tabs.map(normalizeRestoredTab) : []
       };
     })
@@ -7897,25 +7902,25 @@ const getEditorInputUris = editorInput => {
       return [];
   }
 };
-const getChangedEditorUid = (editorUid, editorInput, uri, changedUris) => {
+const getChangedEditorUid = (editorUid, editorInput, uri, changedUris, reloadAll) => {
   if (editorUid === -1) {
     return undefined;
   }
   const uris = getEditorInputUris(editorInput);
-  if (uris.some(editorUri => changedUris.has(editorUri)) || uris.length === 0 && uri && changedUris.has(uri)) {
+  if (reloadAll && (uris.length > 0 || uri) || uris.some(editorUri => changedUris.has(editorUri)) || uris.length === 0 && uri && changedUris.has(uri)) {
     return editorUid;
   }
   return undefined;
 };
-const reloadChangedEditors = async (state, changed) => {
-  if (changed.length === 0) {
+const reloadChangedEditors = async (state, changed, reloadAll) => {
+  if (changed.length === 0 && !reloadAll) {
     return;
   }
   const changedUris = new Set(changed);
   const editorUids = new Set();
   for (const group of state.layout.groups) {
     for (const tab of group.tabs) {
-      const editorUid = getChangedEditorUid(tab.editorUid, tab.editorInput, tab.uri, changedUris);
+      const editorUid = getChangedEditorUid(tab.editorUid, tab.editorInput, tab.uri, changedUris, reloadAll);
       if (editorUid !== undefined) {
         editorUids.add(editorUid);
       }
@@ -7932,6 +7937,7 @@ const handleWorkspaceRefresh = async (state, refresh = {}) => {
     deleted = [],
     renamed = []
   } = changes;
+  const reloadAll = changes.reloadAll === true;
   let newState = state;
   for (const [oldUri, newUri] of renamed) {
     newState = await handleUriChange(newState, oldUri, newUri);
@@ -7944,7 +7950,7 @@ const handleWorkspaceRefresh = async (state, refresh = {}) => {
       }
     }
   }
-  await reloadChangedEditors(newState, changed);
+  await reloadChangedEditors(newState, changed, reloadAll);
   return newState;
 };
 const handleWorkspaceRefreshWithContext = async (context, refresh = {}) => {
@@ -8884,9 +8890,9 @@ const createEmptyGroup = direction => {
   return {
     activeTabId: -1,
     direction,
-    focused: false,
     id: create$2(),
     isEmpty: true,
+    isFocused: false,
     size: 100,
     tabs: []
   };
@@ -8896,7 +8902,7 @@ const getActiveGroupIndex = (groups, activeGroupId) => {
   if (activeIndex !== -1) {
     return activeIndex;
   }
-  const focusedIndex = groups.findIndex(group => group.focused);
+  const focusedIndex = groups.findIndex(group => group.isFocused);
   if (focusedIndex !== -1) {
     return focusedIndex;
   }
@@ -8949,11 +8955,11 @@ const setEditorLayout = (state, direction, slots) => {
   const activeIndex = originalActiveIndex >= slots.length ? slots.length - 1 : getActiveGroupIndex(groups, activeGroupId);
   const nextGroups = groups.map((group, index) => {
     const slot = slots[index];
-    const focused = index === activeIndex;
+    const isFocused = index === activeIndex;
     return {
       ...group,
       direction: slot.direction,
-      focused,
+      isFocused,
       segmentId: slot.segmentId,
       size: slot.size
     };

package/package.json

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