Skip to content

refactor(settings): consolidate per-page skeletons and extract page helpers #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astro-Han merged 3 commits into from
Jul 8, 2026
Merged

refactor(settings): consolidate per-page skeletons and extract page helpers #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
219fdfb
refactor(settings): unify per-page loading skeletons onto SettingsSke…
Astro-Han Jul 8, 2026
1b5fb35
refactor(settings): extract memory page label/format helpers to own m…
Astro-Han Jul 8, 2026
4438171
refactor(settings): extract WeChat login modals and fields to own module
Astro-Han Jul 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/desktop/src/main/__tests__/settings-app-info-contract.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Settings app-info loading contract', () => {
);
assert.match(
aboutBlock,
/if \(!info && !infoError\) \{[\s\S]*aria-label="正在加载关于页"/,
/if \(!info && !infoError\) \{[\s\S]*label="正在加载关于页"/,
'About page skeleton should only render while no error has occurred',
);
assert.match(
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/src/main/__tests__/settings-contract-source-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ const sourcePaths = [
'appearance-settings-page.tsx',
'web-search-settings-page.tsx',
'memory-settings-page.tsx',
'memory-settings-labels.ts',
'settings-error-copy.ts',
'general-settings-page.tsx',
'open-gateway-settings-page.tsx',
'bot-chat-settings-page.tsx',
'bot-wechat-login.tsx',
'usage-settings-page.tsx',
'settings-metric-card.tsx',
'settings-status-badge.ts',
Expand Down
14 changes: 9 additions & 5 deletions apps/desktop/src/renderer/settings/about-settings-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Sparkles } from '@maka/ui/icons';
import { Button, useToast } from '@maka/ui';
import { SettingsRows, SettingRow } from './settings-rows';
import { settingsActionErrorMessage } from './settings-error-copy';
import { SettingsSkeletonStack } from './settings-skeleton';

type AppInfo = Awaited<ReturnType<typeof window.maka.app.info>>;

Expand Down Expand Up @@ -47,11 +48,14 @@ export function AboutSettingsPage() {

if (!info && !infoError) {
return (
<div className="maka-skeleton-stack" aria-busy="true" aria-label="正在加载关于页">
<div className="maka-skeleton maka-skeleton-line" data-size="lg" style={{ width: '38%' }} />
<div className="maka-skeleton maka-skeleton-line" style={{ width: '70%' }} />
<div className="maka-skeleton maka-skeleton-line" style={{ width: '52%' }} />
</div>
<SettingsSkeletonStack
label="正在加载关于页"
lines={[
{ width: '38%', size: 'lg' },
{ width: '70%' },
{ width: '52%' },
]}
/>
);
}

Expand Down
Loading
Loading