Skip to content

fix: in react ui, sidebar may re-close when navigating #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged

fix: in react ui, sidebar may re-close when navigating #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pdl-live-react/src/page/PageBreadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link } from "react-router"
import { useSearchParams, Link } from "react-router"
import { useCallback } from "react"
import { Breadcrumb, BreadcrumbItem } from "@patternfly/react-core"

Expand All @@ -14,7 +14,13 @@ export default function PageBreadcrumbs({
breadcrumb1,
breadcrumb2,
}: PageBreadcrumbProps) {
const renderHome = useCallback(() => <Link to="/welcome">Home</Link>, [])
const [searchParams] = useSearchParams()
const s = searchParams.toString()
const search = s.length > 0 ? "?" + s : ""
const renderHome = useCallback(
() => <Link to={"/welcome" + search}>Home</Link>,
[search],
)

return (
<Breadcrumb>
Expand Down
13 changes: 8 additions & 5 deletions pdl-live-react/src/page/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ import Demos from "./DemoNavItems"
import MyTraces from "./MyTracesNavItems"

export default function Sidebar() {
const [searchParams] = useSearchParams()
const { hash, pathname: activeItem } = useLocation()

const [searchParams] = useSearchParams()
const s = searchParams.toString()
const search = (s.length > 0 ? "?" + s : "") + hash

return (
<PageSidebar isSidebarOpen={!!searchParams.get("sidebar")}>
<PageSidebarBody>
Expand All @@ -24,19 +27,19 @@ export default function Sidebar() {
itemId="welcome"
isActive={activeItem === "" || activeItem === "/welcome"}
>
<Link to="/welcome">Welcome</Link>
<Link to={"/welcome" + search}>Welcome</Link>
</NavItem>

<NavItem itemId="viewer" isActive={activeItem === "/upload"}>
<Link to={"/upload" + hash}>Upload a Trace</Link>
<Link to={"/upload" + search}>Upload a Trace</Link>
</NavItem>
</NavList>

<MyTraces hash={hash} activeItem={activeItem} />
<MyTraces hash={search + hash} activeItem={activeItem} />
<Demos hash={hash} activeItem={activeItem} />

<NavItem itemId="about" isActive={activeItem === "/about"}>
<Link to="/about">About PDL</Link>
<Link to={"/about" + search}>About PDL</Link>
</NavItem>
</Nav>
</PageSidebarBody>
Expand Down