@lvce-editor/activity-bar-worker 1.27.0 → 1.29.0

package/dist/activityBarWorkerMain.js

@@ -838,7 +838,7 @@ const WebWorkerRpcClient = {
 };
 
 const Button$2 = 'button';
-const None = 'none';
+const None$1 = 'none';
 const Tab$1 = 'tab';
 const ToolBar = 'toolbar';
 
@@ -862,6 +862,11 @@ const ActivityBar$3 = 1;
 const Settings$1 = 12;
 const ActivityBarAdditionalViews = 17;
 
+const Separator = 1;
+const None = 0;
+const Checked = 2;
+const Unchecked = 3;
+
 const LeftClick = 0;
 
 const RendererWorker = 1;
@@ -908,9 +913,6 @@ const create$2 = rpcId => {
 const {
   invoke,
   set: set$1} = create$2(RendererWorker);
-const showContextMenu = async (x, y, id, ...args) => {
-  return invoke('ContextMenu.show', x, y, id, ...args);
-};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1026,7 +1028,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     updateState: '',
     updateProgress: 0,
     filteredItems: [],
-    numberOfVisibleItems: 0
+    numberOfVisibleItems: 0,
+    sideBarLocation: 0
   };
   set(id, state, state);
   return state;
@@ -1137,6 +1140,237 @@ const getKeyBindings = () => {
   }];
 };
 
