fix: collapse sidebar after returning from drawer layout (#102463)

steipete · web-flow · commit 5f91f6c95840 · 2026-07-09T07:42:17.000+01:00
* fix(ui): collapse sidebar after drawer resize

* chore: defer sidebar release note
diff --git a/ui/src/app/app-host.ts b/ui/src/app/app-host.ts
@@ -553,8 +553,12 @@ class OpenClawShell extends LitElement {
       this.navDrawerOpen = true;
       return;
     }
+    // A drawer that survived a breakpoint change is visually expanded even
+    // when the persisted desktop preference says collapsed.
+    const nextNavCollapsed = this.navDrawerOpen || !this.navCollapsed;
+    this.closeNavDrawer();
     context.navigation.update({
-      navCollapsed: !this.navCollapsed,
+      navCollapsed: nextNavCollapsed,
     });
   }
 
diff --git a/ui/src/e2e/sidebar-customization.e2e.test.ts b/ui/src/e2e/sidebar-customization.e2e.test.ts
@@ -190,6 +190,23 @@ describeControlUiE2e("Control UI sidebar customization mocked Gateway E2E", () =
       await expect.poll(() => page.locator(".topbar-brand").isVisible()).toBe(false);
       await captureUiProof(page, "05-expanded-tablet-drawer.png");
 
+      // Widening with the drawer open must not leave its stale state blocking
+      // the desktop collapse control.
+      await page.setViewportSize({ height: 900, width: 1440 });
+      await sidebar.getByRole("button", { name: "Collapse sidebar" }).click();
+      await expect
+        .poll(() => page.locator(".shell").getAttribute("class"))
+        .toContain("shell--nav-collapsed");
+      await expect
+        .poll(() => page.locator(".shell").getAttribute("class"))
+        .not.toContain("shell--nav-drawer-open");
+      await captureUiProof(page, "06-desktop-collapse-after-drawer.png");
+
+      await page.setViewportSize({ height: 900, width: 900 });
+      await drawerButton.click();
+      await expect
+        .poll(() => page.locator(".shell").getAttribute("class"))
+        .toContain("shell--nav-drawer-open");
       await page.keyboard.press("Escape");
       await expect
         .poll(() => page.locator(".shell").getAttribute("class"))

Original file line number	Diff line number	Diff line change
`@@ -553,8 +553,12 @@ class OpenClawShell extends LitElement {`
`553`	`553`	`this.navDrawerOpen = true;`
`554`	`554`	`return;`
`555`	`555`	`}`
	`556`	`+ // A drawer that survived a breakpoint change is visually expanded even`
	`557`	`+ // when the persisted desktop preference says collapsed.`
	`558`	`+ const nextNavCollapsed = this.navDrawerOpen \|\| !this.navCollapsed;`
	`559`	`+ this.closeNavDrawer();`
`556`	`560`	`context.navigation.update({`
`557`		`- navCollapsed: !this.navCollapsed,`
	`561`	`+ navCollapsed: nextNavCollapsed,`
`558`	`562`	`});`
`559`	`563`	`}`
`560`	`564`