fix: missing note sidebar control button when the navigation bar is on the left (#9698)

This commit is contained in:
Pleasure1234 2025-08-31 00:50:56 +08:00 committed by GitHub
parent 0b7543a59b
commit fef6dccfd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3,7 +3,6 @@ import { NavbarCenter, NavbarHeader, NavbarRight } from '@renderer/components/ap
import { HStack } from '@renderer/components/Layout' import { HStack } from '@renderer/components/Layout'
import { useActiveNode } from '@renderer/hooks/useNotesQuery' import { useActiveNode } from '@renderer/hooks/useNotesQuery'
import { useNotesSettings } from '@renderer/hooks/useNotesSettings' import { useNotesSettings } from '@renderer/hooks/useNotesSettings'
import { useNavbarPosition } from '@renderer/hooks/useSettings'
import { useShowWorkspace } from '@renderer/hooks/useStore' import { useShowWorkspace } from '@renderer/hooks/useStore'
import { findNodeInTree } from '@renderer/services/NotesTreeService' import { findNodeInTree } from '@renderer/services/NotesTreeService'
import { Breadcrumb, BreadcrumbProps, Dropdown, Tooltip } from 'antd' import { Breadcrumb, BreadcrumbProps, Dropdown, Tooltip } from 'antd'
@ -17,7 +16,6 @@ import { menuItems } from './MenuConfig'
const logger = loggerService.withContext('HeaderNavbar') const logger = loggerService.withContext('HeaderNavbar')
const HeaderNavbar = ({ notesTree, getCurrentNoteContent }) => { const HeaderNavbar = ({ notesTree, getCurrentNoteContent }) => {
const { isTopNavbar } = useNavbarPosition()
const { showWorkspace, toggleShowWorkspace } = useShowWorkspace() const { showWorkspace, toggleShowWorkspace } = useShowWorkspace()
const { activeNode } = useActiveNode(notesTree) const { activeNode } = useActiveNode(notesTree)
const [breadcrumbItems, setBreadcrumbItems] = useState<Required<BreadcrumbProps>['items']>([]) const [breadcrumbItems, setBreadcrumbItems] = useState<Required<BreadcrumbProps>['items']>([])
@ -113,14 +111,14 @@ const HeaderNavbar = ({ notesTree, getCurrentNoteContent }) => {
return ( return (
<NavbarHeader className="home-navbar" style={{ justifyContent: 'flex-start' }}> <NavbarHeader className="home-navbar" style={{ justifyContent: 'flex-start' }}>
<HStack alignItems="center" flex="0 0 auto"> <HStack alignItems="center" flex="0 0 auto">
{isTopNavbar && showWorkspace && ( {showWorkspace && (
<Tooltip title={t('navbar.hide_sidebar')} mouseEnterDelay={0.8}> <Tooltip title={t('navbar.hide_sidebar')} mouseEnterDelay={0.8}>
<NavbarIcon onClick={handleToggleShowWorkspace}> <NavbarIcon onClick={handleToggleShowWorkspace}>
<PanelLeftClose size={18} /> <PanelLeftClose size={18} />
</NavbarIcon> </NavbarIcon>
</Tooltip> </Tooltip>
)} )}
{isTopNavbar && !showWorkspace && ( {!showWorkspace && (
<Tooltip title={t('navbar.show_sidebar')} mouseEnterDelay={0.8}> <Tooltip title={t('navbar.show_sidebar')} mouseEnterDelay={0.8}>
<NavbarIcon onClick={handleToggleShowWorkspace}> <NavbarIcon onClick={handleToggleShowWorkspace}>
<PanelRightClose size={18} /> <PanelRightClose size={18} />