isMetaKey -> isModKey

This commit is contained in:
Tom Moor 2021-01-21 07:28:10 -08:00
parent 70626ffff0
commit 6e9c456147
3 changed files with 7 additions and 7 deletions

View File

@ -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;

View File

@ -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<Props> {
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<Props> {
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;

View File

@ -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;