@lvce-editor/main-area-worker 8.15.0 → 8.17.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);
 };
@@ -330,6 +368,7 @@ const Div = 4;
 const Span = 8;
 const Text = 12;
 const Img = 17;
+const P = 50;
 const Pre = 51;
 const Reference = 100;
 
@@ -419,7 +458,7 @@ const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
 const String$1 = 4;
-const Boolean = 5;
+const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
 const Unknown = 8;
@@ -440,7 +479,7 @@ const getType = value => {
       }
       return Object$1;
     case 'boolean':
-      return Boolean;
+      return Boolean$1;
     default:
       return Unknown;
   }
@@ -2359,7 +2398,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 => {
@@ -3007,7 +3046,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);
@@ -3072,8 +3111,8 @@ const MaskIconClose = 'MaskIcon MaskIconClose';
 const TextEditor = 'TextEditor';
 const TextEditorLoading = 'TextEditor TextEditor--loading';
 const EditorContentLoading = 'EditorContent EditorContent--loading';
-const TextEditorError = 'TextEditor TextEditor--error';
-const EditorContentError = 'EditorContent EditorContent--error';
+const TextEditorError = 'TextEditor TextEditorError';
+const EditorContentError = 'EditorContent EditorContentError';
 const Main = 'Main';
 const EDITOR_GROUPS_CONTAINER = 'editor-groups-container';
 const TabIcon = 'TabIcon';
@@ -3765,14 +3804,29 @@ 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 Retry = 'Retry';
 
+const splitRight$1 = () => {
+  return i18nString(SplitRight);
+};
 const splitEditorGroup = () => {
   return i18nString(SplitEditorGroup);
 };
@@ -3788,8 +3842,8 @@ const closeOthers = () => {
 const closeAll = () => {
   return i18nString(CloseAll);
 };
-const revealInExplorer = () => {
-  return i18nString(RevealInExplorer);
+const closeSaved = () => {
+  return i18nString(CloseSaved);
 };
 const closeToTheRight = () => {
   return i18nString(CloseToTheRight);
@@ -3803,9 +3857,42 @@ 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);
 };
+const retry = () => {
+  return i18nString(Retry);
+};
 
 const menuEntrySeparator = {
   command: '',
@@ -3852,18 +3939,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,
@@ -3875,6 +3961,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',
@@ -3937,6 +4079,10 @@ const renderCss = (oldState, newState) => {
   return [SetCss, newState.uid, css];
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const text = data => {
   return {
     childCount: 0,
@@ -4264,14 +4410,17 @@ const renderError = errorMessage => {
     childCount: 2,
     className: EditorContentError,
     type: Div
+  }, {
+    childCount: 1,
+    type: P
   }, text(`Error: ${errorMessage}`), {
     childCount: 1,
-    className: `${Button} ${ButtonSecondary}`,
+    className: mergeClassNames(Button, ButtonSecondary),
     'data-action': RetryOpen,
     name: RetryOpen,
     onClick: HandleClickAction,
     type: Button$2
-  }, text('Retry')];
+  }, text(retry())];
 };
 
 const renderLoading = () => {
@@ -4431,9 +4580,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
@@ -4517,14 +4666,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
   }];
 };
 
@@ -4562,7 +4716,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 [{
@@ -4794,6 +4949,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.15.0",
+  "version": "8.17.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",