From deffbdaa43ccca5d62b01f4045ef1cac3a0ff7ea Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Mon, 19 May 2025 22:26:02 +0200 Subject: [PATCH] refactor: make finder available in exported rundown --- apps/client/src/features/editors/Editor.tsx | 9 +------- .../src/features/rundown/RundownExport.tsx | 10 +++++---- .../rundown/placements/FinderPlacement.tsx | 22 +++++++++++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 apps/client/src/features/rundown/placements/FinderPlacement.tsx diff --git a/apps/client/src/features/editors/Editor.tsx b/apps/client/src/features/editors/Editor.tsx index c90010b78..d0f828b28 100644 --- a/apps/client/src/features/editors/Editor.tsx +++ b/apps/client/src/features/editors/Editor.tsx @@ -10,7 +10,6 @@ import AppSettings from '../app-settings/AppSettings'; import useAppSettingsNavigation from '../app-settings/useAppSettingsNavigation'; import { EditorOverview } from '../overview/Overview'; -import Finder from './finder/Finder'; import WelcomePlacement from './welcome/WelcomePlacement'; import styles from './Editor.module.scss'; @@ -22,7 +21,6 @@ const MessageControl = lazy(() => import('../control/message/MessageControlExpor export default function Editor() { const { isOpen: isSettingsOpen, setLocation, close } = useAppSettingsNavigation(); const { isOpen: isMenuOpen, onOpen, onClose } = useDisclosure(); - const { isOpen: isFinderOpen, onToggle: onFinderToggle, onClose: onFinderClose } = useDisclosure(); useWindowTitle('Editor'); @@ -46,16 +44,11 @@ export default function Editor() { } }, [close, isSettingsOpen, setLocation]); - useHotkeys([ - ['mod + ,', toggleSettings], - ['mod + f', onFinderToggle], - ['Escape', onFinderClose], - ]); + useHotkeys([['mod + ,', toggleSettings]]); return (
- { +export default memo(RundownExport); + +function RundownExport() { const isExtracted = window.location.pathname.includes('/rundown'); const appMode = useAppMode((state) => state.mode); const hideSideBar = isExtracted && appMode === 'run'; @@ -21,6 +24,7 @@ const RundownExport = () => { return (
+
@@ -40,6 +44,4 @@ const RundownExport = () => {
); -}; - -export default memo(RundownExport); +} diff --git a/apps/client/src/features/rundown/placements/FinderPlacement.tsx b/apps/client/src/features/rundown/placements/FinderPlacement.tsx new file mode 100644 index 000000000..7fd4da09a --- /dev/null +++ b/apps/client/src/features/rundown/placements/FinderPlacement.tsx @@ -0,0 +1,22 @@ +import { memo } from 'react'; +import { useDisclosure } from '@chakra-ui/react'; +import { useHotkeys } from '@mantine/hooks'; + +import Finder from '../../editors/finder/Finder'; + +export default memo(FinderPlacement); + +function FinderPlacement() { + const { isOpen, onToggle, onClose } = useDisclosure(); + + useHotkeys([ + ['mod + f', onToggle], + ['Escape', onClose], + ]); + + if (isOpen) { + return ; + } + + return null; +}