+const Tab = 1;
+const Button = 1 << 1;
+const Progress = 1 << 2;
+const Enabled = 1 << 3;
+const Selected = 1 << 4;
+const Focused = 1 << 5;
+const MarginTop = 1 << 6;
+
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const Explorer$1 = 'Explorer';
+const Search$2 = 'Search';
+const SourceControl$2 = 'Source Control';
+const RunAndDebug$1 = 'Run and Debug';
+const Extensions$2 = 'Extensions';
+const Settings = 'Settings';
+const AdditionalViews = 'Additional Views';
+const ActivityBar$2 = 'Activity Bar';
+const MoveSideBarLeft = 'Move Side Bar Left';
+const MoveSideBarRight = 'Move Side Bar Right';
+const HideActivityBar = 'Hide Activity Bar';
+
+const explorer = () => {
+  return i18nString(Explorer$1);
+};
+const search = () => {
+  return i18nString(Search$2);
+};
+const sourceControl = () => {
+  return i18nString(SourceControl$2);
+};
+const runAndDebug = () => {
+  return i18nString(RunAndDebug$1);
+};
+const extensions = () => {
+  return i18nString(Extensions$2);
+};
+const settings$1 = () => {
+  return i18nString(Settings);
+};
+const additionalViews = () => {
+  return i18nString(AdditionalViews);
+};
+const activityBar = () => {
+  return i18nString(ActivityBar$2);
+};
+const moveSideBarRight = () => {
+  return i18nString(MoveSideBarRight);
+};
+const moveSideBarLeft = () => {
+  return i18nString(MoveSideBarLeft);
+};
+const hideActivityBar = () => {
+  return i18nString(HideActivityBar);
+};
+
+const Left = 1;
+const Right = 2;
+
+const menuEntryMoveSideBar = sideBarLocation => {
+  switch (sideBarLocation) {
+    case Left:
+      return {
+        id: 'moveSideBarRight',
+        label: moveSideBarRight(),
+        flags: None,
+        command: 'Layout.moveSideBarRight'
+      };
+    case Right:
+      return {
+        id: 'moveSideBarLeft',
+        label: moveSideBarLeft(),
+        flags: None,
+        command: 'Layout.moveSideBarLeft'
+      };
+    default:
+      throw new Error('unexpected side bar location');
+  }
+};
+
+const menuEntrySeparator = {
+  id: 'separator',
+  label: '',
+  flags: Separator,
+  command: ''
+};
+
+const toContextMenuItem$1 = activityBarItem => {
+  const isEnabled = activityBarItem.flags & Enabled;
+  return {
+    label: activityBarItem.id,
+    id: '',
+    // TODO
+    flags: isEnabled ? Checked : Unchecked,
+    command: ''
+  };
+};
+const getMenuEntriesActivityBar = state => {
+  const {
+    activityBarItems,
+    sideBarLocation
+  } = state;
+  return [...activityBarItems.map(toContextMenuItem$1), menuEntrySeparator, menuEntryMoveSideBar(sideBarLocation), {
+    id: 'hideActivityBar',
+    label: hideActivityBar(),
+    flags: None,
+    command: 'Layout.hideActivityBar'
+  }];
+};
+
+const getNumberOfVisibleItems = state => {
+  const {
+    height,
+    itemHeight
+  } = state;
+  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
+  return numberOfVisibleItemsTop;
+};
+const getHiddenItems = state => {
+  const numberOfVisibleItems = getNumberOfVisibleItems(state);
+  const items = state.activityBarItems;
+  if (numberOfVisibleItems >= items.length) {
+    return [];
+  }
+  return state.activityBarItems.slice(numberOfVisibleItems - 2, -1);
+};
+
+const toContextMenuItem = activityBarItem => {
+  return {
+    label: activityBarItem.id,
+    id: '8000',
+    // TODO
+    flags: None,
+    command: '-1' // TODO
+  };
+};
+const getMenuEntriesAdditionalViews = state => {
+  const hiddenActivityBarItems = getHiddenItems(state);
+  return hiddenActivityBarItems.map(toContextMenuItem);
+};
+
+/**
+ * @enum {string}
+ */
+const UiStrings = {
+  CheckForUpdates: 'Check For Updates',
+  ColorTheme: 'Color Theme',
+  CommandPalette: 'Command Palette',
+  KeyboardShortcuts: 'Keyboard Shortcuts',
+  Settings: 'Settings'};
+const checkForUpdates = () => {
+  return i18nString(UiStrings.CheckForUpdates);
+};
+const commandPalette = () => {
+  return i18nString(UiStrings.CommandPalette);
+};
+const settings = () => {
+  return i18nString(UiStrings.Settings);
+};
+const keyboardShortcuts = () => {
+  return i18nString(UiStrings.KeyboardShortcuts);
+};
+const colorTheme = () => {
+  return i18nString(UiStrings.ColorTheme);
+};
+
+const keyBindingsUri = 'app://keybindings';
+const getMenuEntriesSettings = () => {
+  return [{
+    id: 'commandPalette',
+    label: commandPalette(),
+    flags: None,
+    command: 'QuickPick.showEverything'
+  }, menuEntrySeparator, {
+    id: 'settings',
+    label: settings(),
+    flags: None,
+    command: 'Preferences.openSettingsJson'
+  }, {
+    id: 'keyboardShortcuts',
+    label: keyboardShortcuts(),
+    flags: None,
+    command: 'Main.openUri',
+    args: [keyBindingsUri]
+  }, {
+    id: 'colorTheme',
+    label: colorTheme(),
+    flags: None,
+    command: 'QuickPick.showColorTheme'
+  }, menuEntrySeparator, {
+    id: 'checkForUpdates',
+    label: checkForUpdates(),
+    flags: None,
+    command: /* TODO */'-1'
+  }];
+};
+
+const getMenuEntries = id => {
+  const tuple = get(id);
+  if (!tuple) {
+    return [];
+  }
+  const {
+    newState
+  } = tuple;
+  switch (id) {
+    case ActivityBar$3:
+      return getMenuEntriesActivityBar(newState);
+    case ActivityBarAdditionalViews:
+      return getMenuEntriesAdditionalViews(newState);
+    case Settings$1:
+      return getMenuEntriesSettings();
+    default:
+      return [];
+  }
+};
+
+const getMenuEntryIds = () => {
+  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1];
+};
+
 const handleBlur = state => {
   return {
     ...state,
@@ -1144,21 +1378,48 @@ const handleBlur = state => {
   };
 };
 
-const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount) => {
+const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height) => {
+  if (itemCount === 0) {
+    return -1;
+  }
+  // If there's only one item, treat it as a top item (not Settings at bottom)
+  if (itemCount === 1) {
+    const relativeY = eventY - y;
+    const index = Math.floor(relativeY / itemHeight);
+    if (index < 0 || index >= itemCount) {
+      return -1;
+    }
+    return index;
+  }
+  // Settings is always at the bottom (last item) when there are multiple items
+  const settingsBottomY = y + height;
+  const settingsTopY = settingsBottomY - itemHeight;
+  // Check if click is in the Settings area (bottom)
+  if (eventY >= settingsTopY && eventY < settingsBottomY) {
+    return itemCount - 1;
+  }
+  // Otherwise, calculate index from top items
   const relativeY = eventY - y;
   const index = Math.floor(relativeY / itemHeight);
-  if (index < 0 || index >= itemCount) {
+  if (index < 0 || index >= itemCount - 1) {
     return -1;
   }
   return index;
 };
 
-const show$1 = async (x, y, id, ...args) => {
-  await showContextMenu(x, y, id, args);
+const show2 = async (uid, menuId, x, y, args) => {
+  // @ts-ignore
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
 
-const handleClickAdditionalViews = async (state, x, y, viewletId) => {
-  await show$1(x, y, ActivityBarAdditionalViews);
+const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ActivityBarAdditionalViews, eventX, eventY, {
+    menuId: ActivityBarAdditionalViews,
+    viewletId
+  });
   return state;
 };
 
@@ -1191,8 +1452,13 @@ const handleClickOther = async (state, x, y, viewletId) => {
   return state;
 };
 
-const handleClickSettings = async (state, x, y, viewletId) => {
-  await show$1(x, y, Settings$1);
+const handleClickSettings = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, Settings$1, eventX, eventY, {
+    menuId: Settings$1
+  });
   return state;
 };
 
@@ -1212,7 +1478,7 @@ const handleClickIndex = async (state, button, index, x, y) => {
     case 'Settings':
       return handleClickSettings(state, x, y);
     case 'Additional Views':
-      return handleClickAdditionalViews(state, x, y);
+      return handleClickAdditionalViews(state, x, y, viewletId);
     default:
       return handleClickOther(state, x, y, viewletId);
   }
@@ -1222,71 +1488,23 @@ const handleClick = async (state, button, eventX, eventY) => {
   const {
     filteredItems,
     itemHeight,
-    y
+    y,
+    height
   } = state;
-  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length);
+  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length, height);
   return handleClickIndex(state, button, index, eventX, eventY);
 };
 
