@lvce-editor/main-area-worker 8.19.0 → 8.21.0

package/dist/mainAreaWorkerMain.js

@@ -245,6 +245,36 @@ const closeAll$1 = state => {
   return withEmptyGroups(state);
 };
 
+const redistributeSizesWithRemainder = groups => {
+  const baseSize = Math.floor(100 / groups.length);
+  const remainder = 100 % groups.length;
+  return groups.map((group, index) => ({
+    ...group,
+    size: baseSize + (index === groups.length - 1 ? remainder : 0)
+  }));
+};
+
+const closeEditorGroup$1 = (state, groupId) => {
+  if (Number.isNaN(groupId)) {
+    return state;
+  }
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const groupIndex = getGroupIndexById(state, groupId);
+  if (groupIndex === -1 || groups.length <= 1) {
+    return state;
+  }
+  const remainingGroups = groups.filter(group => group.id !== groupId);
+  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
+  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
+  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
+};
+
 const isFocused = group => {
   return group.focused;
 };
@@ -592,16 +622,28 @@ const create$e = rpcId => {
   };
 };
 
-const Button$2 = 'event.button';
+const None$1 = 'none';
+
+const Button$2 = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const P = 50;
+const Pre = 51;
+const Reference = 100;
+
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const EventTargetClassName = 'event.target.className';
 const TargetName = 'event.target.name';
 
 const Tab = 13;
+const Main$1 = 24;
 
 const Separator = 1;
-const None$1 = 0;
+const None = 0;
 
 const ClipBoardWorker = 3400;
 const ExtensionHostWorker = 44;
@@ -1267,7 +1309,7 @@ const focusPreviousTab = async state => {
 };
 
 const getMenuIds = () => {
-  return [Tab];
+  return [Main$1, Tab];
 };
 
 const handleClick = async (state, name) => {
@@ -1277,36 +1319,6 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const redistributeSizesWithRemainder = groups => {
-  const baseSize = Math.floor(100 / groups.length);
-  const remainder = 100 % groups.length;
-  return groups.map((group, index) => ({
-    ...group,
-    size: baseSize + (index === groups.length - 1 ? remainder : 0)
-  }));
-};
-
-const closeEditorGroup$1 = (state, groupId) => {
-  if (Number.isNaN(groupId)) {
-    return state;
-  }
-  const {
-    layout
-  } = state;
-  const {
-    activeGroupId,
-    groups
-  } = layout;
-  const groupIndex = getGroupIndexById(state, groupId);
-  if (groupIndex === -1 || groups.length <= 1) {
-    return state;
-  }
-  const remainingGroups = groups.filter(group => group.id !== groupId);
-  const redistributedGroups = redistributeSizesWithRemainder(remainingGroups);
-  const newActiveGroupId = activeGroupId === groupId ? remainingGroups[0].id : activeGroupId;
-  return withGroupsAndActiveGroup(state, redistributedGroups, newActiveGroupId);
-};
-
 const getActiveGroup = (groups, activeGroupId) => {
   return groups.find(g => g.id === activeGroupId);
 };
@@ -1669,16 +1681,10 @@ const getFileIconsForTabs = async (tabs, fileIconCache) => {
 };
 
 const getOptionUriOptions = options => {
-  let uri = '';
   if (typeof options === 'string') {
-    uri = options;
-  } else {
-    const {
-      uri: optionsUri
-    } = options;
-    uri = optionsUri;
+    return options;
   }
-  return uri;
+  return options.uri;
 };
 
 const getViewletModuleId = async uri => {
@@ -2042,12 +2048,34 @@ const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
   return selectTab(state, groupIndex, index);
 };
 
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const handleContextMenu = async (state, rawGroupId, x, y) => {
+  number(x);
+  number(y);
+  if (!rawGroupId) {
+    return state;
+  }
+  const groupId = Number.parseInt(rawGroupId, 10);
+  if (Number.isNaN(groupId)) {
+    return state;
+  }
+  await show2(state.uid, Main$1, x, y, {
+    groupId,
+    menuId: Main$1
+  });
+  return state;
+};
+
 const handleDoubleClick = async state => {
   // TODO: implement handleDoubleClick
   return state;
 };
 
 const EditorGroupHeader = 'EditorGroupHeader';
+const EmptyGroupHeader = 'EmptyGroupHeader';
 const EmptyGroupCloseButton = 'EmptyGroupCloseButton';
 const EditorGroup = 'EditorGroup';
 const EditorGroupsHorizontal = 'EditorGroupsHorizontal';
@@ -2068,7 +2096,7 @@ const Main = 'Main';
 const EDITOR_GROUPS_CONTAINER = 'editor-groups-container';
 const TabIcon = 'TabIcon';
 const TabTitle = 'TabTitle';
-const Button$1 = 'Button';
+const Button = 'Button';
 const ButtonSecondary = 'ButtonSecondary';
 const EditorContent = 'EditorContent';
 const EditorTabCloseButton = 'EditorTabCloseButton';
@@ -2401,10 +2429,6 @@ const handleSashPointerUp = async state => {
   };
 };
 
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
 const handleTabContextMenu = async (state, button, x, y) => {
   number(x);
   number(y);
@@ -3800,16 +3824,6 @@ const loadContent = async (state, savedState) => {
   };
 };
 
