@lvce-editor/main-area-worker 8.14.0 → 8.16.0

package/dist/mainAreaWorkerMain.js

@@ -280,6 +280,44 @@ const closeOtherTabs = (state, groupId) => {
   };
 };
 
+const getNextActiveTabId = (tabs, newTabs, activeTabId) => {
+  if (activeTabId === undefined) {
+    return undefined;
+  }
+  if (newTabs.some(tab => tab.id === activeTabId)) {
+    return activeTabId;
+  }
+  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
+  if (activeTabIndex === -1 || newTabs.length === 0) {
+    return undefined;
+  }
+  return newTabs[Math.min(activeTabIndex, newTabs.length - 1)].id;
+};
+const closeSavedInGroup = group => {
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  const newTabs = tabs.filter(tab => tab.isDirty);
+  if (newTabs.length === tabs.length) {
+    return group;
+  }
+  const newActiveTabId = getNextActiveTabId(tabs, newTabs, activeTabId);
+  return {
+    ...group,
+    activeTabId: newActiveTabId,
+    isEmpty: newTabs.length === 0,
+    tabs: newTabs
+  };
+};
+const closeSaved$1 = state => {
+  const {
+    groups
+  } = state.layout;
+  const newGroups = groups.map(closeSavedInGroup);
+  return withGroups(state, newGroups);
+};
+
 const getGroupById = (state, groupId) => {
   return state.layout.groups.find(group => group.id === groupId);
 };
