Skip to content

Commit 2a50f17

Browse files
authored
Expose all macOS alias color tokens through the theme (#3016)
* Expose all macOS alias color tokens through the theme * Update snapshots * Change files
1 parent 542f92b commit 2a50f17

File tree

3 files changed

+57
-118
lines changed

3 files changed

+57
-118
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Expose all macOS alias color tokens through the theme",
4+
"packageName": "@fluentui-react-native/apple-theme",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/theming/apple-theme/src/__tests__/__snapshots__/apple-theme.test.ts.snap

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,16 @@ exports[`createAppleTheme test 1`] = `
191191
"compoundBrandStroke1": "#0078d4",
192192
"compoundBrandStroke1Hover": "#106ebe",
193193
"compoundBrandStroke1Pressed": "#004578",
194+
"dangerBackground1": "#fdf6f6",
195+
"dangerBackground2": "#f1bbbc",
196+
"dangerBackground3": "#d13438",
197+
"dangerBorder1": "#f1bbbc",
198+
"dangerBorder2": "#d13438",
199+
"dangerBorderActive": "#d13438",
200+
"dangerForeground1": "#bc2f32",
201+
"dangerForeground2": "#751d1f",
202+
"dangerForeground3": "#d13438",
203+
"dangerForegroundInverted": "#dc5e62",
194204
"defaultBackground": "#ffffff",
195205
"defaultBorder": "#d6d6d6",
196206
"defaultCheckedBackground": {
@@ -578,6 +588,15 @@ exports[`createAppleTheme test 1`] = `
578588
"neutralStrokeAccessiblePressed": "#4d4d4d",
579589
"neutralStrokeAccessibleSelected": "#0078d4",
580590
"neutralStrokeDisabled": "#e0e0e0",
591+
"outofofficeBackground1": "#fdf5fc",
592+
"outofofficeBackground2": "#edbbe7",
593+
"outofofficeBackground3": "#c239b3",
594+
"outofofficeBorder1": "#edbbe7",
595+
"outofofficeBorder2": "#c239b3",
596+
"outofofficeBorderActive": "#c239b3",
597+
"outofofficeForeground1": "#af33a1",
598+
"outofofficeForeground2": "#6d2064",
599+
"outofofficeForeground3": "#c239b3",
581600
"personaActivityGlow": "#D13438",
582601
"personaActivityRing": "#ffffff",
583602
"primaryButtonBackground": {
@@ -604,6 +623,15 @@ exports[`createAppleTheme test 1`] = `
604623
"primaryButtonTextDisabled": "#757575",
605624
"primaryButtonTextHovered": "#ffffff",
606625
"primaryButtonTextPressed": "#ffffff",
626+
"severeBackground1": "#fdf6f3",
627+
"severeBackground2": "#f4bfab",
628+
"severeBackground3": "#da3b01",
629+
"severeBorder1": "#f4bfab",
630+
"severeBorder2": "#da3b01",
631+
"severeBorderActive": "#da3b01",
632+
"severeForeground1": "#c43501",
633+
"severeForeground2": "#7a2101",
634+
"severeForeground3": "#da3b01",
607635
"smallInputBorder": {
608636
"semantic": [
609637
"separatorColor",
@@ -628,6 +656,16 @@ exports[`createAppleTheme test 1`] = `
628656
"light": "#27AC22",
629657
},
630658
},
659+
"successBackground1": "#f1faf1",
660+
"successBackground2": "#9fd89f",
661+
"successBackground3": "#107c10",
662+
"successBorder1": "#9fd89f",
663+
"successBorder2": "#107c10",
664+
"successBorderActive": "#107c10",
665+
"successForeground1": "#0e700e",
666+
"successForeground2": "#094509",
667+
"successForeground3": "#107c10",
668+
"successForegroundInverted": "#359b35",
631669
"transparentBackground": "#00000000",
632670
"transparentBackgroundHover": "#00000000",
633671
"transparentBackgroundPressed": "#00000000",
@@ -653,6 +691,16 @@ exports[`createAppleTheme test 1`] = `
653691
"light": "#FFD335",
654692
},
655693
},
694+
"warningBackground1": "#fffef5",
695+
"warningBackground2": "#fef7b2",
696+
"warningBackground3": "#fde300",
697+
"warningBorder1": "#fef7b2",
698+
"warningBorder2": "#fde300",
699+
"warningBorderActive": "#fde300",
700+
"warningForeground1": "#817400",
701+
"warningForeground2": "#817400",
702+
"warningForeground3": "#fde300",
703+
"warningForegroundInverted": "#fef7b2",
656704
"warningHighlight": {
657705
"dynamic": {
658706
"dark": "#E0AB24",

packages/theming/apple-theme/src/appleColors.macos.ts

Lines changed: 2 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ export function fallbackApplePalette(mode: AppearanceOptions): ThemeColorDefinit
265265
const macOSAliasColorTokens = createMacOSColorAliasTokens(mode, getIsHighContrast());
266266

267267
return {
268+
...macOSAliasColorTokens,
269+
268270
/* PaletteBackgroundColors & PaletteTextColors */
269271

270272
background: applePlatform.windowBackgroundColor,
@@ -477,123 +479,5 @@ export function fallbackApplePalette(mode: AppearanceOptions): ThemeColorDefinit
477479

478480
personaActivityRing: macOSAliasColorTokens.neutralForegroundInverted,
479481
personaActivityGlow: fluentUIApple.red10,
480-
481-
/* AliasColorTokens */
482-
483-
neutralForeground1: macOSAliasColorTokens.neutralForeground1,
484-
neutralForeground1Hover: macOSAliasColorTokens.neutralForeground1Hover,
485-
neutralForeground1Pressed: macOSAliasColorTokens.neutralForeground1Pressed,
486-
neutralForeground1Selected: macOSAliasColorTokens.neutralForeground1Selected,
487-
neutralForeground2: macOSAliasColorTokens.neutralForeground2,
488-
neutralForeground2Hover: macOSAliasColorTokens.neutralForeground2Hover,
489-
neutralForeground2Pressed: macOSAliasColorTokens.neutralForeground2Pressed,
490-
neutralForeground2Selected: macOSAliasColorTokens.neutralForeground2Selected,
491-
neutralForeground2BrandHover: macOSAliasColorTokens.neutralForeground2BrandHover,
492-
neutralForeground2BrandPressed: macOSAliasColorTokens.neutralForeground2BrandPressed,
493-
neutralForeground2BrandSelected: macOSAliasColorTokens.neutralForeground2BrandSelected,
494-
neutralForeground3: macOSAliasColorTokens.neutralForeground3,
495-
neutralForeground3Hover: macOSAliasColorTokens.neutralForeground3Hover,
496-
neutralForeground3Pressed: macOSAliasColorTokens.neutralForeground3Pressed,
497-
neutralForeground3Selected: macOSAliasColorTokens.neutralForeground3Selected,
498-
neutralForeground3BrandHover: macOSAliasColorTokens.neutralForeground3BrandHover,
499-
neutralForeground3BrandPressed: macOSAliasColorTokens.neutralForeground3BrandPressed,
500-
neutralForeground3BrandSelected: macOSAliasColorTokens.neutralForeground3BrandSelected,
501-
neutralForeground4: macOSAliasColorTokens.neutralForeground4,
502-
neutralForegroundDisabled: macOSAliasColorTokens.neutralForegroundDisabled,
503-
504-
brandForegroundLink: macOSAliasColorTokens.brandForegroundLink,
505-
brandForegroundLinkHover: macOSAliasColorTokens.brandForegroundLinkHover,
506-
brandForegroundLinkPressed: macOSAliasColorTokens.brandForegroundLinkPressed,
507-
brandForegroundLinkSelected: macOSAliasColorTokens.brandForegroundLinkSelected,
508-
compoundBrandForeground1: macOSAliasColorTokens.compoundBrandForeground1,
509-
compoundBrandForeground1Hover: macOSAliasColorTokens.compoundBrandForeground1Hover,
510-
compoundBrandForeground1Pressed: macOSAliasColorTokens.compoundBrandForeground1Pressed,
511-
brandForeground1: macOSAliasColorTokens.brandForeground1,
512-
brandForeground1Disabled: macOSAliasColorTokens.brandForeground1Disabled,
513-
brandForeground1Pressed: macOSAliasColorTokens.brandForeground1Pressed,
514-
brandForeground2: macOSAliasColorTokens.brandForeground2,
515-
516-
neutralForegroundInverted: macOSAliasColorTokens.neutralForegroundInverted,
517-
neutralForegroundOnBrand: macOSAliasColorTokens.neutralForegroundOnBrand,
518-
neutralForegroundOnBrandHover: macOSAliasColorTokens.neutralForegroundOnBrandHover,
519-
neutralForegroundOnBrandPressed: macOSAliasColorTokens.neutralForegroundOnBrandPressed,
520-
neutralForegroundOnBrandSelected: macOSAliasColorTokens.neutralForegroundOnBrandSelected,
521-
neutralForegroundInvertedLink: macOSAliasColorTokens.neutralForegroundInvertedLink,
522-
neutralForegroundInvertedLinkHover: macOSAliasColorTokens.neutralForegroundInvertedLinkHover,
523-
neutralForegroundInvertedLinkPressed: macOSAliasColorTokens.neutralForegroundInvertedLinkPressed,
524-
neutralForegroundInvertedLinkSelected: macOSAliasColorTokens.neutralForegroundInvertedLinkSelected,
525-
526-
neutralBackground1: macOSAliasColorTokens.neutralBackground1,
527-
neutralBackground1Hover: macOSAliasColorTokens.neutralBackground1Hover,
528-
neutralBackground1Pressed: macOSAliasColorTokens.neutralBackground1Pressed,
529-
neutralBackground1Selected: macOSAliasColorTokens.neutralBackground1Selected,
530-
neutralBackground2: macOSAliasColorTokens.neutralBackground2,
531-
neutralBackground2Hover: macOSAliasColorTokens.neutralBackground2Hover,
532-
neutralBackground2Pressed: macOSAliasColorTokens.neutralBackground2Pressed,
533-
neutralBackground2Selected: macOSAliasColorTokens.neutralBackground2Selected,
534-
neutralBackground3: macOSAliasColorTokens.neutralBackground3,
535-
neutralBackground3Hover: macOSAliasColorTokens.neutralBackground3Hover,
536-
neutralBackground3Pressed: macOSAliasColorTokens.neutralBackground3Pressed,
537-
neutralBackground3Selected: macOSAliasColorTokens.neutralBackground3Selected,
538-
neutralBackground4: macOSAliasColorTokens.neutralBackground4,
539-
neutralBackground4Hover: macOSAliasColorTokens.neutralBackground4Hover,
540-
neutralBackground4Pressed: macOSAliasColorTokens.neutralBackground4Pressed,
541-
neutralBackground4Selected: macOSAliasColorTokens.neutralBackground4Selected,
542-
neutralBackground5: macOSAliasColorTokens.neutralBackground5,
543-
neutralBackground5Hover: macOSAliasColorTokens.neutralBackground5Hover,
544-
neutralBackground5Pressed: macOSAliasColorTokens.neutralBackground5Pressed,
545-
neutralBackground5Selected: macOSAliasColorTokens.neutralBackground5Selected,
546-
neutralBackground6: macOSAliasColorTokens.neutralBackground6,
547-
neutralBackgroundInverted: macOSAliasColorTokens.neutralBackgroundInverted,
548-
549-
subtleBackground: macOSAliasColorTokens.subtleBackground,
550-
subtleBackgroundHover: macOSAliasColorTokens.subtleBackgroundHover,
551-
subtleBackgroundPressed: macOSAliasColorTokens.subtleBackgroundPressed,
552-
subtleBackgroundSelected: macOSAliasColorTokens.subtleBackgroundSelected,
553-
554-
transparentBackground: macOSAliasColorTokens.transparentBackground,
555-
transparentBackgroundHover: macOSAliasColorTokens.transparentBackgroundHover,
556-
transparentBackgroundPressed: macOSAliasColorTokens.transparentBackgroundPressed,
557-
transparentBackgroundSelected: macOSAliasColorTokens.transparentBackgroundSelected,
558-
neutralBackgroundDisabled: macOSAliasColorTokens.neutralBackgroundDisabled,
559-
560-
neutralStencil1: macOSAliasColorTokens.neutralStencil1,
561-
neutralStencil2: macOSAliasColorTokens.neutralStencil2,
562-
563-
brandBackground: macOSAliasColorTokens.brandBackground,
564-
brandBackgroundHover: macOSAliasColorTokens.brandBackgroundHover,
565-
brandBackgroundPressed: macOSAliasColorTokens.brandBackgroundPressed,
566-
brandBackgroundDisabled: macOSAliasColorTokens.brandBackgroundDisabled,
567-
brandBackgroundSelected: macOSAliasColorTokens.brandBackgroundSelected,
568-
compoundBrandBackground1: macOSAliasColorTokens.compoundBrandBackground1,
569-
compoundBrandBackground1Hover: macOSAliasColorTokens.compoundBrandBackground1Hover,
570-
compoundBrandBackground1Pressed: macOSAliasColorTokens.compoundBrandBackground1Pressed,
571-
572-
brandBackgroundStatic: macOSAliasColorTokens.brandBackgroundStatic,
573-
brandBackground2: macOSAliasColorTokens.brandBackground2,
574-
575-
neutralStrokeAccessible: macOSAliasColorTokens.neutralStrokeAccessible,
576-
neutralStrokeAccessibleHover: macOSAliasColorTokens.neutralStrokeAccessibleHover,
577-
neutralStrokeAccessiblePressed: macOSAliasColorTokens.neutralStrokeAccessiblePressed,
578-
neutralStrokeAccessibleSelected: macOSAliasColorTokens.neutralStrokeAccessibleSelected,
579-
neutralStroke1: macOSAliasColorTokens.neutralStroke1,
580-
neutralStroke1Hover: macOSAliasColorTokens.neutralStroke1Hover,
581-
neutralStroke1Pressed: macOSAliasColorTokens.neutralStroke1Pressed,
582-
neutralStroke1Selected: macOSAliasColorTokens.neutralStroke1Selected,
583-
neutralStroke2: macOSAliasColorTokens.neutralStroke2,
584-
neutralStroke3: macOSAliasColorTokens.neutralStroke3,
585-
brandStroke1: macOSAliasColorTokens.brandStroke1,
586-
brandStroke2: macOSAliasColorTokens.brandStroke2,
587-
compoundBrandStroke1: macOSAliasColorTokens.compoundBrandStroke1,
588-
compoundBrandStroke1Hover: macOSAliasColorTokens.compoundBrandStroke1Hover,
589-
compoundBrandStroke1Pressed: macOSAliasColorTokens.compoundBrandStroke1Pressed,
590-
neutralStrokeDisabled: macOSAliasColorTokens.neutralStrokeDisabled,
591-
592-
transparentStroke: macOSAliasColorTokens.transparentStroke,
593-
transparentStrokeInteractive: macOSAliasColorTokens.transparentStrokeInteractive,
594-
transparentStrokeDisabled: macOSAliasColorTokens.transparentStrokeDisabled,
595-
596-
strokeFocus1: macOSAliasColorTokens.strokeFocus1,
597-
strokeFocus2: macOSAliasColorTokens.strokeFocus2,
598482
};
599483
}

0 commit comments

Comments
 (0)