-const findGroupById = (state, groupId) => {
-  const {
-    layout
-  } = state;
-  const {
-    groups
-  } = layout;
-  return groups.find(group => group.id === groupId);
-};
-
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -3841,17 +3855,37 @@ const Pin = 'Pin';
 const SplitAndMove = 'Split & Move';
 const MoveIntoNewWindow = 'Move into New Window';
 const CopyIntoNewWindow = 'Copy into New Window';
+const NewWindow = 'New Window';
+const OpenFile = 'Open File';
+const SplitDown = 'Split Down';
 const SplitEditorGroup = 'Split Editor Group';
+const SplitLeft = 'Split Left';
 const SplitRight = 'Split Right';
+const SplitUp = 'Split Up';
 const TogglePreview = 'Toggle Preview';
 const Retry = 'Retry';
 
+const openFile = () => {
+  return i18nString(OpenFile);
+};
+const splitUp$1 = () => {
+  return i18nString(SplitUp);
+};
+const splitDown$1 = () => {
+  return i18nString(SplitDown);
+};
+const splitLeft$1 = () => {
+  return i18nString(SplitLeft);
+};
 const splitRight$1 = () => {
   return i18nString(SplitRight);
 };
 const splitEditorGroup = () => {
   return i18nString(SplitEditorGroup);
 };
+const newWindow = () => {
+  return i18nString(NewWindow);
+};
 const close = () => {
   return i18nString(Close);
 };
@@ -3923,6 +3957,74 @@ const menuEntrySeparator = {
   label: ''
 };
 
