@lvce-editor/title-bar-worker 4.15.3 → 4.15.5

package/dist/titleBarWorkerMain.js

@@ -2195,6 +2195,7 @@ const Unchecked = 3;
 const Disabled = 5;
 const RestoreFocus = 6;
 const Ignore = 7;
+const RestoreEditorFocus = 8;
 
 const getMenuEntriesTitleBarContextMenu = async state => {
   const {
@@ -2367,37 +2368,37 @@ const selectAllOccurrences = () => {
 const getMenuEntries$d = () => {
   return [{
     command: 'Editor.undo',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'undo',
     label: undo()
   }, {
     command: 'Editor.redo',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'redo',
     label: redo()
   }, menuEntrySeparator, {
     command: /* Editor.cut */'Editor.cut',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'cut',
     label: cut()
   }, {
     command: /* Editor.copy */'Editor.copy',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'copy',
     label: copy()
   }, {
     command: /* Editor.paste */'Editor.paste',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'paste',
     label: paste()
   }, menuEntrySeparator, {
     command: /* Editor.toggleLineComment */'Editor.toggleLineComment',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'toggle-line-comment',
     label: toggleLineComment()
   }, {
     command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'toggle-block-comment',
     label: toggleBlockComment()
   }];
@@ -2706,7 +2707,7 @@ const getMenuEntries$9 = async platform => {
   }
   entries.push({
     command: 'License.openLicense',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'viewLicense',
     label: viewLicense()
   });
@@ -2834,72 +2835,72 @@ const getMenuEntries$7 = () => {
 const getMenuEntries$6 = () => {
   return [{
     command: 'Editor.selectAll',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'selectAll',
     label: selectAll()
   }, {
     command: 'Editor.expandSelection',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'expandSelection',
     label: expandSelection()
   }, {
     command: 'Editor.shrinkSelection',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'shrinkSelection',
     label: shrinkSelection()
   }, menuEntrySeparator, {
     command: 'Editor.copyLineUp',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'copyLineUp',
     label: copyLineUp()
   }, {
     command: 'Editor.copyLineDown',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'copyLineDown',
     label: copyLineDown()
   }, {
     command: 'Editor.moveLineUp',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'moveLineUp',
     label: moveLineUp()
   }, {
     command: 'Editor.moveLineDown',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'moveLineDown',
     label: moveLineDown()
   }, {
     command: 'Editor.duplicateSelection',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'duplicateSelection',
     label: duplicateSelection()
   }, menuEntrySeparator, {
     command: 'Editor.addCursorAbove',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'addCursorAbove',
     label: addCursorAbove()
   }, {
     command: 'Editor.addCursorBelow',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'addCursorBelow',
     label: addCursorBelow()
   }, {
     command: 'Editor.addCursorsToLineEnds',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'addCursorsToLineEnds',
     label: addCursorsToLineEnds()
   }, {
     command: 'Editor.addNextOccurrence',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'addNextOccurrence',
     label: addNextOccurrence()
   }, {
     command: 'Editor.addPreviousOccurrence',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'addPreviousOccurrence',
     label: addPreviousOccurrence()
   }, {
     command: 'Editor.selectAllOccurrences',
-    flags: None,
+    flags: RestoreEditorFocus,
     id: 'selectAllOccurrences',
     label: selectAllOccurrences()
   }];
@@ -3347,6 +3348,10 @@ const getKeyBindings = () => {
     command: 'TitleBar.handleKeyArrowLeft',
     key: LeftArrow$1,
     when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyEnter',
+    key: Enter$1,
+    when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeySpace',
     key: Space$1,
@@ -4259,6 +4264,7 @@ const getMenuItemRenderer = flags => {
       return getMenuItemDisabledDom;
     case Ignore:
     case None:
+    case RestoreEditorFocus:
     case RestoreFocus:
       return getMenuItemDefaultDom;
     case Separator$1:
@@ -5076,6 +5082,21 @@ const selectIndexNone = async (state, item) => {
   };
 };
 
+const selectIndexRestoreEditorFocus = async (state, item) => {
+  await executeMenuItemCommand(item);
+  try {
+    await invoke('Main.focus');
+  } catch {
+    // Focus restoration is best effort and must not turn a successful command into a failure.
+  }
+  return {
+    ...state,
+    focusedIndex: -1,
+    isMenuOpen: false,
+    menus: []
+  };
+};
+
 const selectIndexRestoreFocus = async (state, item) => {
   await executeMenuItemCommand(item);
   const latestState = get(state.uid)?.newState ?? state;
@@ -5137,6 +5158,8 @@ const handleMenuClick = async (state, level, index) => {
       return selectIndexIgnore(state, item);
     case None:
       return selectIndexNone(state, item);
+    case RestoreEditorFocus:
+      return selectIndexRestoreEditorFocus(state, item);
     case RestoreFocus:
       return selectIndexRestoreFocus(state, item);
     case SubMenu$1:

package/package.json

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