@lvce-editor/main-area-worker 9.33.1 → 9.33.2

package/dist/mainAreaWorkerMain.js

@@ -2326,7 +2326,10 @@ const findTabInState = (state, groupId, tabId) => {
   const {
     layout
   } = state;
-  const group = layout.groups.find(g => g.id === groupId);
+  const {
+    groups
+  } = layout;
+  const group = groups.find(g => g.id === groupId);
   return group?.tabs.find(t => t.id === tabId);
 };
 
@@ -2334,6 +2337,9 @@ const closeTabWithViewlet = async (state, groupId, tabId) => {
   const {
     layout
   } = state;
+  const {
+    groups
+  } = layout;
   const tab = findTabInState(state, groupId, tabId);
   const commands = [];
   if (tab && tab.editorUid !== -1) {
@@ -2343,7 +2349,7 @@ const closeTabWithViewlet = async (state, groupId, tabId) => {
     commands.push(...disposeCommands);
   }
   const newState = closeTab(state, groupId, tabId);
-  const group = layout.groups.find(g => g.id === groupId);
+  const group = groups.find(g => g.id === groupId);
   const wasActiveTab = group?.activeTabId === tabId;
   const newGroup = wasActiveTab ? newState.layout.groups.find(candidate => candidate.id === groupId) : undefined;
   const newActiveTabId = newGroup?.activeTabId;
@@ -2467,9 +2473,12 @@ const closeAll$1 = async state => {
   const {
     layout
   } = state;
-  const editorUids = layout.groups.flatMap(group => group.tabs.map(tab => tab.editorUid)).filter(editorUid => editorUid !== -1);
+  const {
+    groups
+  } = layout;
+  const editorUids = groups.flatMap(group => group.tabs.map(tab => tab.editorUid)).filter(editorUid => editorUid !== -1);
   await disposeEditors(editorUids);
-  const entries = layout.groups.flatMap((group, groupIndex) => {
+  const entries = groups.flatMap((group, groupIndex) => {
     return group.tabs.map((tab, tabIndex) => ({
       group,
       groupIndex,
@@ -2635,7 +2644,10 @@ const closeFirstTabByUri = (state, uri) => {
   const {
     layout
   } = state;
-  const matchingGroup = layout.groups.find(group => {
+  const {
+    groups
+  } = layout;
+  const matchingGroup = groups.find(group => {
     return group.tabs.some(tab => tab.uri === uri);
   });
   const matchingTab = matchingGroup?.tabs.find(tab => tab.uri === uri);
@@ -2660,7 +2672,10 @@ const getGroupById = (state, groupId) => {
   const {
     layout
   } = state;
-  return layout.groups.find(group => group.id === groupId);
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.id === groupId);
 };
 
 const closeTabsRight = (state, groupId) => {
@@ -3045,7 +3060,10 @@ const getSelectedTabData = (state, groupIndex, index) => {
   const {
     layout
   } = state;
-  const group = layout.groups[groupIndex];
+  const {
+    groups
+  } = layout;
+  const group = groups[groupIndex];
   if (!group || index < 0 || index >= group.tabs.length) {
     return undefined;
   }
@@ -3226,6 +3244,7 @@ const selectTab = async (state, groupIndex, index) => {
     uid
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
   if (groupIndex < 0 || groupIndex >= groups.length) {
@@ -3242,7 +3261,7 @@ const selectTab = async (state, groupIndex, index) => {
     tabId
   } = selectedTabData;
   const normalizedTab = normalizeTabEditorInput(tab);
-  const isAlreadyActive = layout.activeGroupId === groupId && group.activeTabId === tabId;
+  const isAlreadyActive = activeGroupId === groupId && group.activeTabId === tabId;
   if (isAlreadyActive && !shouldLoadContentForTab(normalizedTab)) {
     return state;
   }
@@ -3458,6 +3477,9 @@ const restoreExistingUri = (state, entry) => {
   const {
     layout
   } = state;
+  const {
+    groups: layoutGroups
+  } = layout;
   if (!entry.tab.uri) {
     return undefined;
   }
@@ -3465,11 +3487,11 @@ const restoreExistingUri = (state, entry) => {
   if (!existing) {
     return undefined;
   }
-  const groupIndex = layout.groups.findIndex(group => group.id === existing.groupId);
+  const groupIndex = layoutGroups.findIndex(group => group.id === existing.groupId);
   if (groupIndex === -1) {
     return undefined;
   }
-  const tabIndex = layout.groups[groupIndex].tabs.findIndex(tab => tab.id === existing.tab.id);
+  const tabIndex = layoutGroups[groupIndex].tabs.findIndex(tab => tab.id === existing.tab.id);
   if (tabIndex === -1) {
     return undefined;
   }
@@ -3637,7 +3659,10 @@ const getTabCount = state => {
   const {
     layout
   } = state;
-  return layout.groups.reduce((sum, group) => sum + group.tabs.length, 0);
+  const {
+    groups
+  } = layout;
+  return groups.reduce((sum, group) => sum + group.tabs.length, 0);
 };
 
 const getCurrentState = state => {
@@ -3754,12 +3779,15 @@ const updateTabUriTitles = state => {
     homeDirUri: rawHomeDirUri,
     layout
   } = state;
+  const {
+    groups
+  } = layout;
   const homeDirUri = rawHomeDirUri || '';
   return {
     ...state,
     layout: {
       ...layout,
-      groups: layout.groups.map(group => ({
+      groups: groups.map(group => ({
         ...group,
         tabs: group.tabs.map(tab => updateTabUriTitle(tab, homeDirUri))
       }))
@@ -4143,7 +4171,11 @@ const getActivePreviewEditorUid = state => {
   const {
     layout
   } = state;
-  const activeGroup = layout.activeGroupId === undefined ? layout.groups.find(group => group.focused) : layout.groups.find(group => group.id === layout.activeGroupId);
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
   const activeTab = activeGroup?.tabs.find(tab => tab.id === activeGroup.activeTabId);
   return activeTab?.isPreview ? activeTab.editorUid : -1;
 };
@@ -4359,11 +4391,14 @@ const createNextState = (state, activeGroupId, groups) => {
   const {
     layout
   } = state;
+  const {
+    direction
+  } = layout;
   return {
     ...state,
     layout: {
       activeGroupId,
-      direction: layout.direction,
+      direction,
       groups
     }
   };
@@ -4466,6 +4501,7 @@ const splitEditorGroup$1 = (state, groupId, direction) => {
     layout
   } = state;
   const {
+    direction: layoutDirection,
     groups
   } = layout;
   const sourceGroup = groups.find(group => group.id === groupId);
@@ -4488,12 +4524,12 @@ const splitEditorGroup$1 = (state, groupId, direction) => {
   if (sourceGroup.direction === splitLayoutDirection) {
     return splitWithinMatchingNestedDirection(state, groups, sourceGroup, groupId, newGroupId, direction, splitLayoutDirection, baseNewGroup);
   }
-  if (splitLayoutDirection !== layout.direction && sourceGroup.direction === undefined) {
+  if (splitLayoutDirection !== layoutDirection && sourceGroup.direction === undefined) {
     return splitStandaloneSourceIntoNestedDirection(state, groups, sourceGroup, groupId, newGroupId, direction, splitLayoutDirection, baseNewGroup);
   }
-  const segments = getGroupSegments(groups, layout.direction);
+  const segments = getGroupSegments(groups, layoutDirection);
   const hasNestedSegments = segments.some(segment => segment.direction !== undefined);
-  if (splitLayoutDirection === layout.direction && !hasNestedSegments) {
+  if (splitLayoutDirection === layoutDirection && !hasNestedSegments) {
     return splitAtRootLevel(state, groups, groupId, newGroupId, direction, baseNewGroup);
   }
   return createNextState(state, newGroupId, groups);
@@ -4608,12 +4644,15 @@ const handleDoubleClick = (state, groupIndexRaw, indexRaw) => {
   const {
     layout
   } = state;
+  const {
+    groups
+  } = layout;
   if (!groupIndexRaw || !indexRaw) {
     return state;
   }
   const groupIndex = Number.parseInt(groupIndexRaw);
   const tabIndex = Number.parseInt(indexRaw);
-  const tab = layout.groups[groupIndex]?.tabs[tabIndex];
+  const tab = groups[groupIndex]?.tabs[tabIndex];
   if (!tab?.isPreview) {
     return state;
   }
@@ -4710,7 +4749,10 @@ const getDragOverlay = (state, eventX, eventY) => {
     x,
     y
   } = state;
-  const hasOpenEditor = layout.groups.some(group => !group.isEmpty);
+  const {
+    groups
+  } = layout;
+  const hasOpenEditor = groups.some(group => !group.isEmpty);
   const contentY = hasOpenEditor ? tabHeight : 0;
   const contentHeight = Math.max(0, height - contentY);
   const relativeX = eventX - x;
@@ -4920,8 +4962,11 @@ const handleHeaderDoubleClick = async (state, className, groupIndexRaw) => {
 };
 
 const getAllTabs = layout => {
+  const {
+    groups
+  } = layout;
   const allTabs = [];
-  for (const group of layout.groups) {
+  for (const group of groups) {
     allTabs.push(...group.tabs);
   }
   return allTabs;
@@ -4932,6 +4977,9 @@ const loadFileIcons = async state => {
     fileIconCache,
     layout
   } = state;
+  const {
+    groups
+  } = layout;
   try {
     const allTabs = getAllTabs(layout);
     const {
@@ -4941,7 +4989,7 @@ const loadFileIcons = async state => {
     // Update tabs with their icons
     const updatedLayout = {
       ...layout,
-      groups: layout.groups.map(group => ({
+      groups: groups.map(group => ({
         ...group,
         tabs: group.tabs.map(tab => ({
           ...tab,
@@ -5054,7 +5102,11 @@ const offsetsMatch = (first, second) => {
   return Math.abs(first - second) < 1e-6;
 };
 const getSashCorner = layout => {
-  const segments = getGroupSegments(layout.groups, layout.direction);
+  const {
+    direction,
+    groups
+  } = layout;
+  const segments = getGroupSegments(groups, direction);
   if (segments.length !== 2) {
     return undefined;
   }
@@ -5074,7 +5126,7 @@ const getSashCorner = layout => {
     return undefined;
   }
   const rootOffset = firstSegmentSize / totalSize * 100;
-  if (layout.direction === Horizontal) {
+  if (direction === Horizontal) {
     return {
       leftOffset: rootOffset,
       topOffset: firstNestedOffset,
@@ -5098,6 +5150,9 @@ const handleSashCornerPointerDown = async (state, clientX, clientY) => {
   const {
     layout
   } = state;
+  const {
+    groups
+  } = layout;
   if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) {
     return state;
   }
@@ -5108,7 +5163,7 @@ const handleSashCornerPointerDown = async (state, clientX, clientY) => {
   return {
     ...state,
     sashCornerDrag: {
-      groupSizes: layout.groups.map(group => ({
+      groupSizes: groups.map(group => ({
         id: group.id,
         size: group.size
       })),
@@ -5157,6 +5212,9 @@ const handleSashCornerPointerMove = async (state, clientX, clientY) => {
     sashCornerDrag,
     width
   } = state;
+  const {
+    groups
+  } = layout;
   if (!sashCornerDrag || !width || !height || !Number.isFinite(clientX) || !Number.isFinite(clientY)) {
     return state;
   }
@@ -5183,7 +5241,7 @@ const handleSashCornerPointerMove = async (state, clientX, clientY) => {
     ...state,
     layout: {
       ...layout,
-      groups: layout.groups.map(group => {
+      groups: groups.map(group => {
         const xSize = xBeforeGroupIdSet.has(group.id) ? xBeforeSize : xAfterSize;
         const ySize = yBeforeGroupIdSet.has(group.id) ? yBeforeSize : yAfterSize;
         return {
@@ -5513,9 +5571,12 @@ const tryRestoreLayout = savedState => {
 };
 
 const createViewlets = async (layout, viewletModuleIds, bounds) => {
+  const {
+    groups
+  } = layout;
   const editorUids = {};
   const titles = {};
-  for (const group of layout.groups) {
+  for (const group of groups) {
     const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
     if (activeTab && viewletModuleIds[activeTab.id]) {
       const editorUid = activeTab.editorUid === -1 ? create$2() : activeTab.editorUid;
@@ -5533,8 +5594,11 @@ const createViewlets = async (layout, viewletModuleIds, bounds) => {
 };
 
 const getViewletModuleIds = async layout => {
+  const {
+    groups
+  } = layout;
   const viewletModuleIds = {};
-  for (const group of layout.groups) {
+  for (const group of groups) {
     const {
       tabs
     } = group;
@@ -6129,8 +6193,12 @@ const getDragOverlayCss = dragOverlay => {
 };
 
 const getEditorGroupCss = layout => {
-  const groupSizeVariable = layout.direction === Vertical ? '--EditorGroupHeight' : '--EditorGroupWidth';
-  return layout.groups.map(group => {
+  const {
+    direction,
+    groups
+  } = layout;
+  const groupSizeVariable = direction === Vertical ? '--EditorGroupHeight' : '--EditorGroupWidth';
+  return groups.map(group => {
     return `.EditorGroup[data-groupId="${group.id}"] {
   ${groupSizeVariable}: ${group.size}%;
 }`;
@@ -6173,7 +6241,11 @@ const renderSashCss = ({
 }`;
 };
 const getProtoSashCss = (layout, width) => {
-  const segments = getGroupSegments(layout.groups, layout.direction);
+  const {
+    direction,
+    groups
+  } = layout;
+  const segments = getGroupSegments(groups, direction);
   const hasNestedSegments = segments.some(segment => segment.direction !== undefined);
   const rules = [];
   let segmentOffset = 0;
@@ -6182,9 +6254,9 @@ const getProtoSashCss = (layout, width) => {
     const beforeGroupId = segments[i - 1].groups.at(-1)?.id || 0;
     const afterGroupId = segments[i].groups[0].id;
     const sashId = create(beforeGroupId, afterGroupId);
-    const value = hasNestedSegments || layout.direction !== Horizontal || !width ? `${segmentOffset}%` : getSashOffset(layout, i, width);
+    const value = hasNestedSegments || direction !== Horizontal || !width ? `${segmentOffset}%` : getSashOffset(layout, i, width);
     rules.push({
-      property: toSashProperty(layout.direction),
+      property: toSashProperty(direction),
       sashId,
       value
     });
@@ -6211,58 +6283,17 @@ const getProtoSashCss = (layout, width) => {
   return rules;
 };
 const getSashCss = (layout, width = 0) => {
-  if (layout.groups.length <= 1) {
+  const {
+    groups
+  } = layout;
+  if (groups.length <= 1) {
     return [];
   }
   return getProtoSashCss(layout, width).map(renderSashCss);
 };
 
 const getCss = (layout, width = 0, dragOverlay) => {
-  const rules = [`.Main {
-  position: relative;
-}`, `.editor-groups-container {
-  overflow: auto;
-}`, `.DragOverlay {
-  position: absolute;
-  z-index: 1;
-  contain: strict;
-  pointer-events: none;
-  background: rgba(83, 89, 93, 0.5);
-  transition: all 100ms;
-}`, `.SashBorder {
-  background: var(--SashBorder, gray);
-}`, `.SashBorderHorizontal {
-  width: 100%;
-  height: 1px;
-}`, `.SashBorderVertical {
-  width: 1px;
-  height: 100%;
-}`, `.SashCorner {
-  position: absolute;
-  z-index: 2;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 12px;
-  height: 12px;
-  padding: 0;
-  border: 0;
-  background: transparent;
-  cursor: all-scroll;
-  transform: translate(-50%, -50%);
-}`, `.SashCorner::after {
-  content: '';
-  width: 4px;
-  height: 4px;
-  background: var(--SashBorder, gray);
-}`, `.SashCorner:hover::after,
-.SashCorner:active::after {
-  background: var(--SashHoverBorder, #3d5252);
-}`, `.EditorGroup {
-  min-width: 250px;
-  width: var(--EditorGroupWidth, auto);
-  /*height: var(--EditorGroupHeight, auto);*/
-}`];
+  const rules = [];
   if (layout) {
     rules.push(...getEditorGroupCss(layout), ...getDragOverlayCss(dragOverlay), ...getSashCss(layout, width));
     const sashCorner = getSashCorner(layout);
@@ -6966,7 +6997,10 @@ const mainNode$1 = {
   type: Div
 };
 const renderSingleEditorGroup = (layout, splitButtonEnabled, sizeProperty = 'width') => {
-  return [mainNode$1, ...renderEditorGroup(layout.groups[0], 0, splitButtonEnabled, sizeProperty, false)];
+  const {
+    groups
+  } = layout;
+  return [mainNode$1, ...renderEditorGroup(groups[0], 0, splitButtonEnabled, sizeProperty, false)];
 };
 
 const getDirectionClassName = (direction, isSplit) => {
@@ -7416,7 +7450,10 @@ const saveState = state => {
   const {
     layout
   } = state;
-  const filteredGroups = getFilteredGroups(layout.groups);
+  const {
+    groups
+  } = layout;
+  const filteredGroups = getFilteredGroups(groups);
 
   // Update activeGroupId if it points to a removed group
   const {
@@ -7494,9 +7531,13 @@ const setEditorLayout = (state, direction, slots) => {
   const {
     layout
   } = state;
-  const groups = getGroupsForSlotCount(layout.groups, slots.length, layout.activeGroupId);
-  const originalActiveIndex = layout.groups.findIndex(group => group.id === layout.activeGroupId);
-  const activeIndex = originalActiveIndex >= slots.length ? slots.length - 1 : getActiveGroupIndex(groups, layout.activeGroupId);
+  const {
+    activeGroupId,
+    groups: currentGroups
+  } = layout;
+  const groups = getGroupsForSlotCount(currentGroups, slots.length, activeGroupId);
+  const originalActiveIndex = currentGroups.findIndex(group => group.id === activeGroupId);
+  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;
@@ -7521,12 +7562,16 @@ const flipLayout = state => {
   const {
     layout
   } = state;
+  const {
+    direction,
+    groups
+  } = layout;
   return {
     ...state,
     layout: {
       ...layout,
-      direction: flipDirection(layout.direction),
-      groups: layout.groups.map(group => ({
+      direction: flipDirection(direction),
+      groups: groups.map(group => ({
         ...group,
         direction: group.direction === undefined ? undefined : flipDirection(group.direction)
       }))
@@ -7625,6 +7670,7 @@ const splitDown = (state, groupId) => {
     layout
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
 
@@ -7649,7 +7695,7 @@ const splitDown = (state, groupId) => {
     };
     return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, 'down');
   }
-  const resolvedGroupId = groupId ?? layout.activeGroupId;
+  const resolvedGroupId = groupId ?? activeGroupId;
   if (!resolvedGroupId) {
     return state;
   }
@@ -7727,6 +7773,7 @@ const splitUp = (state, groupId) => {
     layout
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
   if (groups.length === 0) {
@@ -7749,7 +7796,7 @@ const splitUp = (state, groupId) => {
     };
     return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, 'up');
   }
-  const resolvedGroupId = groupId ?? layout.activeGroupId;
+  const resolvedGroupId = groupId ?? activeGroupId;
   if (!resolvedGroupId) {
     return state;
   }

package/package.json

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