diff --git a/web/src/components/layout/HeaderBar.js b/web/src/components/layout/HeaderBar.js index 98a7e17b..9aeb4a79 100644 --- a/web/src/components/layout/HeaderBar.js +++ b/web/src/components/layout/HeaderBar.js @@ -31,13 +31,15 @@ import { Badge, } from '@douyinfe/semi-ui'; import { StatusContext } from '../../context/Status/index.js'; -import { useStyle, styleActions } from '../../context/Style/index.js'; +import { useIsMobile } from '../../hooks/useIsMobile.js'; +import { useSidebarCollapsed } from '../../hooks/useSidebarCollapsed.js'; -const HeaderBar = () => { +const HeaderBar = ({ onMobileMenuToggle, drawerOpen }) => { const { t, i18n } = useTranslation(); const [userState, userDispatch] = useContext(UserContext); const [statusState, statusDispatch] = useContext(StatusContext); - const { state: styleState, dispatch: styleDispatch } = useStyle(); + const isMobile = useIsMobile(); + const [collapsed, toggleCollapsed] = useSidebarCollapsed(); const [isLoading, setIsLoading] = useState(true); let navigate = useNavigate(); const [currentLang, setCurrentLang] = useState(i18n.language); @@ -207,7 +209,7 @@ const HeaderBar = () => { const handleNavLinkClick = (itemKey) => { if (itemKey === 'home') { - styleDispatch(styleActions.setSider(false)); + // styleDispatch(styleActions.setSider(false)); // This line is removed } setMobileMenuOpen(false); }; @@ -293,7 +295,7 @@ const HeaderBar = () => { placeholder={ } /> @@ -388,7 +390,7 @@ const HeaderBar = () => { const registerButtonTextSpanClass = "!text-xs !text-white !p-1.5"; if (showRegisterButton) { - if (styleState.isMobile) { + if (isMobile) { loginButtonClasses += " !rounded-full"; } else { loginButtonClasses += " !rounded-l-full !rounded-r-none"; @@ -436,7 +438,7 @@ const HeaderBar = () => { 0 ? 'system' : 'inApp'} unreadKeys={getUnreadKeys()} /> @@ -447,18 +449,18 @@ const HeaderBar = () => { {isDemoSiteMode && statusState?.status?.version ? (