diff --git a/src/components/toolbar/ToolbarView.tsx b/src/components/toolbar/ToolbarView.tsx index cdb385d..7a8b1ec 100644 --- a/src/components/toolbar/ToolbarView.tsx +++ b/src/components/toolbar/ToolbarView.tsx @@ -1,6 +1,6 @@ import { CreateLinkEvent, Dispose, DropBounce, EaseOut, JumpBy, Motions, NitroToolbarAnimateIconEvent, PerkAllowancesMessageEvent, PerkEnum, Queue, Wait, YouTubeRoomSettingsEvent } from '@nitrots/nitro-renderer'; import { AnimatePresence, motion, Variants } from 'framer-motion'; -import { FC, useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { FC, useEffect, useMemo, useState } from 'react'; import { GetConfigurationValue, isHousekeepingEnabled, MessengerIconState, OpenMessengerChat, setYoutubeRoomEnabled, VisitDesktop } from '../../api'; import { Flex, LayoutAvatarImageView, LayoutItemCountView } from '../../common'; import { useAchievements, useFriends, useHasPermission, useInventoryUnseenTracker, useMentionsSnapshot, useMessageEvent, useMessenger, useModTools, useNitroEvent, useSessionInfo, useSoundboard, useWiredTools } from '../../hooks'; @@ -26,13 +26,11 @@ const shellVariants: Variants = { const SHELL_TRANSITION = { type: 'spring' as const, stiffness: 260, damping: 26 }; const NAV_TRANSITION = { type: 'spring' as const, stiffness: 300, damping: 28 }; const ME_POPOVER_TRANSITION = { type: 'spring' as const, stiffness: 420, damping: 28 }; -const TOGGLE_LOCK_MS = 220; export const ToolbarView: FC<{ isInRoom: boolean }> = props => { const { isInRoom } = props; const [ isMeExpanded, setMeExpanded ] = useState(false); - const [ isToolbarOpen, setIsToolbarOpen ] = useState(false); const [ isTouchLayout, setIsTouchLayout ] = useState(false); const [ staffStackBottom, setStaffStackBottom ] = useState(null); const [ useGuideTool, setUseGuideTool ] = useState(false); @@ -54,26 +52,9 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props => () => isMod ? tickets.filter(ticket => ticket && (ticket.state === 1)).length : 0, [ isMod, tickets ] ); - const isVisible = (isToolbarOpen || !isInRoom); - const visibilityVariant = isVisible ? 'visible' : 'hidden'; - const toggleLockRef = useRef(false); - const toggleTimeoutRef = useRef | null>(null); + const visibilityVariant = 'visible'; - useEffect(() => () => - { - if(toggleTimeoutRef.current) clearTimeout(toggleTimeoutRef.current); - }, []); - - const handleToggleClick = useCallback(() => - { - if(toggleLockRef.current) return; - toggleLockRef.current = true; - setIsToolbarOpen(value => !value); - if(toggleTimeoutRef.current) clearTimeout(toggleTimeoutRef.current); - toggleTimeoutRef.current = setTimeout(() => { toggleLockRef.current = false; }, TOGGLE_LOCK_MS); - }, []); - - const compactFramePosition = (isToolbarOpen && isInRoom) ? 'bottom-[90px] min-[1700px]:bottom-0' : 'bottom-0'; + const compactFramePosition = 'bottom-[90px] min-[1700px]:bottom-0'; const mobileOnlyClasses = isTouchLayout ? '' : 'min-[1700px]:hidden'; const desktopBlockClasses = isTouchLayout ? 'hidden' : 'hidden min-[1700px]:block'; const desktopFlexClasses = isTouchLayout ? 'hidden' : 'hidden min-[1700px]:flex'; @@ -196,20 +177,6 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props => { isInRoom &&
- - - - - = props =>
} = props => = props => = props => room. Always present (Builders Club), plus camera in-room and the staff-only tools when permitted. */ }