Skip to content

make sidebar nav maintain query string params #649

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
Nov 6, 2025
Merged

make sidebar nav maintain query string params #649

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
13 changes: 10 additions & 3 deletions apps/dojo/src/components/sidebar/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React, { useState, useEffect } from "react";
import { EyeIcon as Eye, CodeIcon as Code, BookOpenTextIcon as Book } from "@phosphor-icons/react";
import { cn } from "@/lib/utils";
import { useRouter, usePathname } from "next/navigation";
import { useRouter, usePathname, useSearchParams } from "next/navigation";
import { DemoList } from "@/components/demo-list/demo-list";
import { ThemeToggle } from "@/components/ui/theme-toggle";
import { ChevronDown } from "lucide-react";
Expand Down Expand Up @@ -31,6 +31,7 @@ interface SidebarProps {
export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {
const router = useRouter();
const pathname = usePathname();
const searchParams = useSearchParams();
const { theme, setTheme } = useTheme();
const isDarkTheme = theme === "dark"
const { view, frameworkPickerHidden, viewPickerHidden, featurePickerHidden, setView} = useURLParams();
Expand All @@ -56,7 +57,10 @@ export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {
// Handle selecting a demo
const handleDemoSelect = (demoId: string) => {
if (currentIntegration) {
router.push(`/${currentIntegration.id}/feature/${demoId}`);
const queryString = searchParams.toString();
const newPath = `/${currentIntegration.id}/feature/${demoId}`;
const url = queryString ? `${newPath}?${queryString}` : newPath;
router.push(url);
// Close mobile sidebar when demo is selected
if (isMobile && onMobileClose) {
onMobileClose();
Expand All @@ -66,7 +70,10 @@ export function Sidebar({ isMobile, onMobileClose }: SidebarProps) {

// Handle integration selection
const handleIntegrationSelect = (integrationId: string) => {
router.push(`/${integrationId}`);
const queryString = searchParams.toString();
const newPath = `/${integrationId}`;
const url = queryString ? `${newPath}?${queryString}` : newPath;
router.push(url);
};

const tabClass = `cursor-pointer flex-1 h-8 px-2 text-sm text-primary shadow-none bg-none border-none font-medium gap-1 rounded-lg data-[state=active]:bg-white data-[state=active]:text-primary data-[state=active]:shadow-none`
Expand Down
Loading