fix(settings): govern the 外观 page structure, grouping, and copy - #2343
Merged
jackwener merged 1 commit intoAug 7, 2026
Merged
Conversation
ARE404
force-pushed
the
are404/feat-appearance-settings-refresh
branch
2 times, most recently
from
August 7, 2026 00:24
b2db810 to
13c598a
Compare
The 外观 page carried four leftovers from the moves that reshaped it — identity going to 通用 (P2-13), the Astryx open-group rebuild (apache#1972), and the settings-page kit (apache#1991). - Page root: `AppearanceSettingsPage` wrapped a `ThemeSettingsPage` that opened a `SettingsPage` of its own, so the page grid nested inside itself (two `.settingsPageStack` in the DOM). The page IS the theme page, as its own comment said, so it is now one component with one root. Same defect on 通用, where the identity block was a `*Page` rendered inside another page: it is a section of someone else's page and is now named, filed, and shaped as one (`personalization-settings-section.tsx`). - Grouping: the 14 option tiles were loose in the accessibility tree — the sections were unnamed landmarks and the visible 编辑器主题 / 产品色调 labels had no programmatic relationship to the grids they head. Sections now carry `titleId`, and each grid is a `role="group"` named by its label. - Copy: the nav description still advertised 界面语言 on 外观, a page that has not had it since P2-13; 通用, which does, never mentioned it. Both descriptions now say what their page holds. - Dead copy: `sections.paletteHelp` was defined in both locales and read by nobody, while the palette section reached into `appearance.persistenceHelp` for its lede. The palette section now takes its lede from `sections`, the same namespace the theme section above it uses, and the unread key is gone. `AppearanceSettingsPage` also stops taking a `settings` prop it only passed down one level to a component that never read it. Contract: `astryx-component-behavior` pins one page stack, the four labelledby anchors, three named groups, no 界面语言 on 外观, and that the identity block opens no page stack of its own. Verified: desktop typecheck; format:check; console/a11y/copy checks; dead-css; 1754 desktop tests; and both pages re-rendered in a real Electron fixture window (外观 unchanged apart from the two copy lines, 通用 pixel identical).
jackwener
force-pushed
the
are404/feat-appearance-settings-refresh
branch
from
August 7, 2026 15:46
13c598a to
6bba54a
Compare
jackwener
approved these changes
Aug 7, 2026
jackwener
left a comment
Member
There was a problem hiding this comment.
Adversarial review — approve after rebase
Rebased onto current main and resolved conflicts:
- settings-navigation-copy — kept PR copy (界面语言 on 通用, theme/palette on 外观) and preserved main's
projectsnav entries (zh + en). - astryx-component-behavior — kept main's
onboarding-hero.tsxpath and PR'sPersonalizationSettingsSectionexport.
Structure checks
- Single page root for 外观 (no nested
settingsPageStack) - Identity block is a
SettingsSectionon 通用, not its own page - Named groups + titleIds for theme/palette tiles
CustomPetSettingsSectionstill mounted on appearance after rebase
Validation
- desktop typecheck pass (after core/ui rebuild)
- astryx-component-behavior: 10/10 pass (incl. new appearance/identity contracts)
No blocking product issues. LGTM once CI is green.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The 外观 page carries four leftovers from the moves that reshaped it — identity going to 通用 (P2-13), the Astryx open-group rebuild (#1972), and the settings-page kit (#1991). None of them change what the page looks like; all four change what it is.
Page root
AppearanceSettingsPagewrapped aThemeSettingsPagethat opened aSettingsPageof its own, so the page grid nested inside itself — two.settingsPageStackin the rendered DOM. The page IS the theme page (its own comment says so), so it is now one component with one root.通用 had the same defect from the other side: the identity block was exported as
PersonalizationSettingsPagefromappearance-settings-page.tsxand rendered insideGeneralSettingsPage's ownSettingsPage. It is one section of someone else's page, so it is now named, filed, and shaped as one —personalization-settings-section.tsx, returning aSettingsSection.Grouping
The 14 option tiles were loose in the accessibility tree: the two
<section>s were unnamed landmarks (SettingsSectiontakes atitleIdfor exactly this and the page passed none), and the visible 编辑器主题 / 产品色调 labels had no programmatic relationship to the grids they head. Sections now carrytitleId; each grid is arole="group"named by the label above it.Copy
The nav description still advertised 界面语言 on 外观 — a page that has not had it since P2-13 — while 通用, which does have it, never mentioned it. Both descriptions now say what their page holds, zh and en.
sections.paletteHelpwas defined in both locales and read by nobody, while the palette section reached intoappearance.persistenceHelpfor its lede. The palette section now takes its lede fromsections, the same namespace the theme section above it uses, and the unread key is gone.AppearanceSettingsPagealso stops taking asettingsprop it only passed down one level to a component that never read it.Contract
astryx-component-behavior.test.tspins one page stack, the fouraria-labelledbyanchors, three named groups, no 界面语言 on 外观, and that the identity block opens no page stack of its own.Verification
npm --workspace @maka/desktop run typechecknpm run format:checknpm --workspace @maka/desktop run test:checks(console / a11y / copy)node scripts/check-dead-css.mjs --checksettings-appearance/settings-general, light and dark): 外观 unchanged apart from the two copy lines, 通用 pixel identical,.settingsPageStackcount 2 → 1 on each.Not in this PR
The palette picker's visual weaknesses are real but need a design conversation, so they are deliberately left alone: the swatches hardcode light-mode accents (
monois inverted in dark —oklch(0.30 0 0)previewed against a live dark accent ofoklch(0.92 0 0)), the tiles preview the accent but never the canvas, the theme mock is palette-blind, andcolumns={{minWidth:180}}leaves orphan rows at 5 and 6 items. Happy to take any of them as a follow-up.