+const QuickPick = 'QuickPick';
+
+const getArgs = groupId => {
+  if (groupId === undefined) {
+    return undefined;
+  }
+  return [groupId];
+};
+const getMenuEntries$2 = groupId => {
+  const groupArgs = getArgs(groupId);
+  const entries = [{
+    args: [QuickPick, 'file'],
+    command: 'Viewlet.openWidget',
+    flags: None,
+    id: 'openFile',
+    label: openFile()
+  }, menuEntrySeparator, {
+    args: groupArgs,
+    command: 'MainArea.splitUp',
+    flags: None,
+    id: 'splitUp',
+    label: splitUp$1()
+  }, {
+    args: groupArgs,
+    command: 'MainArea.splitDown',
+    flags: None,
+    id: 'splitDown',
+    label: splitDown$1()
+  }, {
+    args: groupArgs,
+    command: 'MainArea.splitLeft',
+    flags: None,
+    id: 'splitLeft',
+    label: splitLeft$1()
+  }, {
+    args: groupArgs,
+    command: 'MainArea.splitRight',
+    flags: None,
+    id: 'splitRight',
+    label: splitRight$1()
+  }, menuEntrySeparator, {
+    command: 'Main.newWindow',
+    flags: None,
+    id: 'newWindow',
+    label: newWindow()
+  }];
+  if (groupId === undefined) {
+    return entries;
+  }
+  return [...entries, menuEntrySeparator, {
+    args: [groupId],
+    command: 'MainArea.closeEditorGroup',
+    flags: None,
+    id: 'closeGroup',
+    label: closeEditorGroup()
+  }];
+};
+
+const findGroupById = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  return groups.find(group => group.id === groupId);
+};
+
 // TODO should pass tab uri as argument or tab index
 const getMenuEntries$1 = state => {
   const {
@@ -3948,101 +4050,101 @@ const getMenuEntries$1 = state => {
   } = tab;
   return [{
     command: 'Main.closeFocusedTab',
-    flags: None$1,
+    flags: None,
     id: 'tabClose',
     label: close()
   }, {
     command: 'Main.closeOthers',
-    flags: None$1,
+    flags: None,
     id: 'tabCloseOthers',
     label: closeOthers()
   }, {
     command: 'Main.closeTabsRight',
-    flags: None$1,
+    flags: None,
     id: 'tabCloseToTheRight',
     label: closeToTheRight()
   }, {
     command: 'Main.closeSaved',
-    flags: None$1,
+    flags: None,
     id: 'tabCloseSaved',
     label: closeSaved()
   }, {
     command: 'Main.closeAll',
-    flags: None$1,
+    flags: None,
     id: 'tabCloseAll',
     label: closeAll()
   }, menuEntrySeparator, {
     args: [path],
     command: 'Main.copyPath',
-    flags: None$1,
+    flags: None,
     id: 'copyPath',
     label: copyPath()
   }, {
     args: [path],
     command: 'Main.copyRelativePath',
-    flags: None$1,
+    flags: None,
     id: 'copyRelativePath',
     label: copyRelativePath()
   }, menuEntrySeparator, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'reopenEditorWith',
     label: reopenEditorWith()
   }, menuEntrySeparator, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'share',
     label: share()
   }, menuEntrySeparator, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'addFileToChat',
     label: addFileToChat()
   }, menuEntrySeparator, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'openContainingFolder',
     label: openContainingFolder()
   }, {
     args: [path],
     command: 'Explorer.revealItem',
-    flags: None$1,
+    flags: None,
     id: 'revealInExplorerView',
     label: revealInExplorerView()
   }, menuEntrySeparator, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'keepOpen',
     label: keepOpen()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'pin',
     label: pin()
   }, menuEntrySeparator, {
     command: 'Main.splitRight',
-    flags: None$1,
+    flags: None,
     id: 'splitRight',
     label: splitRight$1()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'splitAndMove',
     label: splitAndMove()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'moveIntoNewWindow',
     label: moveIntoNewWindow()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: 'copyIntoNewWindow',
     label: copyIntoNewWindow()
   }, menuEntrySeparator, {
     args: [/* id */'References', /* focus */true, path],
     command: 'SideBar.show',
-    flags: None$1,
+    flags: None,
     id: 'findFileReferences',
     label: findFileReferences()
   }];
