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

package/dist/mainAreaWorkerMain.js

@@ -4083,8 +4083,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 +4179,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 +4189,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 +4336,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;
   }
@@ -4859,7 +4869,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 +5105,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';
@@ -6452,7 +6480,7 @@ 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: HandleContextMenu,
     params: ['handleContextMenu', 'event.target.dataset.groupId', ClientX, ClientY],
@@ -6745,6 +6773,7 @@ const setEditorLayout = (state, direction, slots) => {
       ...group,
       direction: slot.direction,
       focused,
+      segmentId: slot.segmentId,
       size: slot.size
     };
   });
@@ -6808,39 +6837,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 +7087,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.28.2",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",