You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by xx...@apache.org on 2026/10/19 08:35:39 UTC

(maka) branch feat/assistant-web-chat updated: fix(assistant): use Astryx buttons in the task float

This is an automated email from the ASF dual-hosted git repository.

xxhZs pushed a commit to branch feat/assistant-web-chat
in repository https://gitbox.apache.org/repos/asf/maka.git


The following commit(s) were added to refs/heads/feat/assistant-web-chat by this push:
     new 5fab9edb6e fix(assistant): use Astryx buttons in the task float
5fab9edb6e is described below

commit 5fab9edb6ee0b7552feb87b03ac52c8f56d17b14
Author: xxhZs <84...@users.noreply.github.com>
AuthorDate: Mon Oct 19 16:35:33 2026 +0800

    fix(assistant): use Astryx buttons in the task float
---
 .../src/renderer/features/personal-assistant/task-float.css   |  6 +++---
 .../src/renderer/features/personal-assistant/task-float.tsx   | 11 ++++++-----
 docs/astryx-surface-file-inventory.md                         |  5 ++++-
 docs/astryx-surface-file-inventory.paths                      |  3 +++
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/desktop/src/renderer/features/personal-assistant/task-float.css b/apps/desktop/src/renderer/features/personal-assistant/task-float.css
index e3f42bcf31..ac9a5c72d5 100644
--- a/apps/desktop/src/renderer/features/personal-assistant/task-float.css
+++ b/apps/desktop/src/renderer/features/personal-assistant/task-float.css
@@ -30,7 +30,7 @@
 .assistant-task-float header button { display: grid; place-items: center; width: 24px; height: 24px; color: var(--muted-foreground); }
 .assistant-task-counts { padding: 0 11px 9px; font-size: 11px; line-height: 17px; color: var(--muted-foreground); }
 .assistant-task-list { padding: 0 10px; }
-.assistant-task-float .assistant-task-row { display: block; width: 100%; padding: 10px 1px; text-align: start; border-top: 1px solid var(--border); }
+.assistant-task-float .assistant-task-row { display: block; height: auto; width: 100%; padding: 10px 1px; text-align: start; border-top: 1px solid var(--border); }
 .assistant-task-row:hover { background: var(--muted); }
 .assistant-task-heading { display: flex; align-items: baseline; gap: 8px; }
 .assistant-task-heading strong { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 13px; line-height: 20px; font-weight: 550; }
@@ -54,8 +54,8 @@
 .assistant-task-float nav { display: flex; align-items: center; gap: 3px; }
 .assistant-task-float nav button { display: grid; place-items: center; width: 28px; height: 25px; }
 .assistant-task-float.is-collapsed { width: 208px; border-radius: 13px; }
-.assistant-task-pill { display: flex; align-items: center; gap: 7px; width: 100%; padding: 9px 10px; font-size: 11px !important; }
-.assistant-task-pill > span:nth-child(2) { flex: 1; text-align: start; }
+.assistant-task-float .assistant-task-pill { height: auto; display: flex; align-items: center; gap: 7px; width: 100%; padding: 9px 10px; font-size: 11px !important; }
+.assistant-task-pill > span:first-child > span:nth-child(2) { flex: 1; min-width: 0; text-align: start; }
 .assistant-task-detail { border-top: 1px solid var(--border); padding: 8px 1px 12px; max-height: 280px; overflow-y: auto; overflow-wrap: anywhere; }
 .assistant-task-detail strong { display: block; font-size: 13px; margin-top: 8px; }
 .assistant-task-detail small { display: block; color: var(--muted-foreground); font-size: 11px; margin-top: 4px; }
diff --git a/apps/desktop/src/renderer/features/personal-assistant/task-float.tsx b/apps/desktop/src/renderer/features/personal-assistant/task-float.tsx
index fa110e05b1..225fd938d2 100644
--- a/apps/desktop/src/renderer/features/personal-assistant/task-float.tsx
+++ b/apps/desktop/src/renderer/features/personal-assistant/task-float.tsx
@@ -18,6 +18,7 @@
  */
 
 import { useEffect, useState } from 'react';
