CRT/storebound
1
0
Fork 0
Code Issues Pull requests Releases 1 Packages 1 Activity Actions

Desktop: tab row measures the room inside the sticky bar's padding (the More button was clipped); editor saves skip the in-app preview (their Review step already showed the dry run)

Browse source
This commit is contained in:
CRTkafa 2026-10-23 10:44:45 +08:00
parent 83bb9a621e
commit 26ebb64458
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/desktop/src/store.tsx
View file

@ -557,7 +557,8 @@ export interface ReadState<T> {
refresh: () => Promise<void>;
}
export interface WriteRun { method: string; args: Record<string, unknown>; title: string; done: string; after?: () => void }
/** preview: false when the screen already showed this dry run (the editors' Review step); the native dialog still follows. */
export interface WriteRun { method: string; args: Record<string, unknown>; title: string; done: string; after?: () => void; preview?: false }
/**
* Writes of one app folder: dry run, the native dialog that shows it (Apply / Cancel, or the owner action's own
@ -575,9 +576,11 @@ export function useWrite(projectId: string | null) {
const tid = d.toast({ id: job, kind: 'job', title: w.title, detail: t('write.dryRunning'), progress: null, job });
try {
// the in-app preview of the dry run first (readable, styled); the host's native dialog stays the real gate
const dry = await api.call<ToolResult>(w.method, projectId, { args: w.args }, job);
if (!dry.ok) { d.updateToast(tid, { kind: 'bad', title: t('write.dryFailed'), detail: withHint(failureText(dry)), progress: undefined, job: undefined }); return null; }
if (!(await askPreview(w.title, dry))) { d.updateToast(tid, { kind: 'info', title: t('write.notApplied'), detail: t('write.notAppliedDetail'), progress: undefined, job: undefined }); return null; }
if (w.preview !== false) {
const dry = await api.call<ToolResult>(w.method, projectId, { args: w.args }, job);
if (!dry.ok) { d.updateToast(tid, { kind: 'bad', title: t('write.dryFailed'), detail: withHint(failureText(dry)), progress: undefined, job: undefined }); return null; }
if (!(await askPreview(w.title, dry))) { d.updateToast(tid, { kind: 'info', title: t('write.notApplied'), detail: t('write.notAppliedDetail'), progress: undefined, job: undefined }); return null; }
}
const o = await api.writeWithConfirm(w.method, projectId, w.args, job);
if (o.stage === 'dry-run') d.updateToast(tid, { kind: 'bad', title: t('write.dryFailed'), detail: withHint(failureText(o.dryRun)), progress: undefined, job: undefined });
else if (o.stage === 'dialog') d.updateToast(tid, { kind: 'info', title: t('write.notApplied'), detail: t('write.notAppliedDetail'), progress: undefined, job: undefined });

2
apps/desktop/src/ui/Editor.tsx
View file

@ -260,7 +260,7 @@ export function EditBar({ project, area, data, files, onSaved }: { project: Proj
<button className="btn btn-sm btn-ghost" onClick={() => setReview(null)}>{t('ed.close')}</button>
<WriteButton run={w} primary icon="check" disabled={review.r.errors > 0 || !review.r.files.length}
hint={review.r.errors ? t('ed.fixFirst') : undefined}
w={{ method: 'project.edit', args: { ops: opsJson }, title: t('ed.save'), done: t('ed.saved'), after: () => { e.clear(project.id, area); setReview(null); onSaved?.(); } }}>{t('ed.save')}</WriteButton>
w={{ method: 'project.edit', args: { ops: opsJson }, preview: false, title: t('ed.save'), done: t('ed.saved'), after: () => { e.clear(project.id, area); setReview(null); onSaved?.(); } }}>{t('ed.save')}</WriteButton>
</div>
)}
</div>

6
apps/desktop/src/ui/ds.tsx
View file

@ -295,7 +295,11 @@ export function Tabs<T extends string>({ items, value, onChange, label, panelId
refs.current.forEach((b, i) => { if (b && b.offsetParent !== null) widths.current[i] = b.getBoundingClientRect().width; });
if (widths.current.length < items.length || widths.current.some(w => w === undefined)) { setShown(null); return; }
const cs = getComputedStyle(el);
const avail = (el.parentElement?.clientWidth ?? el.clientWidth) - parseFloat(cs.paddingLeft) - parseFloat(cs.paddingRight) - parseFloat(cs.borderLeftWidth) - parseFloat(cs.borderRightWidth);
// the row's room: the parent's content box (the sticky bar has its own padding) minus the row's padding and border
const par = el.parentElement;
const ps = par ? getComputedStyle(par) : null;
const box = par && ps ? par.clientWidth - parseFloat(ps.paddingLeft) - parseFloat(ps.paddingRight) : el.clientWidth;
const avail = box - parseFloat(cs.paddingLeft) - parseFloat(cs.paddingRight) - parseFloat(cs.borderLeftWidth) - parseFloat(cs.borderRightWidth) - 2;
const next = fitTabs(widths.current, avail, active, parseFloat(cs.columnGap) || 4, 150);
setShown(prev => (prev && prev.join() === next.join() ? prev : next.length === items.length ? null : next));
};