@@ -2359,7 +2397,7 @@ const handleClickTogglePreview = async state => {
 
 const CloseGroup = 'close-group';
 const RetryOpen = 'retry-open';
-const SplitRight = 'split-right';
+const SplitRight$1 = 'split-right';
 const TogglePreview$1 = 'toggle-preview';
 
 const getBasename$1 = uri => {
@@ -2382,7 +2420,7 @@ const getLabel = uri => {
   return getBasename$1(uri);
 };
 
-const createEmptyGroup = (state, uri, requestId) => {
+const createEmptyGroup = (state, uri, requestId, preview = false) => {
   const {
     layout
   } = state;
@@ -2400,7 +2438,7 @@ const createEmptyGroup = (state, uri, requestId) => {
     icon: '',
     id: tabId,
     isDirty: false,
-    isPreview: false,
+    isPreview: preview,
     language: '',
     loadingState: 'loading',
     title,
@@ -2460,7 +2498,7 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
-const ensureActiveGroup = (state, uri) => {
+const ensureActiveGroup = (state, uri, preview = false) => {
   // Find the active group (by activeGroupId or focused flag)
   const {
     layout
@@ -2472,11 +2510,49 @@ const ensureActiveGroup = (state, uri) => {
   const activeGroup = activeGroupId === undefined ? groups.find(group => group.focused) : groups.find(group => group.id === activeGroupId);
 
   // Generate a request ID for content loading
-  getNextRequestId();
+  const requestId = getNextRequestId();
 
   // If no active group exists, create one
   let newState;
   if (activeGroup) {
+    const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
+    if (activeTab?.isPreview) {
+      const title = getLabel(uri);
+      const updatedGroups = groups.map(group => {
+        if (group.id !== activeGroup.id) {
+          return group;
+        }
+        const updatedTabs = group.tabs.map(tab => {
+          if (tab.id !== activeTab.id) {
+            return tab;
+          }
+          return {
+            ...tab,
+            errorMessage: '',
+            icon: '',
+            isDirty: false,
+            isPreview: preview,
+            language: '',
+            loadingState: 'loading',
+            title,
+            uri
+          };
+        });
+        return {
+          ...group,
+          tabs: updatedTabs
+        };
+      });
+      return {
+        ...state,
+        layout: {
+          ...layout,
+          activeGroupId: activeGroup.id,
+          groups: updatedGroups
+        }
+      };
+    }
+
     // Create a new tab with the URI in the active group
     const title = getLabel(uri);
     const tabId = create$1();
@@ -2488,7 +2564,7 @@ const ensureActiveGroup = (state, uri) => {
       icon: '',
       id: tabId,
       isDirty: false,
-      isPreview: false,
+      isPreview: preview,
       language: '',
       loadingState: 'loading',
       title,
@@ -2496,7 +2572,7 @@ const ensureActiveGroup = (state, uri) => {
     };
     newState = openTab(state, activeGroup.id, newTab);
   } else {
-    newState = createEmptyGroup(state, uri);
+    newState = createEmptyGroup(state, uri, requestId, preview);
   }
   return newState;
 };
@@ -2698,6 +2774,7 @@ const openUri = async (state, options) => {
     uid
   } = state;
   const uri = getOptionUriOptions(options);
+  const preview = typeof options === 'string' ? false : options.preview ?? false;
 
   // Check if a tab with this URI already exists in the passed-in state
   const existingTab = findTabByUri(state, uri);
@@ -2745,7 +2822,7 @@ const openUri = async (state, options) => {
     tabId = existingTab.tab.id;
   } else {
     // Add tab to state BEFORE any async calls to prevent race conditions
-    stateWithTab = ensureActiveGroup(currentState, uri);
+    stateWithTab = ensureActiveGroup(currentState, uri, preview);
     tabId = getActiveTabId(stateWithTab);
   }
 
@@ -2968,7 +3045,7 @@ const handleClickAction = async (state, action, rawGroupId) => {
       return state;
     case RetryOpen:
       return retryOpen(state);
-    case SplitRight:
+    case SplitRight$1:
       return splitEditorGroup$1(state, activeGroup.id, Right);
     case TogglePreview$1:
       return handleClickTogglePreview(state);
@@ -3047,6 +3124,7 @@ const IconButton = 'IconButton';
 const MainTab = 'MainTab';
 const MainTabs = 'MainTabs';
 const MainTabModified = 'MainTabModified';
+const MainTabPreview = 'MainTabPreview';
 const MainTabSelected = 'MainTabSelected';
 
 const newFile = async state => {
@@ -3725,14 +3803,28 @@ const Close = 'Close';
 const CloseEditorGroup = 'Close Editor Group';
 const CloseAll = 'Close All';
 const CloseOthers = 'Close Others';
+const CloseSaved = 'Close Saved';
 const CloseToTheRight = 'Close To The Right';
 const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
 const FindFileReferences = 'Find File References';
-const RevealInExplorer = 'Reveal in Explorer';
+const ReopenEditorWith = 'Reopen Editor With...';
+const Share = 'Share';
+const AddFileToChat = 'Add File to Chat';
+const OpenContainingFolder = 'Open Containing Folder';
+const RevealInExplorerView = 'Reveal in Explorer View';
+const KeepOpen = 'Keep Open';
+const Pin = 'Pin';
+const SplitAndMove = 'Split & Move';
+const MoveIntoNewWindow = 'Move into New Window';
+const CopyIntoNewWindow = 'Copy into New Window';
 const SplitEditorGroup = 'Split Editor Group';
+const SplitRight = 'Split Right';
 const TogglePreview = 'Toggle Preview';
 
+const splitRight$1 = () => {
+  return i18nString(SplitRight);
+};
 const splitEditorGroup = () => {
   return i18nString(SplitEditorGroup);
 };
@@ -3748,8 +3840,8 @@ const closeOthers = () => {
 const closeAll = () => {
   return i18nString(CloseAll);
 };
-const revealInExplorer = () => {
-  return i18nString(RevealInExplorer);
+const closeSaved = () => {
+  return i18nString(CloseSaved);
 };
 const closeToTheRight = () => {
   return i18nString(CloseToTheRight);
@@ -3763,6 +3855,36 @@ const copyPath = () => {
 const copyRelativePath = () => {
   return i18nString(CopyRelativePath);
 };
+const reopenEditorWith = () => {
+  return i18nString(ReopenEditorWith);
+};
+const share = () => {
+  return i18nString(Share);
+};
+const addFileToChat = () => {
+  return i18nString(AddFileToChat);
+};
+const openContainingFolder = () => {
+  return i18nString(OpenContainingFolder);
+};
+const revealInExplorerView = () => {
+  return i18nString(RevealInExplorerView);
+};
+const keepOpen = () => {
+  return i18nString(KeepOpen);
+};
+const pin = () => {
+  return i18nString(Pin);
+};
+const splitAndMove = () => {
+  return i18nString(SplitAndMove);
+};
+const moveIntoNewWindow = () => {
+  return i18nString(MoveIntoNewWindow);
+};
+const copyIntoNewWindow = () => {
+  return i18nString(CopyIntoNewWindow);
+};
 const togglePreview = () => {
   return i18nString(TogglePreview);
 };
@@ -3812,18 +3934,17 @@ const getMenuEntries$1 = state => {
     flags: None,
     id: 'tabCloseToTheRight',
     label: closeToTheRight()
+  }, {
+    command: 'Main.closeSaved',
+    flags: None,
+    id: 'tabCloseSaved',
+    label: closeSaved()
   }, {
     command: 'Main.closeAll',
     flags: None,
     id: 'tabCloseAll',
     label: closeAll()
   }, menuEntrySeparator, {
-    args: [path],
-    command: 'Explorer.revealItem',
-    flags: None,
-    id: 'revealInExplorer',
-    label: revealInExplorer()
-  }, {
     args: [path],
     command: 'Main.copyPath',
     flags: None,
@@ -3835,6 +3956,62 @@ const getMenuEntries$1 = state => {
     flags: None,
     id: 'copyRelativePath',
     label: copyRelativePath()
+  }, menuEntrySeparator, {
+    command: '',
+    flags: None,
+    id: 'reopenEditorWith',
+    label: reopenEditorWith()
+  }, menuEntrySeparator, {
+    command: '',
+    flags: None,
+    id: 'share',
+    label: share()
+  }, menuEntrySeparator, {
+    command: '',
+    flags: None,
+    id: 'addFileToChat',
+    label: addFileToChat()
+  }, menuEntrySeparator, {
+    command: '',
+    flags: None,
+    id: 'openContainingFolder',
+    label: openContainingFolder()
+  }, {
+    args: [path],
+    command: 'Explorer.revealItem',
+    flags: None,
+    id: 'revealInExplorerView',
+    label: revealInExplorerView()
+  }, menuEntrySeparator, {
+    command: '',
+    flags: None,
+    id: 'keepOpen',
+    label: keepOpen()
+  }, {
+    command: '',
+    flags: None,
+    id: 'pin',
+    label: pin()
+  }, menuEntrySeparator, {
+    command: 'Main.splitRight',
+    flags: None,
+    id: 'splitRight',
+    label: splitRight$1()
+  }, {
+    command: '',
+    flags: None,
+    id: 'splitAndMove',
+    label: splitAndMove()
+  }, {
+    command: '',
+    flags: None,
+    id: 'moveIntoNewWindow',
+    label: moveIntoNewWindow()
+  }, {
+    command: '',
+    flags: None,
+    id: 'copyIntoNewWindow',
+    label: copyIntoNewWindow()
   }, menuEntrySeparator, {
     args: [/* id */'References', /* focus */true, path],
     command: 'SideBar.show',
@@ -4320,6 +4497,9 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   if (tab.isDirty) {
     className += ' ' + MainTabModified;
   }
+  if (tab.isPreview) {
+    className += ' ' + MainTabPreview;
+  }
   return [{
     'aria-selected': isActive,
     childCount: 3,
@@ -4388,9 +4568,9 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
     buttons.push({
       childCount: 1,
       className: EditorGroupActionButton + ' ' + SplitEditorGroupButton,
-      'data-action': SplitRight,
+      'data-action': SplitRight$1,
       'data-groupId': String(group.id),
-      name: SplitRight,
+      name: SplitRight$1,
       onClick: HandleClickAction,
       title: splitEditorGroup(),
       type: Button$2
@@ -4474,14 +4654,19 @@ const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizePr
 const getSashClassName = direction => {
   return direction === 'horizontal' ? 'Sash SashVertical' : 'Sash SashHorizontal';
 };
+
 const renderSash = (direction, sashId, style) => {
   return [{
-    childCount: 0,
+    childCount: 1,
     className: getSashClassName(direction),
     'data-sashId': sashId,
     onPointerDown: HandleSashPointerDown,
     style,
     type: Div
+  }, {
+    childCount: 0,
+    className: 'SashBorder',
+    type: Div
   }];
 };
 
@@ -4519,7 +4704,8 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
       children.push(...renderSash(direction, sashId, style));
       childCount++;
     }
-    children.push(...renderEditorGroup(groups[i], i, splitButtonEnabled, sizeProperty));
+    const editorGroupDom = renderEditorGroup(groups[i], i, splitButtonEnabled, sizeProperty);
+    children.push(...editorGroupDom);
     childCount++;
   }
   return [{
@@ -4751,6 +4937,7 @@ const commandMap = {
   'MainArea.closeAllEditors': wrapCommand(closeAll$1),
   'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
   'MainArea.closeOthers': wrapCommand(closeOtherTabs),
+  'MainArea.closeSaved': wrapCommand(closeSaved$1),
   'MainArea.closeTabsRight': wrapCommand(closeTabsRight),
   'MainArea.copyPath': wrapCommand(copyPath$1),
   'MainArea.copyRelativePath': wrapCommand(copyRelativePath$1),

package/package.json

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