From 4655cd1f17ab5d8579c17b9347a55d08d51f5f82 Mon Sep 17 00:00:00 2001
From: Pranav Sriram <psriram37@gmail.com>
Date: Sat, 3 Sep 2022 11:53:10 +0530
Subject: [PATCH] fix: Added seperate shortcut keys for Windows and Mac and
 modified the code used for assigning shortcuts based on condition feat :
 Split 'inlineMenuShortcuts' to 'WinInlineMenuShortcuts' and
 'MacInlineMenuShortcuts' functions Fix #346

---
 .../editor-plugins/src/menu/inline-menu/config.ts        | 9 ++++++++-
 .../src/menu/inline-menu/menu-item/DropdownItem.tsx      | 6 ++++--
 .../src/menu/inline-menu/menu-item/IconItem.tsx          | 5 +++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/libs/components/editor-plugins/src/menu/inline-menu/config.ts b/libs/components/editor-plugins/src/menu/inline-menu/config.ts
index 8cad7e7a9a..99c7ed1757 100644
--- a/libs/components/editor-plugins/src/menu/inline-menu/config.ts
+++ b/libs/components/editor-plugins/src/menu/inline-menu/config.ts
@@ -12,13 +12,20 @@ export const INLINE_MENU_UI_TYPES = {
 } as const;
 
 /** inline menu item { key : display-name } */
-export const inlineMenuShortcuts = {
+export const MacInlineMenuShortcuts = {
     textBold: '⌘+B',
     textItalic: '⌘+I',
     textStrikethrough: '⌘+S',
     link: '⌘+K',
     [Protocol.Block.Type.code]: '⌘+E',
 };
+export const WinInlineMenuShortcuts = {
+    textBold: 'Ctrl+B',
+    textItalic: 'Ctrl+I',
+    textStrikethrough: 'Ctrl+S',
+    link: 'Ctrl+K',
+    [Protocol.Block.Type.code]: 'Ctrl+E',
+};
 export const inlineMenuNames = {
     currentText: 'TEXT SIZE',
     [Protocol.Block.Type.heading1]: 'Heading 1',
diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx
index 80df07e413..a8de5a36e0 100644
--- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx
+++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx
@@ -12,10 +12,12 @@ import {
 } from '@toeverything/components/common';
 import { ArrowDropDownIcon } from '@toeverything/components/icons';
 import type { DropdownItemType, WithEditorSelectionType } from '../types';
+import { uaHelper } from '@toeverything/utils';
 import {
     inlineMenuNamesKeys,
     inlineMenuNamesForFontColor,
-    inlineMenuShortcuts,
+    MacInlineMenuShortcuts,
+    WinInlineMenuShortcuts
 } from '../config';
 
 type MenuDropdownItemProps = DropdownItemType & WithEditorSelectionType;
@@ -37,7 +39,7 @@ export const MenuDropdownItem = ({
     }, []);
 
     //@ts-ignore
-    const shortcut = inlineMenuShortcuts[nameKey];
+    const shortcut = uaHelper.isMacOs ? MacInlineMenuShortcuts[nameKey] : WinInlineMenuShortcuts[nameKey];
 
     return (
         <>
diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx
index 5e97b4f746..5ded472e7d 100644
--- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx
+++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx
@@ -2,8 +2,9 @@ import React, { useCallback } from 'react';
 import style9 from 'style9';
 
 import type { IconItemType, WithEditorSelectionType } from '../types';
-import { inlineMenuNamesKeys, inlineMenuShortcuts } from '../config';
+import { inlineMenuNamesKeys, MacInlineMenuShortcuts, WinInlineMenuShortcuts } from '../config';
 import { Tooltip } from '@toeverything/components/ui';
+import { uaHelper } from '@toeverything/utils';
 type MenuIconItemProps = IconItemType & WithEditorSelectionType;
 
 export const MenuIconItem = ({
@@ -35,7 +36,7 @@ export const MenuIconItem = ({
     );
 
     //@ts-ignore
-    const shortcut = inlineMenuShortcuts[nameKey];
+    const shortcut = uaHelper.isMacOs ? MacInlineMenuShortcuts[nameKey] : WinInlineMenuShortcuts[nameKey];
 
     return (
         <Tooltip