@lvce-editor/title-bar-worker 3.0.0 → 3.2.0

package/dist/titleBarWorkerMain.js

@@ -1278,10 +1278,11 @@ const create$1 = () => {
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
+          oldState,
           newState
         } = states[uid];
         const newerState = await fn(newState, ...args);
-        if (newState === newerState) {
+        if (oldState === newerState || newState === newerState) {
           return;
         }
         const latest = states[uid];
@@ -1400,6 +1401,27 @@ const Selection$1 = 'Selection';
 const Terminal$1 = 'Terminal';
 const ToggleDeveloperTools = 'Toggle Developer Tools';
 const View$1 = 'View';
+const AddCursorAbove = 'Add Cursor Above';
+const AddCursorBelow = 'Add Cursor Below';
+const AddCursorsToLineEnds = 'Add Cursors to Line ends';
+const AddNextOccurrence = 'Add Next Occurrence';
+const AddPreviousOccurrence = 'Add Previous Occurrence';
+const Copy = 'Copy';
+const CopyLineDown = 'Copy Line Down';
+const CopyLineUp = 'Copy Line Up';
+const Cut = 'Cut';
+const DuplicateSelection = 'Duplicate Selection';
+const ExpandSelection = 'Expand Selection';
+const MoveLineDown = 'Move Line Down';
+const MoveLineUp = 'Move Line Up';
+const Paste = 'Paste';
+const Redo = 'Redo';
+const SelectAll = 'Select All';
+const SelectAllOccurrences = 'Select All Occurrences';
+const ShrinkSelection = 'Shrink Selection';
+const ToggleBlockComment = 'Toggle Block Comment';
+const ToggleLineComment = 'Toggle Line Comment';
+const Undo = 'Undo';
 
 const file = () => {
   return i18nString(File$2);
@@ -1678,58 +1700,68 @@ const getMenuIds = () => {
   return [Edit$2, File$3, Go$2, Help$2, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
-/**
- * @enum {string}
- */
-const UiStrings$1 = {
-  Copy: 'Copy',
-  CopyLineDown: 'Copy Line Down',
-  CopyLineUp: 'Copy Line Up',
-  Cut: 'Cut',
-  MoveLineDown: 'Move Line Down',
-  MoveLineUp: 'Move Line Up',
-  Paste: 'Paste',
-  Redo: 'Redo',
-  SelectAll: 'Select All',
-  ToggleBlockComment: 'Toggle Block Comment',
-  ToggleLineComment: 'Toggle Line Comment',
-  Undo: 'Undo'
-};
 const cut = () => {
-  return i18nString(UiStrings$1.Cut);
+  return i18nString(Cut);
 };
 const copy = () => {
-  return i18nString(UiStrings$1.Copy);
+  return i18nString(Copy);
 };
 const paste = () => {
-  return i18nString(UiStrings$1.Paste);
+  return i18nString(Paste);
 };
 const undo = () => {
-  return i18nString(UiStrings$1.Undo);
+  return i18nString(Undo);
 };
 const redo = () => {
-  return i18nString(UiStrings$1.Redo);
+  return i18nString(Redo);
 };
 const toggleLineComment = () => {
-  return i18nString(UiStrings$1.ToggleLineComment);
+  return i18nString(ToggleLineComment);
 };
 const toggleBlockComment = () => {
-  return i18nString(UiStrings$1.ToggleBlockComment);
+  return i18nString(ToggleBlockComment);
 };
 const selectAll = () => {
-  return i18nString(UiStrings$1.SelectAll);
+  return i18nString(SelectAll);
+};
+const expandSelection = () => {
+  return i18nString(ExpandSelection);
+};
+const shrinkSelection = () => {
+  return i18nString(ShrinkSelection);
 };
 const copyLineUp = () => {
-  return i18nString(UiStrings$1.CopyLineUp);
+  return i18nString(CopyLineUp);
 };
 const copyLineDown = () => {
-  return i18nString(UiStrings$1.CopyLineDown);
+  return i18nString(CopyLineDown);
 };
 const moveLineUp = () => {
-  return i18nString(UiStrings$1.MoveLineUp);
+  return i18nString(MoveLineUp);
 };
 const moveLineDown = () => {
-  return i18nString(UiStrings$1.MoveLineDown);
+  return i18nString(MoveLineDown);
+};
+const duplicateSelection = () => {
+  return i18nString(DuplicateSelection);
+};
+const addCursorAbove = () => {
+  return i18nString(AddCursorAbove);
+};
+const addCursorBelow = () => {
+  return i18nString(AddCursorBelow);
+};
+const addCursorsToLineEnds = () => {
+  return i18nString(AddCursorsToLineEnds);
+};
+const addNextOccurrence = () => {
+  return i18nString(AddNextOccurrence);
+};
+const addPreviousOccurrence = () => {
+  return i18nString(AddPreviousOccurrence);
+};
+const selectAllOccurrences = () => {
+  return i18nString(SelectAllOccurrences);
 };
 
 const menuEntrySeparator = {
@@ -2003,6 +2035,16 @@ const getMenuEntries$6 = () => {
     id: 'selectAll',
     label: selectAll()
   }, {
+    command: 'Editor.expandSelection',
+    flags: None,
+    id: 'expandSelection',
+    label: expandSelection()
+  }, {
+    command: 'Editor.shrinkSelection',
+    flags: None,
+    id: 'shrinkSelection',
+    label: shrinkSelection()
+  }, menuEntrySeparator, {
     command: 'Editor.copyLineUp',
     flags: None,
     id: 'copyLineUp',
@@ -2022,6 +2064,41 @@ const getMenuEntries$6 = () => {
     flags: Disabled,
     id: 'moveLineDown',
     label: moveLineDown()
+  }, {
+    command: 'Editor.duplicateSelection',
+    flags: Disabled,
+    id: 'duplicateSelection',
+    label: duplicateSelection()
+  }, menuEntrySeparator, {
+    command: 'Editor.addCursorAbove',
+    flags: Disabled,
+    id: 'addCursorAbove',
+    label: addCursorAbove()
+  }, {
+    command: 'Editor.addCursorBelow',
+    flags: Disabled,
+    id: 'addCursorBelow',
+    label: addCursorBelow()
+  }, {
+    command: 'Editor.addCursorsToLineEnds',
+    flags: Disabled,
+    id: 'addCursorsToLineEnds',
+    label: addCursorsToLineEnds()
+  }, {
+    command: 'Editor.addNextOccurrence',
+    flags: Disabled,
+    id: 'addNextOccurrence',
+    label: addNextOccurrence()
+  }, {
+    command: 'Editor.addPreviousOccurrence',
+    flags: Disabled,
+    id: 'addPreviousOccurrence',
+    label: addPreviousOccurrence()
+  }, {
+    command: 'Editor.selectAllOccurrences',
+    flags: Disabled,
+    id: 'selectAllOccurrences',
+    label: selectAllOccurrences()
   }];
 };
 
@@ -2531,42 +2608,6 @@ const getMenuEntries$1 = async platform => {
   return fn();
 };
 
-const getFn = id => {
-  switch (id) {
-    case Edit$2:
-      return getMenuEntries$c;
-    case File$3:
-      return getMenuEntries$b;
-    case Go$2:
-      return getMenuEntries$a;
-    case Help$2:
-      return getMenuEntries$9;
-    case OpenRecent$1:
-      return getMenuEntries$8;
-    case Run$2:
-      return getMenuEntries$7;
-    case Selection$2:
-      return getMenuEntries$6;
-    case Terminal$2:
-      return getMenuEntries$5;
-    case TitleBar:
-      return getMenuEntries$1;
-    case View$2:
-      return getMenuEntries$4;
-    default:
-      return undefined;
-  }
-};
-const getMenuEntries = async (id, ...args) => {
-  try {
-    const fn = getFn(id);
-    // @ts-ignore
-    return fn(...args);
-  } catch (error) {
-    throw new VError(error, `Failed to load menu entries for id ${id}`);
-  }
-};
-
 const loadContent2 = async state => {
   const {
     controlsOverlayEnabled,
@@ -2578,7 +2619,7 @@ const loadContent2 = async state => {
     platform,
     titleBarStyleCustom
   } = state;
-  const titleBarEntries = await getMenuEntries(TitleBar);
+  const titleBarEntries = await getMenuEntries$1(platform);
   const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const workspaceUri = await invoke('Workspace.getUri');
@@ -2885,7 +2926,10 @@ const createTitleBarButton = button => {
   return dom;
 };
 
-const getTitleBarButtonsVirtualDom = buttons => {
+const getTitleBarButtonsVirtualDom = (buttonsEnabled, buttons) => {
+  if (!buttonsEnabled) {
+    return [];
+  }
   return [{
     childCount: buttons.length,
     className: mergeClassNames(Viewlet, TitleBarButtons),
@@ -2898,7 +2942,10 @@ const parentNode$1 = {
   className: mergeClassNames(Viewlet, TitleBarIcon),
   type: Div
 };
-const getTitleBarIconVirtualDom = iconSrc => {
+const getTitleBarIconVirtualDom = (titleBarIconEnabled, iconSrc) => {
+  if (!titleBarIconEnabled) {
+    return [];
+  }
   return [parentNode$1, {
     alt: '',
     childCount: 0,
@@ -2928,34 +2975,27 @@ const getItemVirtualDom = item => {
     keyboardShortCut,
     label
   } = item;
-  // TODO avoid mutation
-  const dom = [{
+  let className = TitleBarTopLevelEntry;
+  if (isFocused) {
+    className += ' ' + TitleBarEntryActive;
+  }
+  return [{
     ariaExpanded: isOpen,
     ariaHasPopup: true,
     ariaKeyShortcuts: keyboardShortCut,
+    ariaOwns: isOpen ? 'Menu-0' : undefined,
     childCount: 1,
-    className: TitleBarTopLevelEntry,
+    className,
+    id: isFocused ? 'TitleBarEntryActive' : undefined,
     name: label,
     // TODO have separate name attribute
     role: MenuItem$1,
     type: Button$1
-  }];
-  if (isOpen) {
-    // @ts-ignore
-    dom[0].ariaOwns = 'Menu-0';
-  }
-  if (isFocused) {
-    dom[0].className += ' ' + TitleBarEntryActive;
-    // @ts-ignore
-    dom[0].id = 'TitleBarEntryActive';
-    dom.push({
-      childCount: 1,
-      className: TitleBarTopLevelEntryLabel,
-      type: Div
-    });
-  }
-  dom.push(text(label));
-  return dom;
+  }, ...(isFocused ? [{
+    childCount: 1,
+    className: TitleBarTopLevelEntryLabel,
+    type: Div
+  }] : []), text(label)];
 };
 const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
   const dom = visibleItems.flatMap(getItemVirtualDom);
@@ -2963,7 +3003,10 @@ const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
 };
 
 const activeId = 'TitleBarEntryActive';
-const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
+const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex) => {
+  if (!menuBarEnabled) {
+    return [];
+  }
   return [{
     ariaActivedescendant: focusedIndex === -1 ? '' : activeId,
     childCount: visibleItems.length,
@@ -2984,7 +3027,10 @@ const parentNode = {
   className: 'TitleBarTitle',
   type: Div
 };
-const getTitleVirtualDom = title => {
+const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
+  if (!titleBarTitleEnabled) {
+    return [];
+  }
   return [parentNode, text(title)];
 };
 
@@ -3035,44 +3081,24 @@ const getTitleBarVirtualDom = state => {
     isMenuOpen,
     title,
     titleBarButtons,
+    titleBarButtonsEnabled,
     titleBarEntries,
+    titleBarIconEnabled,
+    titleBarMenuBarEnabled,
+    titleBarTitleEnabled,
     width
   } = state;
-  const dom = [{
+  const iconSrc = getIcon(assetDir);
+  const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
+  return [{
     ariaLabel: 'Title Bar',
+    // TODO i18n string
     childCount: 4,
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
     role: ContentInfo,
     type: Div
-  }];
-
-  // Add icon if enabled
-  if (state.titleBarIconEnabled) {
-    const iconSrc = getIcon(assetDir);
-    const iconDom = getTitleBarIconVirtualDom(iconSrc);
-    dom.push(...iconDom);
-  }
-
-  // Add menu bar if enabled
-  if (state.titleBarMenuBarEnabled) {
-    const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
-    const menuBarDom = getTitleBarMenuBarVirtualDom(visibleEntries, focusedIndex);
-    dom.push(...menuBarDom);
-  }
-
-  // Add title if enabled
-  if (state.titleBarTitleEnabled) {
-    const titleDom = getTitleVirtualDom(title);
-    dom.push(...titleDom);
-  }
-
-  // Add buttons if enabled
-  if (state.titleBarButtonsEnabled) {
-    const buttonsDom = getTitleBarButtonsVirtualDom(titleBarButtons);
-    dom.push(...buttonsDom);
-  }
-  return dom;
+  }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getTitleVirtualDom(titleBarTitleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
 };
 
 const renderTitleBar = (oldState, newState) => {
@@ -3356,6 +3382,9 @@ const handleKeyArrowDownMenuOpen = state => {
     menus
   } = state;
   const menu = menus.at(-1);
+  if (!menu) {
+    return state;
+  }
   const newFocusedIndex = getIndexToFocusNext(menu);
   const newMenus = [...menus.slice(0, -1), {
     ...menu,
@@ -3379,6 +3408,9 @@ const closeOneMenu = state => {
     menus
   } = state;
   const parentMenu = menus.at(-2);
+  if (!parentMenu) {
+    return state;
+  }
   const newParentMenu = {
     ...parentMenu,
     expanded: false
@@ -3402,6 +3434,42 @@ const handleKeyArrowLeftMenuOpen = async state => {
 
 const handleKeyArrowLeft = ifElse(handleKeyArrowLeftMenuOpen, handleKeyArrowLeftMenuClosed);
 
+const getFn = id => {
+  switch (id) {
+    case Edit$2:
+      return getMenuEntries$c;
+    case File$3:
+      return getMenuEntries$b;
+    case Go$2:
+      return getMenuEntries$a;
+    case Help$2:
+      return getMenuEntries$9;
+    case OpenRecent$1:
+      return getMenuEntries$8;
+    case Run$2:
+      return getMenuEntries$7;
+    case Selection$2:
+      return getMenuEntries$6;
+    case Terminal$2:
+      return getMenuEntries$5;
+    case TitleBar:
+      return getMenuEntries$1;
+    case View$2:
+      return getMenuEntries$4;
+    default:
+      return undefined;
+  }
+};
+const getMenuEntries = async (id, ...args) => {
+  try {
+    const fn = getFn(id);
+    // @ts-ignore
+    return fn(...args);
+  } catch (error) {
+    throw new VError(error, `Failed to load menu entries for id ${id}`);
+  }
+};
+
 // TODO menu should not be needed initially, only when item is selected and menu is opened
 const handleKeyArrowRightMenuOpen = async state => {
   const {
@@ -3409,6 +3477,9 @@ const handleKeyArrowRightMenuOpen = async state => {
   } = state;
   // if menu can open sub menu to the right -> do that
   const menu = menus.at(-1);
+  if (!menu) {
+    return state;
+  }
   const {
     focusedIndex,
     items,
@@ -3620,14 +3691,11 @@ const handleMenuClick = async (state, level, index) => {
   }
 };
 
-const handleMenuMouseOver = async (state, level, index) => {
-  object(state);
-  number(level);
-  number(index);
-  const {
-    menus
-  } = state;
+const getNewMenus = async (menus, level, index, flags) => {
   const menu = menus[level];
+  if (!menu) {
+    return menus;
+  }
   const {
     focusedIndex,
     items,
@@ -3637,7 +3705,7 @@ const handleMenuMouseOver = async (state, level, index) => {
   const item = items[index];
   if (focusedIndex === index) {
     if (index === -1) {
-      return state;
+      return menus;
     }
     if (item.flags === SubMenu && level === menus.length - 2) {
       const subMenu = menus[level + 1];
@@ -3647,23 +3715,17 @@ const handleMenuMouseOver = async (state, level, index) => {
           focusedIndex: -1
         };
         const newMenus = [...menus.slice(0, -1), newSubMenu];
-        return {
-          ...state,
-          menus: newMenus
-        };
+        return newMenus;
       }
     }
-    return state;
+    return menus;
   }
   if (index === -1) {
     const newMenus = [...menus.slice(0, level), {
       ...menu,
       focusedIndex: -1
     }];
-    return {
-      ...state,
-      menus: newMenus
-    };
+    return newMenus;
   }
   if (item.flags === SubMenu) {
     const item = items[index];
@@ -3680,15 +3742,36 @@ const handleMenuMouseOver = async (state, level, index) => {
       focusedIndex: index
     };
     const newMenus = [...menus.slice(0, level - 1), newParentMenu, subMenu];
-    return {
-      ...state,
-      menus: newMenus
-    };
+    return newMenus;
   }
   const newMenus = [...menus.slice(0, level), {
     ...menu,
     focusedIndex: index
   }];
+  return newMenus;
+};
+const handleMenuMouseOver = async (state, level, index) => {
+  object(state);
+  number(level);
+  number(index);
+  const {
+    menus
+  } = state;
+  const menu = menus[level];
+  if (!menu) {
+    return state;
+  }
+  const {
+    items
+  } = menu;
+  const item = items[index];
+  if (!item) {
+    return state;
+  }
+  const newMenus = await getNewMenus(menus, level, index);
+  if (menus === newMenus) {
+    return state;
+  }
   return {
     ...state,
     menus: newMenus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",