@lvce-editor/main-area-worker 9.67.1 → 9.67.3

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
     };
   });
@@ -3841,6 +3841,7 @@ const MaskIconClose = 'MaskIcon MaskIconClose';
 const MaskIconExtensions = 'MaskIcon MaskIconExtensions';
 const MaskIconRecordKey = 'MaskIcon MaskIconRecordKey';
 const MaskIconSearch = 'MaskIcon MaskIconSearch';
+const MaskIconSettingsGear = 'MaskIcon MaskIconSettingsGear';
 const TextEditor = 'TextEditor';
 const TextEditorLoading = 'TextEditor TextEditor--loading';
 const EditorContentLoading = 'EditorContent EditorContent--loading';
@@ -4320,6 +4321,7 @@ const ExtensionDetailScheme = 'extension-detail://';
 const KeyBindingsUri = 'app://keybindings';
 const RunningExtensionsScheme = 'running-extensions://';
 const SearchEditorScheme = 'search-editor://';
+const SettingsScheme = 'settings://';
 const tabIconNode = {
   childCount: 1,
   className: TabIcon,
@@ -4351,6 +4353,9 @@ const renderTabIcon = tab => {
   if (tab.uri?.startsWith(SearchEditorScheme)) {
     return renderMaskIcon(MaskIconSearch);
   }
+  if (tab.uri?.startsWith(SettingsScheme)) {
+    return renderMaskIcon(MaskIconSettingsGear);
+  }
   if (!tab.icon) {
     return [];
   }
@@ -4787,7 +4792,7 @@ const focusEditorGroup = (state, groupId) => {
   } = layout;
   const updatedGroups = groups.map(group => ({
     ...group,
-    focused: group.id === groupId
+    isFocused: group.id === groupId
   }));
   return {
     ...state,
@@ -4981,6 +4986,9 @@ const getFileIcon = uri => {
   if (uri.startsWith('search-editor://')) {
     return `MaskIconSearch`;
   }
+  if (uri.startsWith('settings://')) {
+    return `MaskIconSettingsGear`;
+  }
   return '';
 };
 
@@ -5109,9 +5117,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 +5174,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 +5183,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 +5487,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 +5720,12 @@ const focusGroup = (groups, groupId, activeTabId) => {
       return {
         ...group,
         activeTabId,
-        focused: true
+        isFocused: true
       };
     }
     return {
       ...group,
-      focused: false
+      isFocused: false
     };
   });
 };
@@ -5789,14 +5797,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 +5824,8 @@ const createRestoredGroup = entry => {
   return {
     ...entry.group,
     activeTabId: entry.tab.id,
-    focused: true,
     isEmpty: false,
+    isFocused: true,
     tabs: [getRestoredTab(entry.tab)]
   };
 };
@@ -5843,7 +5851,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 +5944,7 @@ const splitOnlyGroup = (state, groups, groupId, newGroupId, direction, splitLayo
       return {
         ...group,
         direction: splitLayoutDirection,
-        focused: false,
+        isFocused: false,
         size: 50
       };
     }
@@ -5963,7 +5971,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 +5994,7 @@ const splitStandaloneSourceIntoNestedDirection = (state, groups, sourceGroup, gr
   const updatedSourceGroup = {
     ...sourceGroup,
     direction: splitLayoutDirection,
-    focused: false,
+    isFocused: false,
     segmentId,
     size: halfSize
   };
@@ -6006,7 +6014,7 @@ const splitAtRootLevel = (state, groups, groupId, newGroupId, direction, baseNew
       return {
         ...group,
         direction: state.layout.direction,
-        focused: false,
+        isFocused: false,
         size: 50
       };
     }
@@ -6040,9 +6048,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 +6572,9 @@ const splitDown = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6601,9 +6609,9 @@ const splitLeft = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6637,9 +6645,9 @@ const splitRight = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6671,9 +6679,9 @@ const splitUp = (state, groupId) => {
     const initialGroup = {
       activeTabId: -1,
       direction,
-      focused: true,
       id: initialGroupId,
       isEmpty: true,
+      isFocused: true,
       size: 100,
       tabs: []
     };
@@ -6915,7 +6923,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 +7640,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 +7713,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) : []
       };
     })
@@ -8885,9 +8898,9 @@ const createEmptyGroup = direction => {
   return {
     activeTabId: -1,
     direction,
-    focused: false,
     id: create$2(),
     isEmpty: true,
+    isFocused: false,
     size: 100,
     tabs: []
   };
@@ -8897,7 +8910,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;
   }
@@ -8950,11 +8963,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.1",
+  "version": "9.67.3",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",