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/20 10:32:21 UTC

(maka) branch main updated: fix(desktop): hide workbar chrome behind settings (#3260)

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 9d0c9cba3 fix(desktop): hide workbar chrome behind settings (#3260)
9d0c9cba3 is described below

commit 9d0c9cba34ac76148feb11fa32df6406baedec41
Author: yum <ya...@chihum.dev>
AuthorDate: Thu Aug 20 18:32:16 2026 +0800

    fix(desktop): hide workbar chrome behind settings (#3260)
    
    Generated-by: Codex
---
 apps/desktop/e2e/settings.spec.ts             | 28 +++++++++++++++++++++++++++
 apps/desktop/src/renderer/session-workbar.tsx |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/e2e/settings.spec.ts b/apps/desktop/e2e/settings.spec.ts
index 65c675f11..286d4d7d2 100644
--- a/apps/desktop/e2e/settings.spec.ts
+++ b/apps/desktop/e2e/settings.spec.ts
@@ -19,3 +19,31 @@ test('opening settings commits an active titlebar rename', async ({ window: page
 
   await expect(identity).toContainText('renamed before settings');
 });
+
+test('settings hides expanded workbar chrome and restores it on close', async ({
+  window: page,
+}) => {
+  const composer = page.locator(COMPOSER_INPUT);
+  await composer.fill('create a session with an expanded workbar');
+  await composer.press('Enter');
+
+  await page.getByRole('button', { name: '展开任务工作栏' }).click();
+  const workbar = page.locator('.maka-session-workbar[data-placement="right"]');
+  const workbarToolbar = workbar.getByRole('toolbar', { name: '任务工作栏标签' });
+  await expect(workbarToolbar).toBeVisible();
+  await expect(workbarToolbar.getByRole('button', { name: '打开工作栏标签' })).toBeVisible();
+  await expect(workbarToolbar.getByRole('button', { name: '收起任务工作栏' })).toBeVisible();
+  await page
+    .getByRole('button', { name: /待办.*查看和维护这个任务的待办台账/ })
+    .click();
+  const taskTab = workbarToolbar.getByRole('tab', { name: '待办' });
+  await expect(taskTab).toBeVisible();
+
+  await page.getByRole('button', { name: '设置' }).click();
+  await expect(page.getByRole('main', { name: '设置内容' })).toBeVisible();
+  await expect(workbar).not.toBeVisible();
+
+  await page.keyboard.press('Escape');
+  await expect(workbarToolbar).toBeVisible();
+  await expect(taskTab).toBeVisible();
+});
diff --git a/apps/desktop/src/renderer/session-workbar.tsx b/apps/desktop/src/renderer/session-workbar.tsx
index ae0f2a6dc..1b54d6e2e 100644
--- a/apps/desktop/src/renderer/session-workbar.tsx
+++ b/apps/desktop/src/renderer/session-workbar.tsx
@@ -703,7 +703,8 @@ export function SessionWorkbar(props: {
         const activeTab = panel.tabs.find((tab) => tab.id === panel.activeTabId);
         const showingLauncher = panel.launcherOpen || !activeTab;
         const visible =
-          placement === 'right' ? !props.rightCollapsed : props.bottomOpen;
+          !props.hidden &&
+          (placement === 'right' ? !props.rightCollapsed : props.bottomOpen);
         return (
           <Card
             key={placement}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org