+import { Button } from '@astryxdesign/core/Button';
 import { useUiLocale } from '@maka/ui';
 import { ChevronLeft, ChevronRight, Minus, ChevronDown, ArrowLeft } from '@maka/ui/icons';
 import { usePersonalAssistantServices } from './services.js';
@@ -50,16 +51,16 @@ export function PersonalAssistantTaskFloat({ sessionId }: { sessionId: string })
   if (!tasks.length && !offline) return null;
   const time = (task: FloatTask) => task.updatedAt ? new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit' }).format(task.updatedAt) : '—';
   return <aside className={`assistant-task-float${expanded ? '' : ' is-collapsed'}`} aria-label={copy.tasks}>
-    {!expanded ? <button className="assistant-task-pill" onClick={() => setExpanded(true)} aria-label={`${copy.expand}: ${countText}`}><span className="assistant-task-brand">m</span><span>{countText}</span><ChevronDown size={14} /></button> : <>
-      <header><span className="assistant-task-brand">m</span><strong>Maka</strong><button onClick={() => setExpanded(false)} aria-label={copy.collapse} title={copy.collapse}><Minus size={15} /></button></header>
+    {!expanded ? <Button variant="ghost" className="assistant-task-pill" onClick={() => setExpanded(true)} aria-label={`${copy.expand}: ${countText}`} label={countText} icon={<span className="assistant-task-brand">m</span>} endContent={<ChevronDown size={14} />} /> : <>
+      <header><span className="assistant-task-brand">m</span><strong>Maka</strong><Button variant="ghost" size="sm" isIconOnly label={copy.collapse} onClick={() => setExpanded(false)} tooltip={copy.collapse} icon={<Minus size={15} />} /></header>
       <div className="assistant-task-counts" role="status">{countText}</div>
       <div className="assistant-task-list">
-        {offline ? <p className="assistant-task-empty">{copy.offline}</p> : selected ? <div className="assistant-task-detail"><button className="assistant-task-back" onClick={() => setSelectedId(null)}><ArrowLeft size={12} />{copy.back}</button><strong>{selected.title}</strong><small>{copy.phase[selected.phase]} · {time(selected)}</small><p>{selected.progress}</p></div> : !visibleTasks.length ? <p className="assistant-task-empty">{copy.empty}</p> : visibleTasks.slice(currentPage * 3, cur [...]
+        {offline ? <p className="assistant-task-empty">{copy.offline}</p> : selected ? <div className="assistant-task-detail"><Button variant="ghost" size="sm" className="assistant-task-back" onClick={() => setSelectedId(null)} label={copy.back} icon={<ArrowLeft size={12} />} /><strong>{selected.title}</strong><small>{copy.phase[selected.phase]} · {time(selected)}</small><p>{selected.progress}</p></div> : !visibleTasks.length ? <p className="assistant-task-empty">{copy.empty}</p> : visib [...]
           <span className="assistant-task-heading"><strong title={task.title}>{task.title}</strong><time dateTime={task.updatedAt ? new Date(task.updatedAt).toISOString() : undefined} title={task.updatedAt ? `${copy.updated}: ${new Date(task.updatedAt).toLocaleString(locale)}` : copy.unknown}>{time(task)}</time></span>
           <span className={`assistant-task-progress is-${task.phase}`}><i aria-hidden="true" /><span title={`${copy.phase[task.phase]}${task.progress ? ` · ${task.progress}` : ''}`}><b>{copy.phase[task.phase]}</b>{task.progress ? ` · ${task.progress}` : ''}</span></span>
-        </button>)}
+        </Button>)}
       </div>
-      {!selected && <footer><button className="assistant-task-completed-toggle" aria-pressed={showArchived} onClick={() => { setShowArchived(!showArchived); setPage(0); setSelectedId(null); }}>{showArchived ? copy.hideArchived : copy.showArchived}</button><nav aria-label={copy.tasks}><button aria-label={copy.previous} disabled={currentPage === 0} onClick={() => setPage(currentPage - 1)}><ChevronLeft size={13} /></button><span>{currentPage + 1}/{pages}</span><button aria-label={copy.next} [...]
+      {!selected && <footer><Button variant="ghost" size="sm" label={showArchived ? copy.hideArchived : copy.showArchived} className="assistant-task-completed-toggle" aria-pressed={showArchived} onClick={() => { setShowArchived(!showArchived); setPage(0); setSelectedId(null); }} /><nav aria-label={copy.tasks}><Button variant="ghost" size="sm" isIconOnly label={copy.previous} isDisabled={currentPage === 0} onClick={() => setPage(currentPage - 1)} icon={<ChevronLeft size={13} />} /><span>{ [...]
     </>}
   </aside>;
 }
diff --git a/docs/astryx-surface-file-inventory.md b/docs/astryx-surface-file-inventory.md
index afff12dd5d..68f2bfe159 100644
--- a/docs/astryx-surface-file-inventory.md
+++ b/docs/astryx-surface-file-inventory.md
@@ -6,7 +6,7 @@ Generated against `@astryxdesign/core@0.6.3` (195 component exports).
 
 Wiki bar: Design Conventions · API Use-the-System · Theming · Container Padding.
 
-**Totals:** 345 files — blocker 0, reimplementation 0, polish 6, aligned 339.
+**Totals:** 348 files — blocker 0, reimplementation 0, polish 6, aligned 342.
 
 ## Exclusions (explicit)
 
@@ -104,6 +104,9 @@ Wiki bar: Design Conventions · API Use-the-System · Theming · Container Paddi
 | `apps/desktop/src/renderer/features/personal-assistant/original-reader.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
 | `apps/desktop/src/renderer/features/personal-assistant/original-reader.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
 | `apps/desktop/src/renderer/features/personal-assistant/personal-assistant.css` | styles | n/a (css) | off-rhythm control height 30px (Design size) | polish |
+| `apps/desktop/src/renderer/features/personal-assistant/task-float.css` | styles | n/a (css) | aligned — no off-rhythm control heights flagged | aligned |
+| `apps/desktop/src/renderer/features/personal-assistant/task-float.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
+| `apps/desktop/src/renderer/features/personal-assistant/task-layout.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/personal-assistant/typing.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/runtime-host-management/services-context.tsx` | other | none | aligned — no raw controls; no Astryx JSX usage | aligned |
 | `apps/desktop/src/renderer/features/runtime-host-management/ui/peer-mesh-peer-id-button.tsx` | other | Button | aligned — uses Astryx (Button) | aligned |
diff --git a/docs/astryx-surface-file-inventory.paths b/docs/astryx-surface-file-inventory.paths
index a2568a2bc8..a6c19dce12 100644
--- a/docs/astryx-surface-file-inventory.paths
+++ b/docs/astryx-surface-file-inventory.paths
@@ -73,6 +73,9 @@ apps/desktop/src/renderer/features/personal-assistant/chat-presentation.tsx
 apps/desktop/src/renderer/features/personal-assistant/original-reader.css
 apps/desktop/src/renderer/features/personal-assistant/original-reader.tsx
 apps/desktop/src/renderer/features/personal-assistant/personal-assistant.css
+apps/desktop/src/renderer/features/personal-assistant/task-float.css
+apps/desktop/src/renderer/features/personal-assistant/task-float.tsx
+apps/desktop/src/renderer/features/personal-assistant/task-layout.tsx
 apps/desktop/src/renderer/features/personal-assistant/typing.tsx
 apps/desktop/src/renderer/features/runtime-host-management/services-context.tsx
 apps/desktop/src/renderer/features/runtime-host-management/ui/peer-mesh-peer-id-button.tsx


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