@@ -4050,6 +4152,8 @@ const getMenuEntries$1 = state => {
 
 const getMenuEntries = async (state, props) => {
   switch (props.menuId) {
+    case Main$1:
+      return getMenuEntries$2(props.groupId);
     case Tab:
       return getMenuEntries$1(state);
     default:
@@ -4101,17 +4205,6 @@ const renderCss = (oldState, newState) => {
   return [SetCss, newState.uid, css];
 };
 
-const None = 'none';
-
-const Button = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const P = 50;
-const Pre = 51;
-const Reference = 100;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -4424,6 +4517,7 @@ const renderContent = content => {
   }, text(content)];
 };
 
+const HandleContextMenu = 2;
 const HandleClickAction = 10;
 const HandleClick = 11;
 const HandleClickClose = 12;
@@ -4448,11 +4542,11 @@ const renderError = errorMessage => {
     type: P
   }, text(`Error: ${errorMessage}`), {
     childCount: 1,
-    className: mergeClassNames(Button$1, ButtonSecondary),
+    className: mergeClassNames(Button, ButtonSecondary),
     'data-action': RetryOpen,
     name: RetryOpen,
     onClick: HandleClickAction,
-    type: Button
+    type: Button$2
   }, text(retry())];
 };
 
@@ -4525,7 +4619,7 @@ const renderTabActions = (isDirty, tabIndex, groupIndex) => {
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickClose,
-    type: Button
+    type: Button$2
   }, {
     childCount: 0,
     className: MaskIconClose,
@@ -4559,7 +4653,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   }, {
     childCount: 0,
     className: TabIcon,
-    role: None,
+    role: None$1,
     src: tab.icon,
     type: Img
   }, {
@@ -4602,7 +4696,7 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
       name: TogglePreview$1,
       onClick: HandleClickAction,
       title: togglePreview(),
-      type: Button
+      type: Button$2
     }, {
       childCount: 0,
       className: MaskIconPreview,
@@ -4618,7 +4712,7 @@ const renderEditorGroupActions = (group, groupIndex, splitButtonEnabled) => {
       name: SplitRight$1,
       onClick: HandleClickAction,
       title: splitEditorGroup(),
-      type: Button
+      type: Button$2
     }, text('split'));
   }
   return [{
@@ -4638,31 +4732,37 @@ const renderEditorGroupHeader = (group, groupIndex, splitButtonEnabled) => {
     childCount: hasActions ? 2 : 1,
     className: EditorGroupHeader,
     onDblClick: HandleHeaderDoubleClick,
-    role: None,
+    role: None$1,
     type: Div
   }, ...getTabsVirtualDom(group, groupIndex, tabsChildCount), ...actions];
 };
 
 const renderEmptyGroupCloseButton = (group, groupIndex) => {
   return [{
+    childCount: 1,
+    className: EmptyGroupHeader,
+    type: Div
+  }, {
     childCount: 1,
     className: EmptyGroupCloseButton,
     'data-groupId': String(group.id),
     name: CloseGroup,
     onClick: HandleClickAction,
     title: closeEditorGroup(),
-    type: Button
+    type: Button$2
   }, text('✕')];
 };
 
-const renderWaterMark = () => {
+const renderWaterMark = groupId => {
   return [{
     childCount: 1,
     className: 'WaterMarkWrapper',
+    'data-groupId': String(groupId),
     type: Div
   }, {
     childCount: 0,
     className: 'WaterMark',
+    'data-groupId': String(groupId),
     type: Div
   }];
 };
@@ -4671,9 +4771,12 @@ const renderEmptyEditorGroup = (group, groupIndex, style) => {
   return [{
     childCount: 2,
     className: EditorGroup,
+    'data-groupId': String(group.id),
+    onContextMenu: HandleContextMenu,
     style,
+    tabIndex: 0,
     type: Div
-  }, ...renderEmptyGroupCloseButton(group), ...renderWaterMark()];
+  }, ...renderEmptyGroupCloseButton(group), ...renderWaterMark(group.id)];
 };
 
 const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, sizeProperty = 'width') => {
@@ -4706,8 +4809,9 @@ const renderSash = (direction, sashId, style) => {
     className: getSashClassName(direction),
     'data-sashId': sashId,
     onPointerDown: HandleSashPointerDown,
+    role: 'none',
     style,
-    type: Div
+    type: Button$2
   }, {
     childCount: 0,
     className: 'SashBorder',
@@ -4760,7 +4864,7 @@ const getMainAreaVirtualDom = (layout, splitButtonEnabled = false) => {
   }, {
     childCount,
     className: editorGroupsContainerClassName,
-    role: None,
+    role: None$1,
     type: Div
   }, ...children];
 };
