isMetaKey -> isModKey
This commit is contained in:
parent
70626ffff0
commit
6e9c456147
|
@ -8,7 +8,7 @@ import UiStore from "stores/UiStore";
|
||||||
import ErrorBoundary from "components/ErrorBoundary";
|
import ErrorBoundary from "components/ErrorBoundary";
|
||||||
import Tooltip from "components/Tooltip";
|
import Tooltip from "components/Tooltip";
|
||||||
import embeds from "../embeds";
|
import embeds from "../embeds";
|
||||||
import { isMetaKey } from "utils/keyboard";
|
import { isModKey } from "utils/keyboard";
|
||||||
import { uploadFile } from "utils/uploadFile";
|
import { uploadFile } from "utils/uploadFile";
|
||||||
import { isInternalUrl } from "utils/urls";
|
import { isInternalUrl } from "utils/urls";
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ function Editor(props: PropsWithRef) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isInternalUrl(href) && !isMetaKey(event) && !event.shiftKey) {
|
if (isInternalUrl(href) && !isModKey(event) && !event.shiftKey) {
|
||||||
// relative
|
// relative
|
||||||
let navigateTo = href;
|
let navigateTo = href;
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ import Editor from "components/Editor";
|
||||||
import Flex from "components/Flex";
|
import Flex from "components/Flex";
|
||||||
import HoverPreview from "components/HoverPreview";
|
import HoverPreview from "components/HoverPreview";
|
||||||
import Star, { AnimatedStar } from "components/Star";
|
import Star, { AnimatedStar } from "components/Star";
|
||||||
import { isMetaKey } from "utils/keyboard";
|
import { isModKey } from "utils/keyboard";
|
||||||
import { documentHistoryUrl } from "utils/routeHelpers";
|
import { documentHistoryUrl } from "utils/routeHelpers";
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
|
@ -55,7 +55,7 @@ class DocumentEditor extends React.Component<Props> {
|
||||||
handleTitleKeyDown = (event: SyntheticKeyboardEvent<>) => {
|
handleTitleKeyDown = (event: SyntheticKeyboardEvent<>) => {
|
||||||
if (event.key === "Enter") {
|
if (event.key === "Enter") {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (isMetaKey(event)) {
|
if (isModKey(event)) {
|
||||||
this.props.onSave({ done: true });
|
this.props.onSave({ done: true });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -69,12 +69,12 @@ class DocumentEditor extends React.Component<Props> {
|
||||||
this.focusAtStart();
|
this.focusAtStart();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event.key === "p" && isMetaKey(event) && event.shiftKey) {
|
if (event.key === "p" && isModKey(event) && event.shiftKey) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
this.props.onSave({ publish: true, done: true });
|
this.props.onSave({ publish: true, done: true });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event.key === "s" && isMetaKey(event)) {
|
if (event.key === "s" && isModKey(event)) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
this.props.onSave({});
|
this.props.onSave({});
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -5,7 +5,7 @@ export const metaDisplay = isMac ? "⌘" : "Ctrl";
|
||||||
|
|
||||||
export const meta = isMac ? "cmd" : "ctrl";
|
export const meta = isMac ? "cmd" : "ctrl";
|
||||||
|
|
||||||
export function isMetaKey(
|
export function isModKey(
|
||||||
event: KeyboardEvent | MouseEvent | SyntheticKeyboardEvent<>
|
event: KeyboardEvent | MouseEvent | SyntheticKeyboardEvent<>
|
||||||
) {
|
) {
|
||||||
return isMac ? event.metaKey : event.ctrlKey;
|
return isMac ? event.metaKey : event.ctrlKey;
|
||||||
|
|
Reference in New Issue