You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by as...@apache.org on 2026/08/26 11:50:30 UTC
(maka) branch main updated: fix(desktop): prevent collapsed workbar flash (#3794)
This is an automated email from the ASF dual-hosted git repository.
Astro-Han pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maka.git
The following commit(s) were added to refs/heads/main by this push:
new 0a3390c73 fix(desktop): prevent collapsed workbar flash (#3794)
0a3390c73 is described below
commit 0a3390c73d50ef3f19cbf3d09151366056c34e92
Author: Haoqing Wang <78...@users.noreply.github.com>
AuthorDate: Wed Aug 26 19:50:25 2026 +0800
fix(desktop): prevent collapsed workbar flash (#3794)
Make the lazy Workbar fallback mirror the resolved surface visibility so creating a session cannot briefly open a collapsed panel. Add Electron coverage that records transient right-panel visibility during the first send.
Generated-by: Codex
---
apps/desktop/e2e/session-workbar.spec.ts | 63 ++++++++++++++++++++++
.../renderer/features/workbar/ui/workbar-host.tsx | 51 ++++++++++++------
2 files changed, 98 insertions(+), 16 deletions(-)
diff --git a/apps/desktop/e2e/session-workbar.spec.ts b/apps/desktop/e2e/session-workbar.spec.ts
index 04decdddc..777767e19 100644
--- a/apps/desktop/e2e/session-workbar.spec.ts
+++ b/apps/desktop/e2e/session-workbar.spec.ts
@@ -51,6 +51,69 @@ async function createSession(page: Page, prompt: string) {
return { composer, sessionId: sessionId!, sidebar };
}
+test('a collapsed workbar never flashes during the first send', async ({
+ window: page,
+}) => {
+ await page.evaluate(() => {
+ const watch = { visibleRightWorkbar: false };
+ const inspect = () => {
+ const panel = document.querySelector<HTMLElement>(
+ '.maka-session-workbar[data-placement="right"]',
+ );
+ if (
+ panel &&
+ getComputedStyle(panel).display !== 'none' &&
+ panel.getBoundingClientRect().width > 0
+ ) {
+ watch.visibleRightWorkbar = true;
+ }
+ };
+ const observer = new MutationObserver(inspect);
+ observer.observe(document.body, {
+ subtree: true,
+ childList: true,
+ attributes: true,
+ });
+ (
+ window as typeof window & {
+ __makaFirstSendWorkbarWatch?: typeof watch;
+ __makaFirstSendWorkbarWatchStop?: () => void;
+ }
+ ).__makaFirstSendWorkbarWatch = watch;
+ (
+ window as typeof window & {
+ __makaFirstSendWorkbarWatchStop?: () => void;
+ }
+ ).__makaFirstSendWorkbarWatchStop = () => {
+ inspect();
+ observer.disconnect();
+ };
+ });
+
+ const composer = page.locator(COMPOSER_INPUT);
+ await composer.fill('create a session without opening the workbar');
+ await page.getByRole('button', { name: '发送' }).click();
+ const expandWorkbar = page.getByRole('button', { name: '展开任务工作栏' });
+ await expect(expandWorkbar).toBeVisible({
+ timeout: 20_000,
+ });
+
+ const watch = await page.evaluate(() => {
+ const target = window as typeof window & {
+ __makaFirstSendWorkbarWatch?: { visibleRightWorkbar: boolean };
+ __makaFirstSendWorkbarWatchStop?: () => void;
+ };
+ target.__makaFirstSendWorkbarWatchStop?.();
+ return target.__makaFirstSendWorkbarWatch;
+ });
+ expect(watch?.visibleRightWorkbar, 'the collapsed right workbar stayed hidden').toBe(false);
+
+ await expandWorkbar.evaluate((button) => button.click());
+ await expect(
+ page.locator('.maka-session-workbar[data-placement="right"]'),
+ ).toBeVisible();
+});
+
async function waitForCompanionForkId(page: Page, sourceSessionId: string) {
let forkId: string | undefined;
await expect
diff --git a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
index 39b551a56..a25106c1f 100644
--- a/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
+++ b/apps/desktop/src/renderer/features/workbar/ui/workbar-host.tsx
@@ -46,24 +46,35 @@ const WorkbarSurface = lazy(() =>
})),
);
-function SessionWorkbarFallback() {
+function SessionWorkbarFallback(props: {
+ hidden: boolean;
+ rightCollapsed: boolean;
+ bottomOpen: boolean;
+}) {
const copy = getShellCopy(useUiLocale()).app;
+ if (props.hidden || (props.rightCollapsed && !props.bottomOpen)) return null;
+ const placements: SessionWorkbarPlacement[] = [];
+ if (!props.rightCollapsed) placements.push('right');
+ if (props.bottomOpen) placements.push('bottom');
return (
<div className="maka-workbar-workspace-contents">
- <Card
- variant="transparent"
- padding={0}
- height="100%"
- className="maka-session-workbar maka-session-workbar-frame"
- data-placement="right"
- role="status"
- aria-busy="true"
- aria-label={copy.loadingWorkbarLabel}
- >
- <div className="maka-lazy-fallback" data-surface="panel">
- <Spinner size="sm" shade="subtle" label={copy.loadingWorkbar} />
- </div>
- </Card>
+ {placements.map((placement) => (
+ <Card
+ key={placement}
+ variant="transparent"
+ padding={0}
+ height="100%"
+ className="maka-session-workbar maka-session-workbar-frame"
+ data-placement={placement}
+ role="status"
+ aria-busy="true"
+ aria-label={copy.loadingWorkbarLabel}
+ >
+ <div className="maka-lazy-fallback" data-surface="panel">
+ <Spinner size="sm" shade="subtle" label={copy.loadingWorkbar} />
+ </div>
+ </Card>
+ ))}
</div>
);
}
@@ -163,7 +174,15 @@ export function WorkbarHost({ model: props }: { model: WorkbarHostModel }) {
)}
{props.activeId && (
<div className="maka-workbar-layout-vars" style={style}>
- <Suspense fallback={<SessionWorkbarFallback />}>
+ <Suspense
+ fallback={
+ <SessionWorkbarFallback
+ hidden={props.hidden}
+ rightCollapsed={props.rightCollapsed}
+ bottomOpen={props.bottomOpen}
+ />
+ }
+ >
<WorkbarSurface
key={props.activeId}
sessionId={props.activeId}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org