MacOS shortcut for links in editor3 (#4346)

superdesk · Oct 24, 2023 · f8f965e · f8f965e
1 parent 392bf99
commit f8f965e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/scripts/core/editor3/components/Editor3Component.tsx b/scripts/core/editor3/components/Editor3Component.tsx
@@ -39,6 +39,7 @@ import {handleBeforeInputHighlights} from '../helpers/handleBeforeInputHighlight
 import {CharacterLimitUiBehavior} from 'apps/authoring/authoring/components/CharacterCountConfigButton';
 import {Editor3Autocomplete} from './Editor3Autocomplete';
 import {querySelectorParent} from 'core/helpers/dom/querySelectorParent';
+import {isMacOS} from 'core/utils';
 
 const MEDIA_TYPES_TRIGGER_DROP_ZONE = [
     'application/superdesk.item.picture',
@@ -278,12 +279,13 @@ export class Editor3Component extends React.Component<IProps, IState> {
     }
 
     keyBindingFn(e) {
-        const {key, shiftKey, ctrlKey} = e;
+        const {key, shiftKey, ctrlKey, metaKey} = e;
         const selectionState = this.props.editorState.getSelection();
+        const modifierKey = isMacOS() ? metaKey : ctrlKey;
 
         if (
             key === 'k'
-            && ctrlKey
+            && modifierKey
             && this.props.editorFormat.includes('link')
             && selectionState.isCollapsed() !== true
         ) {

diff --git a/scripts/core/editor3/components/links/LinkInput.tsx b/scripts/core/editor3/components/links/LinkInput.tsx
@@ -167,6 +167,11 @@ export class LinkInputComponent extends React.Component<any, any> {
             >
                 <div style={{padding: '3.2rem 1.6rem'}}>
                     <input
+                        onKeyDown={(e) => {
+                            if (e.key === 'Enter') {
+                                this.onSubmit(linkTypes.href);
+                            }
+                        }}
                         type="url"
                         ref={(el) => {
                             this.inputElement = el;

diff --git a/scripts/core/utils.ts b/scripts/core/utils.ts
@@ -4,6 +4,17 @@ import {IVocabularyItem, IArticle} from 'superdesk-api';
 import {assertNever} from './helpers/typescript-helpers';
 import {appConfig} from 'appConfig';
 
+export function isMacOS() {
+    if (
+        navigator.userAgent.toLowerCase().includes('macintosh')
+        || navigator.userAgent.toLowerCase().includes('mac os')
+    ) {
+        return true;
+    }
+
+    return false;
+}
+
 export type IScopeApply = (fn: () => void) => void;
 
 export const i18n = gettextjs();