Allow the 10th service to also be accessible via keyboard shortcut combo

4 files changed, 21 insertions, 15 deletions

diff --git a/src/components/services/tabs/TabItem.tsx b/src/components/services/tabs/TabItem.tsx
index 289597db9..c883066ce 100644
--- a/src/components/services/tabs/TabItem.tsx
+++ b/src/components/services/tabs/TabItem.tsx
@@ -15,6 +15,7 @@ import globalMessages from '../../../i18n/globalMessages';
 import Icon from '../../ui/icon';
 import { Stores } from '../../../@types/stores.types';
 import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions;
+import { acceleratorString } from '../../../jsUtils';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -358,11 +359,10 @@ class TabItem extends Component<IProps, IState> {
         onKeyDown={noop}
         role="presentation"
         onContextMenu={() => menu.popup()}
-        data-tip={`${service.name} ${
-          shortcutIndex <= 9
-            ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})`
-            : ''
-        }`}
+        data-tip={`${service.name} ${acceleratorString(
+          shortcutIndex,
+          cmdOrCtrlShortcutKey(false),
+        )}`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />
         {showServiceNameSetting && (
@@ -407,8 +407,8 @@ class TabItem extends Component<IProps, IState> {
             />
           </>
         )}
-        {shortcutIndex <= 9 && this.state.showShortcutIndex && (
-          <span className="tab-item__shortcut-index">{shortcutIndex}</span>
+        {shortcutIndex <= 10 && this.state.showShortcutIndex && (
+          <span className="tab-item__shortcut-index">{shortcutIndex % 10}</span>
         )}
       </li>
     );
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.tsx b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
index 74ca2797d..cf8c3b2ba 100644
--- a/src/features/workspaces/components/WorkspaceDrawerItem.tsx
+++ b/src/features/workspaces/components/WorkspaceDrawerItem.tsx
@@ -7,6 +7,7 @@ import { noop } from 'lodash';
 import { Menu } from '@electron/remote';
 import { MenuItemConstructorOptions } from 'electron';
 import { altKey, cmdOrCtrlShortcutKey } from '../../../environment';
+import { acceleratorString } from '../../../jsUtils';
 
 const messages = defineMessages({
   noServicesAddedYet: {
@@ -118,13 +119,10 @@ class WorkspaceDrawerItem extends Component<IProps> {
           }
         }}
         onKeyDown={noop}
-        data-tip={`${
-          shortcutIndex <= 9
-            ? `(${cmdOrCtrlShortcutKey(false)}+${altKey(
-                false,
-              )}+${shortcutIndex})`
-            : ''
-        }`}
+        data-tip={acceleratorString(
+          shortcutIndex,
+          `${cmdOrCtrlShortcutKey(false)}+${altKey(false)}`,
+        )}
       >
         <span
           className={classnames([
diff --git a/src/jsUtils.ts b/src/jsUtils.ts
index 47473a538..ac7258644 100644
--- a/src/jsUtils.ts
+++ b/src/jsUtils.ts
@@ -23,3 +23,10 @@ export const safeParseInt = (text: string | number | undefined | null) => {
   const adjustedNumber = Number.isNaN(parsedNumber) ? 0 : parsedNumber;
   return Math.max(adjustedNumber, 0);
 };
+
+export const acceleratorString = (
+  index: number,
+  keyCombo: string,
+  prefix: string = '(',
+  suffix: string = ')',
+) => (index <= 10 ? `${prefix}${keyCombo}+${index % 10}${suffix}` : undefined);
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 936785b9b..d611d5f3e 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -47,6 +47,7 @@ import { timestamp, gitHashShort, gitBranch } from '../buildInfo.json';
 import Service from '../models/Service';
 import { StoresProps } from '../@types/ferdium-components.types';
 import { RealStores } from '../stores';
+import { acceleratorString } from '../jsUtils';
 
 const menuItems = defineMessages({
   edit: {
@@ -1101,7 +1102,7 @@ class FranzMenu implements StoresProps {
     for (const [i, service] of services.allDisplayed.entries()) {
       menu.push({
         label: this._getServiceName(service),
-        accelerator: i < 9 ? `${cmdOrCtrlShortcutKey()}+${i + 1}` : undefined,
+        accelerator: acceleratorString(i + 1, cmdOrCtrlShortcutKey(), '', ''),
         type: 'radio',
         checked: service.isActive,
         click: () => {