From fbcd97ca89b2dd3dd8bad8c04ed0e8f8140bb286 Mon Sep 17 00:00:00 2001 From: talksik Date: Thu, 5 May 2022 04:37:56 -0500 Subject: [PATCH] fixing header more with search bar or not --- .../desktop/src/components/header/index.tsx | 46 +++++++++++-------- packages/desktop/src/pages/overlay/index.tsx | 9 ++++ packages/desktop/src/styles/index.css | 2 + 3 files changed, 37 insertions(+), 20 deletions(-) diff --git a/packages/desktop/src/components/header/index.tsx b/packages/desktop/src/components/header/index.tsx index f370c6b..52b763e 100644 --- a/packages/desktop/src/components/header/index.tsx +++ b/packages/desktop/src/components/header/index.tsx @@ -1,13 +1,13 @@ +import { $desktopMode, $selectedOutputMode } from "../../controller/recoil"; import { Avatar, Menu } from "antd"; import { GlobalHotKeys, KeyMap } from "react-hotkeys"; import { HeadsetMicSharp, VideocamSharp } from "@mui/icons-material"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import { useRecoilState, useRecoilValue } from "recoil"; -import { $selectedOutputMode } from "../../controller/recoil"; import { FaSearch } from "react-icons/fa"; import Logo from "../Logo"; import { useGetUserDetails } from "../../controller/index"; -import { useRecoilState } from "recoil"; export default function NirvanaHeader({ onHeaderFocus, @@ -22,6 +22,8 @@ export default function NirvanaHeader({ const [anchorEl, setAnchorEl] = useState(null); const [outputMode, setOutputMode] = useRecoilState($selectedOutputMode); + const desktopMode = useRecoilValue($desktopMode); + const [userVideoStream, setUserVideoStream] = useState(undefined); @@ -40,16 +42,18 @@ export default function NirvanaHeader({ videoElem.srcObject = userVideoStream; }, [userVideoStream, outputMode]); - const menuOpen = useMemo(() => Boolean(anchorEl), [anchorEl]); + /** hide the search bar in the header so that it's cleaner for these two modes */ + const shouldHideSearch = useMemo(() => { + if (desktopMode === "flowState" || desktopMode === "overlayOnly") + return true; + + return false; + }, [desktopMode]); const handleOpenMenu = useCallback((event: React.MouseEvent) => { setAnchorEl(event.currentTarget); }, []); - const handleCloseMenu = useCallback(() => { - setAnchorEl(null); - }, []); - const selectSearch = () => { inputRef.current?.focus(); }; @@ -76,32 +80,34 @@ export default function NirvanaHeader({
-
- - -
+ {!shouldHideSearch && ( +
+ + +
+ )} {/* todo: move this ghost button to components */} -
{outputMode === "video" && ( -