From 8f018a2eee027896174d000744bbda2aa537da4f Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 27 Jun 2021 18:11:53 -0700 Subject: [PATCH] types, self contained --- app/components/ContextMenu/Template.js | 46 ++------------ app/components/Layout.js | 15 +---- app/components/QuickMenu/index.js | 26 ++++---- app/hooks/useQuickMenu.js | 7 --- app/menus/AccountMenu.js | 85 +++++++++++++++++--------- app/menus/CollectionMenu.js | 2 +- app/stores/QuickMenuStore.js | 3 +- app/types/index.js | 40 ++++++++++++ 8 files changed, 118 insertions(+), 106 deletions(-) delete mode 100644 app/hooks/useQuickMenu.js diff --git a/app/components/ContextMenu/Template.js b/app/components/ContextMenu/Template.js index 440e0a28f6..d300a037a0 100644 --- a/app/components/ContextMenu/Template.js +++ b/app/components/ContextMenu/Template.js @@ -12,50 +12,12 @@ import styled from "styled-components"; import MenuItem, { MenuAnchor } from "./MenuItem"; import Separator from "./Separator"; import ContextMenu from "."; +import { type MenuItem as TMenuItem } from "types"; -type TMenuItem = - | {| - title: React.Node, - to: string, - visible?: boolean, - selected?: boolean, - disabled?: boolean, - |} - | {| - title: React.Node, - onClick: (event: SyntheticEvent<>) => void | Promise, - visible?: boolean, - selected?: boolean, - disabled?: boolean, - |} - | {| - title: React.Node, - href: string, - visible?: boolean, - selected?: boolean, - disabled?: boolean, - |} - | {| - title: React.Node, - visible?: boolean, - disabled?: boolean, - style?: Object, - hover?: boolean, - items: TMenuItem[], - |} - | {| - type: "separator", - visible?: boolean, - |} - | {| - type: "heading", - visible?: boolean, - title: React.Node, - |}; - -type Props = { +type Props = {| items: TMenuItem[], -}; + hide?: Function, +|}; const Disclosure = styled(ExpandedIcon)` transform: rotate(270deg); diff --git a/app/components/Layout.js b/app/components/Layout.js index ba31c8511e..e1ded2e5ed 100644 --- a/app/components/Layout.js +++ b/app/components/Layout.js @@ -58,7 +58,6 @@ class Layout extends React.Component { scrollable: ?HTMLDivElement; @observable redirectTo: ?string; @observable keyboardShortcutsOpen: boolean = false; - @observable quickMenuOpen: boolean = false; componentDidUpdate() { if (this.redirectTo) { @@ -80,15 +79,6 @@ class Layout extends React.Component { this.keyboardShortcutsOpen = false; }; - @keydown(`${meta}+k`) - toggleQuickMenu() { - this.quickMenuOpen = !this.quickMenuOpen; - } - - closeQuickMenu = () => { - this.quickMenuOpen = false; - }; - @keydown(["t", "/"]) goToSearch(ev: SyntheticEvent<>) { ev.preventDefault(); @@ -179,10 +169,7 @@ class Layout extends React.Component { > - + ); } diff --git a/app/components/QuickMenu/index.js b/app/components/QuickMenu/index.js index f95cda62d6..e5812346e0 100644 --- a/app/components/QuickMenu/index.js +++ b/app/components/QuickMenu/index.js @@ -8,14 +8,12 @@ import styled from "styled-components"; import Template from "components/ContextMenu/Template"; import InputSearch from "components/InputSearch"; import Scrollable from "components/Scrollable"; -import usePrevious from "hooks/usePrevious"; import useStores from "hooks/useStores"; import useUnmount from "hooks/useUnmount"; -function QuickMenu({ isOpen, requestClose }) { +function QuickMenu() { const { quickMenu } = useStores(); const dialog = useDialogState({ modal: true, animated: 250 }); - const wasOpen = usePrevious(isOpen); const { t } = useTranslation(); const handleSearchChange = React.useCallback( @@ -28,13 +26,16 @@ function QuickMenu({ isOpen, requestClose }) { useUnmount(() => quickMenu.setSearchTerm("")); React.useEffect(() => { - if (!wasOpen && isOpen) { - dialog.show(); - } - if (wasOpen && !isOpen) { - dialog.hide(); - } - }, [dialog, wasOpen, isOpen]); + const handleKeyDown = (event) => { + if (event.key === "k" && event.metaKey) { + dialog.visible ? dialog.hide() : dialog.show(); + } + }; + + window.addEventListener("keydown", handleKeyDown); + + return () => window.removeEventListener("keydown", handleKeyDown); + }); return ( @@ -42,7 +43,6 @@ function QuickMenu({ isOpen, requestClose }) {

{context.title}