From 6e9c456147a85f803128dd72d622cafa23124bc3 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 21 Jan 2021 07:28:10 -0800 Subject: [PATCH] isMetaKey -> isModKey --- app/components/Editor.js | 4 ++-- app/scenes/Document/components/Editor.js | 8 ++++---- app/utils/keyboard.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/components/Editor.js b/app/components/Editor.js index 378d41bd..82e2dc82 100644 --- a/app/components/Editor.js +++ b/app/components/Editor.js @@ -8,7 +8,7 @@ import UiStore from "stores/UiStore"; import ErrorBoundary from "components/ErrorBoundary"; import Tooltip from "components/Tooltip"; import embeds from "../embeds"; -import { isMetaKey } from "utils/keyboard"; +import { isModKey } from "utils/keyboard"; import { uploadFile } from "utils/uploadFile"; import { isInternalUrl } from "utils/urls"; @@ -50,7 +50,7 @@ function Editor(props: PropsWithRef) { return; } - if (isInternalUrl(href) && !isMetaKey(event) && !event.shiftKey) { + if (isInternalUrl(href) && !isModKey(event) && !event.shiftKey) { // relative let navigateTo = href; diff --git a/app/scenes/Document/components/Editor.js b/app/scenes/Document/components/Editor.js index b8081055..35403ee9 100644 --- a/app/scenes/Document/components/Editor.js +++ b/app/scenes/Document/components/Editor.js @@ -13,7 +13,7 @@ import Editor from "components/Editor"; import Flex from "components/Flex"; import HoverPreview from "components/HoverPreview"; import Star, { AnimatedStar } from "components/Star"; -import { isMetaKey } from "utils/keyboard"; +import { isModKey } from "utils/keyboard"; import { documentHistoryUrl } from "utils/routeHelpers"; type Props = { @@ -55,7 +55,7 @@ class DocumentEditor extends React.Component { handleTitleKeyDown = (event: SyntheticKeyboardEvent<>) => { if (event.key === "Enter") { event.preventDefault(); - if (isMetaKey(event)) { + if (isModKey(event)) { this.props.onSave({ done: true }); return; } @@ -69,12 +69,12 @@ class DocumentEditor extends React.Component { this.focusAtStart(); return; } - if (event.key === "p" && isMetaKey(event) && event.shiftKey) { + if (event.key === "p" && isModKey(event) && event.shiftKey) { event.preventDefault(); this.props.onSave({ publish: true, done: true }); return; } - if (event.key === "s" && isMetaKey(event)) { + if (event.key === "s" && isModKey(event)) { event.preventDefault(); this.props.onSave({}); return; diff --git a/app/utils/keyboard.js b/app/utils/keyboard.js index ff4b3b98..09e8f1c0 100644 --- a/app/utils/keyboard.js +++ b/app/utils/keyboard.js @@ -5,7 +5,7 @@ export const metaDisplay = isMac ? "⌘" : "Ctrl"; export const meta = isMac ? "cmd" : "ctrl"; -export function isMetaKey( +export function isModKey( event: KeyboardEvent | MouseEvent | SyntheticKeyboardEvent<> ) { return isMac ? event.metaKey : event.ctrlKey;