Skip to content

fix(macos): order color swatches like web and fill the time list popover - #4725

Merged
tyler-dane merged 1 commit into
mainfrom
fix/macos-color-order-and-time-list
Oct 22, 2026
Merged

tyler-dane merged 1 commit into
mainfrom
fix/macos-color-order-and-time-list

Conversation

@tyler-dane

Copy link
Copy Markdown
Contributor

What and why

Refs #4331

Two gaps from the #4717 parity compare:

  • Color order. Web lists swatches in EventColorSlotSchema order (lavender, mint, plum, coral, gold, orange, blue, slate, indigo, green, red). The generated Swift EventColorSlot is alphabetical, so the same position, and the same pick key (from feat(macos): move between color swatches with arrows and pick keys like web #4714), chose a different color on macOS. EventColorSlot.webOrder now drives colorSwatchOptions, which feeds the swatch grid and the pick keys.
  • Time list popover. The list set a background on its own frame but left the popover's inset on the system material, which the capture drew as a thick black frame. .presentationBackground(theme.surfacePanelColor) fills it like the date popover. I dropped the inner clip and shadow because the popover already draws both.

Tests: EventColorSlotOrderTests (every slot once, lavender first) and EventFormColorSwatchKeysTests now pins pick key 1 to lavender.

Cloud session: no macOS runner or Swift toolchain here, so Swift tests and the capture run on CI only.

Verify

bun run verify --strict, bun cli contracts:swift --check, bun cli desktop:export --check

VERDICT: PASS


Generated by Claude Code

The generated EventColorSlot enum is alphabetical, so swatch positions and
pick keys named different colors than web's EventColorSlotSchema order.
The time list popover left the system material visible around the list,
which the parity capture drew as a black frame.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GKHjv2HDx1DFAnG4cfSxcr
@tyler-dane
tyler-dane marked this pull request as ready for review October 22, 2026 06:08
@tyler-dane tyler-dane added the agent-automerge Agent-loop finished; merge-guard may squash-merge label Oct 22, 2026 — with Claude
@tyler-dane
tyler-dane enabled auto-merge October 22, 2026 06:09
@tyler-dane tyler-dane added the parity-screenshots Run the web vs macOS parity screenshot workflow on this PR label Oct 22, 2026 — with Claude
@tyler-dane
tyler-dane added this pull request to the merge queue Oct 22, 2026
Merged via the queue into main with commit 4f16c8d Oct 22, 2026
40 checks passed
@tyler-dane
tyler-dane deleted the fix/macos-color-order-and-time-list branch October 22, 2026 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-automerge Agent-loop finished; merge-guard may squash-merge parity-screenshots Run the web vs macOS parity screenshot workflow on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants