Your lightweight open-source personal agent.
Python agent-frameworkai-agentai-agentschatbotchatopsdiscord-botllm-agentsllmslocal-llmmcpmodel-context-protocolmulti-agentopenai-compatibleopenclawpersonal-ai-assistantpythonself-hostedtelegram-bot-ai-assistantwebuiworkflow-automation
fix(webui): align native sidebar controls
Xubin Rena841b10bc01a
diff --git a/webui/src/App.tsx b/webui/src/App.tsxindex 8fc89e055..cb4d556ce 100644--- a/webui/src/App.tsx+++ b/webui/src/App.tsx@@ -8,7 +8,7 @@ import {useState,type ReactNode,} from "react";-import { Eye, EyeOff, Moon, PanelLeft, ShieldCheck, Sun, X } from "lucide-react";+import { Eye, EyeOff, Moon, ShieldCheck, Sun, X } from "lucide-react";import { useTranslation } from "react-i18next";import { channelUiPresentation } from "@/channel-plugins/registry";import { Sidebar } from "@/components/Sidebar";@@ -475,39 +475,12 @@ function isBootstrapAuthRequired(error: unknown): boolean {}function HostChrome({- onToggleSidebar,- onSidebarPreviewEnter,- onSidebarPreviewLeave,- sidebarOpen = true,rightAction,}: {- onToggleSidebar?: () => void;- onSidebarPreviewEnter?: () => void;- onSidebarPreviewLeave?: () => void;- sidebarOpen?: boolean;rightAction?: ReactNode;}) {- const { t } = useTranslation();-return (<header className="host-drag-region pointer-events-none absolute inset-x-0 top-0 z-40 h-11 bg-transparent text-foreground/90">- {onToggleSidebar ? (- <Button- type="button"- variant="ghost"- size="icon"- aria-label={t("thread.header.toggleSidebar")}- data-testid="host-sidebar-toggle"- onClick={onToggleSidebar}- onFocus={!sidebarOpen ? onSidebarPreviewEnter : undefined}- onBlur={!sidebarOpen ? onSidebarPreviewLeave : undefined}- onMouseEnter={!sidebarOpen ? onSidebarPreviewEnter : undefined}- onMouseLeave={!sidebarOpen ? onSidebarPreviewLeave : undefined}- className="host-no-drag pointer-events-auto absolute left-[88px] top-[8px] h-7 w-7 rounded-lg bg-transparent text-muted-foreground/85 shadow-none hover:bg-transparent hover:text-foreground"- >- <PanelLeft className="h-[15px] w-[15px]" strokeWidth={1.75} />- </Button>- ) : null}{rightAction ? (<div className="host-no-drag pointer-events-auto absolute right-3 top-2">{rightAction}@@ -1055,7 +1028,6 @@ function Shell({useState<SettingsSectionKey>(initialRouteRef.current.settingsSection);const [hostSidebarOpen, setHostSidebarOpen] =useState<boolean>(readSidebarOpen);- const [hostSidebarPreviewOpen, setHostSidebarPreviewOpen] = useState(false);const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false);const [sessionSearchOpen, setSessionSearchOpen] = useState(false);const mobileWorkbench = useMediaQuery("(max-width: 767px)");@@ -1112,7 +1084,6 @@ function Shell({const activeChatIdRef = useRef<string | null>(null);const pendingCreatedSessionKeyRef = useRef<string | null>(null);const temporarySessionsRef = useRef<Record<string, ChatSummary>>({});- const hostSidebarPreviewCloseTimerRef = useRef<number | null>(null);const effectiveRuntimeSurface =settingsSnapshot?.surface ?? settingsSnapshot?.runtime_surface ?? runtimeSurface;const showHostChrome = effectiveRuntimeSurface === "native";@@ -1453,74 +1424,13 @@ function Shell({});}, [client, loading, sessions]);- const clearHostSidebarPreviewCloseTimer = useCallback(() => {- if (hostSidebarPreviewCloseTimerRef.current === null) return;- window.clearTimeout(hostSidebarPreviewCloseTimerRef.current);- hostSidebarPreviewCloseTimerRef.current = null;- }, []);-- const closeHostSidebarPreview = useCallback(() => {- clearHostSidebarPreviewCloseTimer();- setHostSidebarPreviewOpen(false);- }, [clearHostSidebarPreviewCloseTimer]);-- const openHostSidebarPreview = useCallback(() => {- if (!showHostChrome || !showMainSidebar || hostSidebarOpen) return;- clearHostSidebarPreviewCloseTimer();- setHostSidebarPreviewOpen(true);- }, [- clearHostSidebarPreviewCloseTimer,- hostSidebarOpen,- showHostChrome,- showMainSidebar,- ]);-- const scheduleHostSidebarPreviewClose = useCallback(() => {- clearHostSidebarPreviewCloseTimer();- if (!showHostChrome || !showMainSidebar || hostSidebarOpen) {- setHostSidebarPreviewOpen(false);- return;- }- hostSidebarPreviewCloseTimerRef.current = window.setTimeout(() => {- setHostSidebarPreviewOpen(false);- hostSidebarPreviewCloseTimerRef.current = null;- }, 160);- }, [- clearHostSidebarPreviewCloseTimer,- hostSidebarOpen,- showHostChrome,- showMainSidebar,- ]);-- useEffect(() => {- return () => clearHostSidebarPreviewCloseTimer();- }, [clearHostSidebarPreviewCloseTimer]);-- useEffect(() => {- if (!showHostChrome || !showMainSidebar || hostSidebarOpen) {- closeHostSidebarPreview();- }- }, [- closeHostSidebarPreview,- hostSidebarOpen,- showHostChrome,- showMainSidebar,- ]);-const closeHostSidebar = useCallback(() => {- closeHostSidebarPreview();setHostSidebarOpen(false);- }, [closeHostSidebarPreview]);+ }, []);const openHostSidebar = useCallback(() => {- closeHostSidebarPreview();setHostSidebarOpen(true);- }, [closeHostSidebarPreview]);-- const toggleHostSidebar = useCallback(() => {- closeHostSidebarPreview();- setHostSidebarOpen((v) => !v);- }, [closeHostSidebarPreview]);+ }, []);const closeMobileSidebar = useCallback(() => {setMobileSidebarOpen(false);@@ -1531,12 +1441,11 @@ function Shell({typeof window !== "undefined" &&window.matchMedia("(min-width: 1024px)").matches;if (isNativeHost) {- closeHostSidebarPreview();setHostSidebarOpen((v) => !v);} else {setMobileSidebarOpen((v) => !v);}- }, [closeHostSidebarPreview]);+ }, []);const applyWorkspaceScope = useCallback((scope: WorkspaceScopePayload) => {@@ -2574,13 +2483,7 @@ function Shell({archivedCount: sidebarArchivedTabKeys.length,defaultWorkspacePath: workspaces?.default_scope.project_path ?? null,};- const hostSidebarCollapsed = showHostChrome && !hostSidebarOpen;- const showHostSidebarPreview =- showMainSidebar && hostSidebarCollapsed && hostSidebarPreviewOpen;- const hostSidebarFlowWidth = showHostChrome- ? (hostSidebarOpen ? SIDEBAR_WIDTH : 0)- : (hostSidebarOpen ? SIDEBAR_WIDTH : SIDEBAR_RAIL_WIDTH);- const renderHostSidebarFlowContent = !showHostChrome || hostSidebarOpen;+ const hostSidebarFlowWidth = hostSidebarOpen ? SIDEBAR_WIDTH : SIDEBAR_RAIL_WIDTH;useEffect(() => {document.documentElement.classList.toggle("native-host", showHostChrome);@@ -2599,10 +2502,6 @@ function Shell({>{showHostChrome ? (<HostChrome- onToggleSidebar={showMainSidebar ? toggleHostSidebar : undefined}- onSidebarPreviewEnter={openHostSidebarPreview}- onSidebarPreviewLeave={scheduleHostSidebarPreviewClose}- sidebarOpen={hostSidebarOpen}rightAction={view === "chat" ? undefined : (<Button@@ -2640,38 +2539,17 @@ function Shell({width: hostSidebarFlowWidth,}}>- {renderHostSidebarFlowContent ? (- <div- className={cn(- "absolute inset-y-0 left-0 h-full w-full overflow-hidden",- showHostChrome- ? "host-sidebar-glass"- : "bg-sidebar",- )}- >- <Sidebar- {...sidebarProps}- collapsed={!showHostChrome && !hostSidebarOpen}- hostChromeInset={showHostChrome}- onCollapse={closeHostSidebar}- onExpand={openHostSidebar}- />- </div>- ) : null}- </aside>- ) : null}-- {showHostSidebarPreview ? (- <aside- data-testid="host-sidebar-preview"- className="absolute inset-y-0 left-0 z-30 hidden overflow-hidden lg:block animate-in fade-in-0 slide-in-from-left-2 duration-150"- style={{ width: SIDEBAR_WIDTH }}- onMouseEnter={openHostSidebarPreview}- onMouseLeave={scheduleHostSidebarPreviewClose}- >- <div className="h-full w-full overflow-hidden host-sidebar-glass shadow-2xl">+ <div+ className={cn(+ "absolute inset-y-0 left-0 h-full w-full overflow-hidden",+ showHostChrome+ ? "host-sidebar-glass"+ : "bg-sidebar",+ )}+ ><Sidebar{...sidebarProps}+ collapsed={!hostSidebarOpen}hostChromeInset={showHostChrome}onCollapse={closeHostSidebar}onExpand={openHostSidebar}@@ -2782,7 +2660,6 @@ function Shell({theme={theme}onToggleTheme={toggle}hideSidebarToggleForHostChrome- hostChromeTitleInset={hostSidebarCollapsed}hideHeader={false}workspaceScope={activeWorkspaceScope}workspaceDefaultScope={workspaces?.default_scope ?? null}@@ -2820,7 +2697,6 @@ function Shell({onToggleTheme={toggle}hideSidebarToggle={!context.active}hideSidebarToggleForHostChrome={context.active}- hostChromeTitleInset={hostSidebarCollapsed}hideThemeButton={!context.active}hideHeaderTitleinlineHandle={workbenchPaneSessions.length > 1}diff --git a/webui/src/components/Sidebar.tsx b/webui/src/components/Sidebar.tsxindex 1a066ee9a..01792a4b0 100644--- a/webui/src/components/Sidebar.tsx+++ b/webui/src/components/Sidebar.tsx@@ -130,13 +130,14 @@ export function Sidebar(props: SidebarProps) {)}><div+ data-testid="sidebar-brand-row"className={cn(- "flex items-center px-3 pb-2.5",- props.hostChromeInset ? "pt-[2.85rem]" : "pt-3",+ "flex items-start px-3 pb-2.5 pt-3",collapsed ? "w-14 justify-start" : "justify-between",)}><button+ data-testid="sidebar-brand-mark"type="button"aria-label={collapsed ? toggleLabel : undefined}aria-hidden={collapsed ? undefined : true}@@ -144,7 +145,8 @@ export function Sidebar(props: SidebarProps) {onClick={collapsed ? props.onExpand : undefined}tabIndex={collapsed ? 0 : -1}className={cn(- "flex h-9 w-9 shrink-0 items-center justify-center overflow-hidden rounded-xl transition-colors",+ "host-no-drag flex h-9 w-9 shrink-0 items-center justify-center overflow-hidden rounded-xl transition-colors",+ props.hostChromeInset && "mt-5",collapsed? "-ml-0.5 hover:bg-sidebar-accent/75": "pointer-events-none -ml-0.5",@@ -157,13 +159,13 @@ export function Sidebar(props: SidebarProps) {draggable={false}/></button>- {!collapsed && !props.hostChromeInset && (+ {!collapsed && (<Buttonvariant="ghost"size="icon"aria-label={t("sidebar.collapse")}onClick={props.onCollapse}- className="h-7 w-7 rounded-lg text-muted-foreground/85 hover:bg-sidebar-accent/75 hover:text-sidebar-foreground"+ className="host-no-drag h-7 w-7 rounded-lg text-muted-foreground/85 hover:bg-sidebar-accent/75 hover:text-sidebar-foreground"><Menu className="h-3.5 w-3.5" /></Button>diff --git a/webui/src/tests/app-layout.test.tsx b/webui/src/tests/app-layout.test.tsxindex d73d62b83..1f550ad65 100644--- a/webui/src/tests/app-layout.test.tsx+++ b/webui/src/tests/app-layout.test.tsx@@ -454,6 +454,8 @@ describe("App layout", () => {const main = container.querySelector("main");expect(main).toBeInTheDocument();expect(main).not.toHaveAttribute("style");+ expect(screen.getByTestId("sidebar-brand-row")).toHaveClass("pt-3");+ expect(screen.getByTestId("sidebar-brand-mark")).not.toHaveClass("mt-5");const asideClassNames = Array.from(container.querySelectorAll("aside")).map((el) => el.className,@@ -1609,7 +1611,7 @@ describe("App layout", () => {expect(document.title).toBe("自动任务 · nanobot");});- it("fully collapses the native host sidebar and previews it on hover", async () => {+ it("uses the shared sidebar controls and rail on the native host", async () => {mockSessions = [{key: "websocket:chat-a",@@ -1632,36 +1634,25 @@ describe("App layout", () => {await waitFor(() => expect(connectSpy).toHaveBeenCalled());const flowSidebar = screen.getByTestId("host-sidebar-flow");- const toggle = screen.getByTestId("host-sidebar-toggle");expect(flowSidebar).toHaveStyle({ width: "272px" });+ expect(screen.getByTestId("sidebar-brand-row")).toHaveClass("pt-3");+ expect(screen.getByTestId("sidebar-brand-mark")).toHaveClass("mt-5");+ expect(screen.queryByTestId("host-sidebar-toggle")).not.toBeInTheDocument();expect(screen.getByRole("navigation", { name: "Sidebar navigation" }),).toBeInTheDocument();- fireEvent.click(toggle);- await waitFor(() => expect(flowSidebar).toHaveStyle({ width: "0px" }));- expect(- screen.queryByRole("navigation", { name: "Sidebar navigation" }),- ).not.toBeInTheDocument();-- fireEvent.mouseEnter(toggle);- const previewSidebar = await screen.findByTestId("host-sidebar-preview");- expect(flowSidebar).toHaveStyle({ width: "0px" });- expect(previewSidebar).toHaveStyle({ width: "272px" });+ fireEvent.click(screen.getByRole("button", { name: "Collapse sidebar" }));+ await waitFor(() => expect(flowSidebar).toHaveStyle({ width: "56px" }));expect(- within(previewSidebar).getByRole("navigation", {- name: "Sidebar navigation",- }),+ screen.getByRole("navigation", { name: "Sidebar navigation" }),).toBeInTheDocument();- fireEvent.click(toggle);- await waitFor(() =>- expect(screen.queryByTestId("host-sidebar-preview")).not.toBeInTheDocument(),+ fireEvent.click(+ within(screen.getByRole("navigation", { name: "Sidebar navigation" }))+ .getByRole("button", { name: "Toggle sidebar" }),);- expect(flowSidebar).toHaveStyle({ width: "272px" });- expect(- screen.getByRole("navigation", { name: "Sidebar navigation" }),- ).toBeInTheDocument();+ await waitFor(() => expect(flowSidebar).toHaveStyle({ width: "272px" }));});it("switches to the next session when deleting the active chat", async () => {