Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): 修复额度重置规则浮层并收紧弹窗布局

nana68ec6846c3e1
diff --git a/apps/desktop/scripts/fixtures/codex-reset/codex-reset-fixture.tsx b/apps/desktop/scripts/fixtures/codex-reset/codex-reset-fixture.tsx
index 5ee66c6ac8..04d5e7ac81 100644
--- a/apps/desktop/scripts/fixtures/codex-reset/codex-reset-fixture.tsx
+++ b/apps/desktop/scripts/fixtures/codex-reset/codex-reset-fixture.tsx
@@ -1,4 +1,7 @@
import { useState } from 'react';
+import * as Dialog from '@radix-ui/react-dialog';
+import { useTranslation } from 'react-i18next';
+import { X } from 'lucide-react';
import { mountPage } from '../../ui-page/harness';
import { CodexResetCredits } from '../../../src/renderer/components/status/CodexResetCredits';
import { DEFAULT_CODEX_RESET_AUTO_USE } from '../../../src/main/usage/codexResetAutoUse';
@@ -16,11 +19,31 @@ let snapshot: MobileCodexRateLimitsResult = {
resetOffer: { idempotencyKey: 'fixture-1', expiresAt: now / 1000 + 86400, validUntil: now + 600_000 },
autoUse: { accountKey: 'fixture-account', settings: { ...DEFAULT_CODEX_RESET_AUTO_USE }, customized: false, lastUsedAt: null },
};
-function Fixture({ embedded }: { embedded: boolean }) {
+function Fixture({ embedded, modal }: { embedded: boolean; modal: boolean }) {
+ const { t } = useTranslation();
const [value, setValue] = useState(snapshot);
+ const content = <CodexResetCredits variant={embedded ? 'embedded' : 'dialog'} snapshot={value} busy={false} canReset onReset={() => {}}
+ onChanged={() => setValue({ ...snapshot })} />;
+ // Regression: TodaySpendChip hosts this list in a modal. The standalone fixture cannot
+ // detect a rules portal hidden under that modal's scrim; exercise real pointer hits here.
+ if (modal) return <Dialog.Root defaultOpen>
+ <Dialog.Portal>
+ <Dialog.Overlay className="modal-scrim fixed inset-0 z-[10000]" />
+ <Dialog.Content aria-describedby={undefined} onPointerDownOutside={event => event.preventDefault()}
+ className="modal-panel fixed left-1/2 top-1/2 z-[10000] w-[400px] max-w-[calc(100vw-32px)] -translate-x-1/2 -translate-y-1/2 p-4">
+ <Dialog.Title className="sr-only">{t('codexResets.title')}</Dialog.Title>
+ <div className="max-h-[60vh] overflow-y-auto">{content}</div>
+ <Dialog.Close asChild>
+ <button type="button" aria-label={t('common.dismiss')}
+ className="absolute right-3 top-3 flex h-8 w-8 items-center justify-center rounded-full text-[var(--confirm-desc)] transition-colors hover:bg-[var(--surface-hover)] hover:text-[var(--confirm-title)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]">
+ <X className="h-4 w-4" aria-hidden="true" />
+ </button>
+ </Dialog.Close>
+ </Dialog.Content>
+ </Dialog.Portal>
+ </Dialog.Root>;
return <main className="mx-auto w-full max-w-[580px] p-4"><div className="rounded-xl border border-[var(--border-default)] bg-[var(--bg-primary)] p-4">
- <CodexResetCredits variant={embedded ? 'embedded' : 'dialog'} snapshot={value} busy={false} canReset onReset={() => {}}
- onChanged={() => setValue({ ...snapshot })} />
+ {content}
</div></main>;
}
void mountPage({
@@ -29,5 +52,5 @@ void mountPage({
settings: patch === null ? { ...DEFAULT_CODEX_RESET_AUTO_USE } : { ...snapshot.autoUse!.settings, ...patch } } };
return snapshot;
} } } },
- render: ctx => <Fixture embedded={ctx.case === 'embedded'} />,
+ render: ctx => <Fixture embedded={ctx.case === 'embedded'} modal={ctx.case === 'modal'} />,
});
diff --git a/apps/desktop/scripts/fixtures/codex-reset/ui-page.mjs b/apps/desktop/scripts/fixtures/codex-reset/ui-page.mjs
index 6bd0d8aa99..90986c2a02 100644
--- a/apps/desktop/scripts/fixtures/codex-reset/ui-page.mjs
+++ b/apps/desktop/scripts/fixtures/codex-reset/ui-page.mjs
@@ -3,7 +3,11 @@ export default {
name: 'codex-reset', entry: './codex-reset-fixture.tsx', viewport: { width: 700, height: 650 },
real: 'CodexResetCredits, CodexResetAutoUseControl, production controls, five locales and themes',
notCovered: 'Fixture settings RPC; actual redemption, account authentication, persistence and native mobile runtime are not exercised here',
- cases: { default: { about: 'Manual cards with compact automatic rules' }, embedded: { about: 'Collapsed provider card entry' } },
+ cases: {
+ default: { about: 'Manual cards with compact automatic rules' },
+ embedded: { about: 'Collapsed provider card entry' },
+ modal: { about: 'Rules and nested selects remain clickable above the usage reset dialog' },
+ },
async check(page, ui) {
await page.getByRole('button', { name: await ui.t('codexResets.autoUse.rules') }).click();
await page.getByRole('combobox', { name: await ui.t('codexResets.autoUse.resetDistance') }).waitFor();
diff --git a/apps/desktop/src/renderer/components/status/CodexResetAutoUseControl.tsx b/apps/desktop/src/renderer/components/status/CodexResetAutoUseControl.tsx
index 88e1209e44..4fa273f289 100644
--- a/apps/desktop/src/renderer/components/status/CodexResetAutoUseControl.tsx
+++ b/apps/desktop/src/renderer/components/status/CodexResetAutoUseControl.tsx
@@ -52,7 +52,8 @@ export function CodexResetAutoUseControl({ state, providerId, onChanged }: {
<Button variant="secondary" tone="quiet" size="md" compact aria-label={label('rules')}><ChevronDown className="h-3.5 w-3.5" /></Button>
</PopoverTrigger>
</div>
- <PopoverContent align="end" className="w-80 max-w-[calc(100vw-32px)] space-y-4 text-13">
+ {/* The usage dialog is at 10000; keep rules above it and below Select's 10010. */}
+ <PopoverContent align="end" className="z-[10001] w-80 max-w-[calc(100vw-32px)] space-y-4 text-13">
<div className="text-14 font-medium text-[var(--text-primary)]">{label('rules')}</div>
<div className="space-y-2">
<label className="flex items-start gap-2 text-[var(--text-primary)]">
diff --git a/apps/desktop/src/renderer/components/status/CodexResetCredits.tsx b/apps/desktop/src/renderer/components/status/CodexResetCredits.tsx
index 304591ca12..3c28b4cda7 100644
--- a/apps/desktop/src/renderer/components/status/CodexResetCredits.tsx
+++ b/apps/desktop/src/renderer/components/status/CodexResetCredits.tsx
@@ -124,9 +124,8 @@ export function CodexResetCredits({ snapshot, busy, canReset, canRetry = false,
<>
<div className="flex items-center justify-between gap-3 pr-8">
<h3 className="text-18 font-medium text-[var(--confirm-title)]">{t('codexResets.title')}</h3>
- {count}
+ {snapshot?.autoUse && onChanged && <CodexResetAutoUseControl key={`${providerId}:${snapshot.autoUse.accountKey}`} state={snapshot.autoUse} providerId={providerId} onChanged={onChanged} />}
</div>
- {snapshot?.autoUse && onChanged && <div className="mt-3 flex justify-end"><CodexResetAutoUseControl key={`${providerId}:${snapshot.autoUse.accountKey}`} state={snapshot.autoUse} providerId={providerId} onChanged={onChanged} /></div>}
{content}
</>
)}
diff --git a/apps/desktop/src/renderer/components/status/__tests__/CodexResetCredits.test.tsx b/apps/desktop/src/renderer/components/status/__tests__/CodexResetCredits.test.tsx
index fb1b5ae7de..814bdb4efa 100644
--- a/apps/desktop/src/renderer/components/status/__tests__/CodexResetCredits.test.tsx
+++ b/apps/desktop/src/renderer/components/status/__tests__/CodexResetCredits.test.tsx
@@ -79,7 +79,6 @@ describe('available reset list', () => {
it('shows a count-only response honestly without inventing rows', () => {
mocks.snapshot!.rateLimitResetCredits!.credits = null;
render(<CodexResetCredits variant="dialog" snapshot={mocks.snapshot} busy={mocks.busy} canReset={mocks.canReset} onReset={mocks.reset} />);
- expect(screen.getByText('codexResets.available 2')).toBeTruthy();
expect(screen.getByText('codexResets.detailsUnavailable')).toBeTruthy();
expect(screen.queryByRole('list')).toBeNull();
});
@@ -97,7 +96,7 @@ describe('available reset list', () => {
it('shows zero availability without a reset action', () => {
mocks.snapshot!.rateLimitResetCredits = { availableCount: 0, credits: [] };
render(<CodexResetCredits variant="dialog" snapshot={mocks.snapshot} busy={mocks.busy} canReset={mocks.canReset} onReset={mocks.reset} />);
- expect(screen.getByText('codexResets.available 0')).toBeTruthy();
+ expect(screen.getByText('codexResets.noCredit')).toBeTruthy();
expect(screen.queryByRole('button')).toBeNull();
});