From 82162e50217cae4fcb5c130d5cd587126a51d30d Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 29 Oct 2021 09:43:20 -0400 Subject: [PATCH] Only listen to CMD+f for on macOS (#4175) --- src/renderer/components/input/search-input.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/renderer/components/input/search-input.tsx b/src/renderer/components/input/search-input.tsx index 21ba82e493..1f29bc0dae 100644 --- a/src/renderer/components/input/search-input.tsx +++ b/src/renderer/components/input/search-input.tsx @@ -26,6 +26,7 @@ import { observer } from "mobx-react"; import { boundMethod, cssNames } from "../../utils"; import { Icon } from "../icon"; import { Input, InputProps } from "./input"; +import { isMac } from "../../../common/vars"; interface Props extends InputProps { compact?: boolean; // show only search-icon when not focused @@ -38,9 +39,7 @@ const defaultProps: Partial = { autoFocus: true, bindGlobalFocusHotkey: true, showClearIcon: true, - get placeholder() { - return `Search...`; - }, + placeholder: "Search...", }; @observer @@ -60,9 +59,7 @@ export class SearchInput extends React.Component { @boundMethod onGlobalKey(evt: KeyboardEvent) { - const meta = evt.metaKey || evt.ctrlKey; - - if (meta && evt.key === "f") { + if (evt.key === "f" && (isMac ? evt.metaKey : evt.ctrlKey)) { this.inputRef.current.focus(); } }