@@ -4831,9 +4935,13 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickTab,
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', 'event.target.dataset.groupId', ClientX, ClientY],
+    preventDefault: true
   }, {
     name: HandleTabContextMenu,
-    params: ['handleTabContextMenu', Button$2, ClientX, ClientY],
+    params: ['handleTabContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleClickAction,
@@ -4942,6 +5050,38 @@ const splitDown = (state, groupId) => {
   return splitEditorGroup$1(state, resolvedGroupId, 'down');
 };
 
+const splitLeft = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  if (groups.length === 0) {
+    const initialGroupId = create$c();
+    const initialGroup = {
+      activeTabId: undefined,
+      focused: true,
+      id: initialGroupId,
+      isEmpty: true,
+      size: 100,
+      tabs: []
+    };
+    const stateWithInitialGroup = {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: initialGroupId,
+        groups: [initialGroup]
+      }
+    };
+    return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, Left);
+  }
+  const targetGroupId = groupId ?? activeGroupId ?? groups[0]?.id ?? 0;
+  return splitEditorGroup$1(state, targetGroupId, Left);
+};
+
 const splitRight = (state, groupId) => {
   const {
     layout
@@ -4976,10 +5116,45 @@ const splitRight = (state, groupId) => {
   return splitEditorGroup$1(state, targetGroupId, Right);
 };
 
+const splitUp = (state, groupId) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  if (groups.length === 0) {
+    const initialGroupId = create$c();
+    const initialGroup = {
+      activeTabId: undefined,
+      focused: true,
+      id: initialGroupId,
+      isEmpty: true,
+      size: 100,
+      tabs: []
+    };
+    const stateWithInitialGroup = {
+      ...state,
+      layout: {
+        ...layout,
+        activeGroupId: initialGroupId,
+        groups: [initialGroup]
+      }
+    };
+    return splitEditorGroup$1(stateWithInitialGroup, initialGroupId, 'up');
+  }
+  const resolvedGroupId = groupId ?? state.layout.activeGroupId;
+  if (!resolvedGroupId) {
+    return state;
+  }
+  return splitEditorGroup$1(state, resolvedGroupId, 'up');
+};
+
 const commandMap = {
   'MainArea.closeActiveEditor': wrapCommand(closeActiveEditor),
   'MainArea.closeAll': wrapCommand(closeAll$1),
   'MainArea.closeAllEditors': wrapCommand(closeAll$1),
+  'MainArea.closeEditorGroup': wrapCommand(closeEditorGroup$1),
   'MainArea.closeFocusedTab': wrapCommand(closeFocusedTab),
   'MainArea.closeOthers': wrapCommand(closeOtherTabs),
   'MainArea.closeSaved': wrapCommand(closeSaved$1),
@@ -5000,6 +5175,7 @@ const commandMap = {
   'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
   'MainArea.handleClickTab': wrapCommand(handleClickTab),
   'MainArea.handleClickTogglePreview': wrapCommand(handleClickTogglePreview),
+  'MainArea.handleContextMenu': wrapCommand(handleContextMenu),
   'MainArea.handleDoubleClick': wrapCommand(handleDoubleClick),
   'MainArea.handleHeaderDoubleClick': wrapCommand(handleHeaderDoubleClick),
   'MainArea.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
@@ -5024,7 +5200,9 @@ const commandMap = {
   'MainArea.saveState': wrapGetter(saveState),
   'MainArea.selectTab': wrapCommand(selectTab),
   'MainArea.splitDown': wrapCommand(splitDown),
+  'MainArea.splitLeft': wrapCommand(splitLeft),
   'MainArea.splitRight': wrapCommand(splitRight),
+  'MainArea.splitUp': wrapCommand(splitUp),
   'MainArea.terminate': terminate
 };
 

package/package.json

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