diff --git a/.changeset/fix-keybinding-hint-mod-order.md b/.changeset/fix-keybinding-hint-mod-order.md new file mode 100644 index 00000000000..811bde487bd --- /dev/null +++ b/.changeset/fix-keybinding-hint-mod-order.md @@ -0,0 +1,5 @@ +--- +'@primer/react': patch +--- + +KeybindingHint: Sort Mod alongside Command on Apple platforms and Control elsewhere in displayed shortcuts and accessible descriptions. diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-colorblind-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-dimmed-linux.png index c5e176cd37c..db6c0f3561c 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-high-contrast-linux.png index d735b86bcb7..468f872ed16 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-tritanopia-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-colorblind-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-high-contrast-linux.png index 7aabf67f3ff..2f4ed2bc825 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-tritanopia-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Condensed-light-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-colorblind-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-dimmed-linux.png index c5e176cd37c..db6c0f3561c 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-high-contrast-linux.png index d735b86bcb7..468f872ed16 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-tritanopia-linux.png index 2c3a727a89d..d89b0a3ffce 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-colorblind-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-high-contrast-linux.png index 7aabf67f3ff..2f4ed2bc825 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-tritanopia-linux.png index 8a58c7fc66e..283397dd823 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Default-light-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-colorblind-linux.png index 5f51ac85d02..4f6ca058009 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-dimmed-linux.png index f88b8b0c6b8..dd99e6119fa 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-high-contrast-linux.png index 699b81f1b50..25476b8c229 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-linux.png index 5f51ac85d02..4f6ca058009 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-tritanopia-linux.png index 5f51ac85d02..4f6ca058009 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-colorblind-linux.png index 30ebc047bba..8219522f4fc 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-high-contrast-linux.png index ac4cfcc530c..8831e01ba8d 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-linux.png index 30ebc047bba..8219522f4fc 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-tritanopia-linux.png index 30ebc047bba..8219522f4fc 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Full-light-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-colorblind-linux.png index 8a29891eb45..2815846a293 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-dimmed-linux.png index 999b81c521f..8e4cccbcd0b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-high-contrast-linux.png index 39adaf159fb..0575681ea0b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-linux.png index 8a29891eb45..2815846a293 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-tritanopia-linux.png index 8a29891eb45..2815846a293 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-colorblind-linux.png index aa569ca5cab..70545aa3ece 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-high-contrast-linux.png index 29e67e2b80d..e98adfd1232 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-linux.png index aa569ca5cab..70545aa3ece 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-tritanopia-linux.png index aa569ca5cab..70545aa3ece 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Emphasis-light-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-colorblind-linux.png index 62e45c3e73c..1dad9822dcf 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-dimmed-linux.png index 2b5aaba1516..bedbc4b26b7 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-high-contrast-linux.png index 4b158640b67..8e0dcd795ae 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-linux.png index 729826816c7..602cf6d4b14 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-tritanopia-linux.png index 62e45c3e73c..1dad9822dcf 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-colorblind-linux.png index b4af3fb9cd2..a7e094fd6cc 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-high-contrast-linux.png index 98475f91ea2..bb9da1f7a6d 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-linux.png index defcf074475..172ae15d577 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-tritanopia-linux.png index b4af3fb9cd2..a7e094fd6cc 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-On-Primary-light-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-colorblind-linux.png index dd877b16c13..0ff87c2387b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-dimmed-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-dimmed-linux.png index 16aae3991bc..cf69e7dcc5b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-dimmed-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-dimmed-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-high-contrast-linux.png index f30a0533cfc..1927a05942c 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-linux.png index dd877b16c13..0ff87c2387b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-tritanopia-linux.png index dd877b16c13..0ff87c2387b 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-dark-tritanopia-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-colorblind-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-colorblind-linux.png index 48e85c8608c..011d5b61537 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-colorblind-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-colorblind-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-high-contrast-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-high-contrast-linux.png index 277dbd4e807..a3479b0b775 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-high-contrast-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-high-contrast-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-linux.png index 48e85c8608c..011d5b61537 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-linux.png differ diff --git a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-tritanopia-linux.png b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-tritanopia-linux.png index 48e85c8608c..011d5b61537 100644 Binary files a/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-tritanopia-linux.png and b/.playwright/snapshots/components/KeybindingHint.test.ts-snapshots/KeybindingHint-Small-light-tritanopia-linux.png differ diff --git a/packages/react/src/KeybindingHint/KeybindingHint.test.tsx b/packages/react/src/KeybindingHint/KeybindingHint.test.tsx index 6144a7ab286..636a47bf682 100644 --- a/packages/react/src/KeybindingHint/KeybindingHint.test.tsx +++ b/packages/react/src/KeybindingHint/KeybindingHint.test.tsx @@ -4,6 +4,7 @@ import {page} from 'vitest/browser' import {KeybindingHint, getAccessibleKeybindingHintString} from '../KeybindingHint' import {implementsClassName} from '../utils/testing' +import {PlatformOverrideProvider, type Platform} from './platform' describe('KeybindingHint', () => { implementsClassName(props => ) @@ -50,6 +51,27 @@ describe('KeybindingHint', () => { expect(names).toEqual(namesInOrder) }) + it.each<{ + platform: Platform + expected: string[] + }>([ + {platform: 'apple', expected: ['Control', 'Command', 'Command', 'Option', 'Shift', 'K']}, + {platform: 'windows', expected: ['Control', 'Control', 'Windows', 'Alt', 'Shift', 'K']}, + {platform: 'other', expected: ['Control', 'Control', 'Meta', 'Alt', 'Shift', 'K']}, + ])('sorts Mod like its resolved modifier on $platform', ({platform, expected}) => { + render( + + + , + ) + const names = page + .getByText(/^(Command|Control|Windows|Meta|Alt|Option|Shift|K)$/) + .elements() + .filter(el => el.hasAttribute('aria-hidden')) + .map(el => el.textContent) + expect(names).toEqual(expected) + }) + it('capitalizes other keys', async () => { render() for (const key of ['⌃', 'A']) await expect.element(page.getByText(key, {exact: true})).toBeInTheDocument() @@ -103,6 +125,17 @@ describe('getAccessibleKeybindingHintString', () => { it('sorts modifiers in standard order', () => expect(getAccessibleKeybindingHintString('Alt+Shift+Command+%', false)).toBe('alt shift command percent')) + it.each<{ + platform: Platform + expected: string + }>([ + {platform: 'apple', expected: 'control command command option shift k then command shift p'}, + {platform: 'windows', expected: 'control control Windows alt shift k then control shift p'}, + {platform: 'other', expected: 'control control meta alt shift k then control shift p'}, + ])('sorts Mod in accessible sequences on $platform', ({platform, expected}) => { + expect(getAccessibleKeybindingHintString('Meta+Shift+mOd+Alt+Control+K Shift+Mod+P', platform)).toBe(expected) + }) + it('joins chords in a sequence with "then"', () => expect(getAccessibleKeybindingHintString('Alt+9 x y', false)).toBe('alt 9 then x then y')) diff --git a/packages/react/src/KeybindingHint/components/Chord.tsx b/packages/react/src/KeybindingHint/components/Chord.tsx index b07f8c9c68a..dd2da3c5a07 100644 --- a/packages/react/src/KeybindingHint/components/Chord.tsx +++ b/packages/react/src/KeybindingHint/components/Chord.tsx @@ -5,27 +5,31 @@ import {Key} from './Key' import {clsx} from 'clsx' import classes from './Chord.module.css' import {splitChord} from './utils' +import {usePlatform} from '../platform' -export const Chord = ({keys, format = 'condensed', variant = 'normal', size = 'normal'}: KeybindingHintProps) => ( - - {splitChord(keys).map((k, i) => ( - - {i > 0 && format === 'full' ? ( - + // hiding the plus sign helps screen readers be more concise - ) : ( - ' ' // space is nonvisual due to flex layout but critical for labelling / screen readers - )} +export const Chord = ({keys, format = 'condensed', variant = 'normal', size = 'normal'}: KeybindingHintProps) => { + const platform = usePlatform() + return ( + + {splitChord(keys, platform).map((k, i) => ( + + {i > 0 && format === 'full' ? ( + + // hiding the plus sign helps screen readers be more concise + ) : ( + ' ' // space is nonvisual due to flex layout but critical for labelling / screen readers + )} - - - ))} - -) + + + ))} + + ) +} diff --git a/packages/react/src/KeybindingHint/components/utils.ts b/packages/react/src/KeybindingHint/components/utils.ts index 69785b9ba17..f10a51480e8 100644 --- a/packages/react/src/KeybindingHint/components/utils.ts +++ b/packages/react/src/KeybindingHint/components/utils.ts @@ -15,22 +15,23 @@ const keySortPriorities: Partial> = { function: 6, } -const keySortPriority = (priority: string) => keySortPriorities[priority] ?? Infinity - -const compareLowercaseKeys = (a: string, b: string) => keySortPriority(a) - keySortPriority(b) +const keySortPriority = (key: string, platform: Platform) => { + const resolvedKey = key === 'mod' ? (platform === 'apple' ? 'meta' : 'control') : key + return keySortPriorities[resolvedKey] ?? Infinity +} /** Split and sort the chord keys in standard order. */ -export const splitChord = (chord: string) => +export const splitChord = (chord: string, platform: Platform) => chord .split('+') .map(k => k.toLowerCase()) - .sort(compareLowercaseKeys) + .sort((a, b) => keySortPriority(a, platform) - keySortPriority(b, platform)) const splitSequence = (sequence: string) => sequence.split(' ') /** Plain string version of `Chord` for use in `aria` string attributes. */ export const accessibleChordString = (chord: string, platform: Platform) => - splitChord(chord) + splitChord(chord, platform) .map(key => accessibleKeyName(key, platform)) .join(' ') diff --git a/packages/react/src/KeybindingHint/props.ts b/packages/react/src/KeybindingHint/props.ts index 7df8f7ebd21..a0df592d332 100644 --- a/packages/react/src/KeybindingHint/props.ts +++ b/packages/react/src/KeybindingHint/props.ts @@ -13,6 +13,7 @@ export interface KeybindingHintProps { * represents "a then b". To represent the " " key, use "Space". * * The fake key name "Mod" can be used to represent "Command" on macOS and "Control" on other platforms. + * It is sorted alongside the corresponding platform modifier. * * See https://github.com/github/hotkey for format details. */