-const handleContextMenu = async (state, button, x, y) => {
-  await show$1(x, y, ActivityBar$3);
+const handleContextMenu = async (state, button, eventX, eventY) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ActivityBar$3, eventX, eventY, {
+    menuId: ActivityBar$3
+  });
   return state;
 };
 
-const Tab = 1;
-const Button = 1 << 1;
-const Progress = 1 << 2;
-const Enabled = 1 << 3;
-const Selected = 1 << 4;
-const Focused = 1 << 5;
-const MarginTop = 1 << 6;
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-const Explorer$1 = 'Explorer';
-const Search$2 = 'Search';
-const SourceControl$2 = 'Source Control';
-const RunAndDebug$1 = 'Run and Debug';
-const Extensions$2 = 'Extensions';
-const Settings = 'Settings';
-const AdditionalViews = 'Additional Views';
-const ActivityBar$2 = 'Activity Bar';
-
-const explorer = () => {
-  return i18nString(Explorer$1);
-};
-const search = () => {
-  return i18nString(Search$2);
-};
-const sourceControl = () => {
-  return i18nString(SourceControl$2);
-};
-const runAndDebug = () => {
-  return i18nString(RunAndDebug$1);
-};
-const extensions = () => {
-  return i18nString(Extensions$2);
-};
-const settings = () => {
-  return i18nString(Settings);
-};
-const additionalViews = () => {
-  return i18nString(AdditionalViews);
-};
-const activityBar = () => {
-  return i18nString(ActivityBar$2);
-};
-
 const DebugAlt2 = 'DebugAlt2';
 const Extensions$1 = 'Extensions';
 const Files = 'Files';
@@ -1295,15 +1513,6 @@ const SettingsGear = 'SettingsGear';
 const SourceControl$1 = 'SourceControl';
 const Ellipsis = 'Ellipsis';
 
-const getNumberOfVisibleItems = state => {
-  const {
-    height,
-    itemHeight
-  } = state;
-  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
-  return numberOfVisibleItemsTop;
-};
-
 const getFilteredActivityBarItems = (items, height, itemHeight) => {
   const numberOfVisibleItems = getNumberOfVisibleItems({
     height,
@@ -1481,7 +1690,7 @@ const getActivityBarItems = () => {
   // Bottom
   {
     id: 'Settings',
-    title: settings(),
+    title: settings$1(),
     icon: SettingsGear,
     flags: Button | Enabled | MarginTop,
     keyShortcuts: ''
@@ -1503,6 +1712,7 @@ const loadContent = async (state, savedState) => {
     currentViewletId: Explorer,
     filteredItems,
     selectedIndex: explorerIndex,
+    sideBarLocation: Left,
     sideBarVisible: true
   };
 };
@@ -1626,7 +1836,7 @@ const getActivityBarItemInProgressDom = item => {
   }, {
     type: Div,
     className: mergeClassNames(Icon, `MaskIcon${icon}`),
-    role: None,
+    role: None$1,
     childCount: 0
   }, ...getBadgeVirtualDom()];
 };
@@ -1661,7 +1871,7 @@ const getActivityBarItemWithBadgeDom = item => {
   }, {
     type: Div,
     className: mergeClassNames(Icon, `MaskIcon${icon}`),
-    role: None,
+    role: None$1,
     childCount: 0
   }, {
     type: Div,
@@ -1674,7 +1884,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None,
+    role: None$1,
     childCount: 0
   };
 };
@@ -1843,21 +2053,23 @@ const commandMap = {
   'ActivityBar.focusFirst': wrapCommand(focusFirst),
   'ActivityBar.focusIndex': wrapCommand(focusIndex),
   'ActivityBar.focusLast': wrapCommand(focusLast),
-  'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
   'ActivityBar.focusNext': wrapCommand(focusNext),
   'ActivityBar.focusNone': wrapCommand(focusNone),
   'ActivityBar.getCommandIds': getCommandIds,
   'ActivityBar.getKeyBindings': getKeyBindings,
+  'ActivityBar.getMenuEntries': getMenuEntries,
+  'ActivityBar.getMenuEntryIds': getMenuEntryIds,
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
-  'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.handleSideBarHidden': wrapCommand(handleSideBarHidden),
   'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
+  'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
   'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,
   'ActivityBar.renderEventListeners': renderEventListeners,
+  'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
   'ActivityBar.terminate': terminate,
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "1.27.0",
+  "version": "1.29.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",