Skip to content

Commit d9c22af

Browse files
committed
Update Button tokens to use full lightness and bebop spectrum
1 parent f75ac8a commit d9c22af

File tree

19 files changed

+336
-134
lines changed

19 files changed

+336
-134
lines changed

packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Button/useSemanticButtonStyles.styles.ts

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,7 @@ const useRootStyles = makeStyles({
215215
display: 'none',
216216
},
217217
[`& .${buttonClassNames.icon}`]: {
218-
// Subtle shares hover state with selected state
219-
color: semanticTokens.groupButtonSubtleIconForegroundHoverSelected,
218+
color: semanticTokens.groupButtonSubtleIconForegroundHover,
220219
},
221220
},
222221

@@ -231,8 +230,7 @@ const useRootStyles = makeStyles({
231230
display: 'none',
232231
},
233232
[`& .${buttonClassNames.icon}`]: {
234-
// Subtle shares pressed state with selected state
235-
color: semanticTokens.groupButtonSubtleIconForegroundPressedSelected,
233+
color: semanticTokens.groupButtonSubtleIconForegroundPressed,
236234
},
237235
},
238236

@@ -545,14 +543,7 @@ const useRootDisabledStyles = makeStyles({
545543
});
546544

547545
const useRootFocusStyles = makeStyles({
548-
// Shape variations
549-
circular: createCustomFocusIndicatorStyle({ borderRadius: semanticTokens.cornerCircular }),
550-
rounded: {
551-
/* The rounded styles are exactly the same as the base styles. */
552-
},
553-
square: createCustomFocusIndicatorStyle({ borderRadius: semanticTokens.cornerSquare }),
554-
// Primary styles
555-
primary: {
546+
base: {
556547
...createCustomFocusIndicatorStyle({
557548
...shorthands.borderColor(semanticTokens.groupFocusInnerStroke),
558549
boxShadow: `${semanticTokens.groupButtonShadow}, ${tokens.shadow2}, 0 0 0 ${semanticTokens.groupFocusInnerStrokewidth} ${semanticTokens.groupFocusInnerStroke} inset, 0 0 0 ${semanticTokens.groupFocusOuterStrokewidth} ${semanticTokens.groupFocusOnbrandStroke} inset`,
@@ -573,6 +564,14 @@ const useRootFocusStyles = makeStyles({
573564
}),
574565
},
575566
},
567+
// Shape variations
568+
circular: createCustomFocusIndicatorStyle({ borderRadius: semanticTokens.cornerCircular }),
569+
rounded: {
570+
/* The rounded styles are exactly the same as the base styles. */
571+
},
572+
square: createCustomFocusIndicatorStyle({ borderRadius: semanticTokens.cornerSquare }),
573+
// Primary styles
574+
primary: {},
576575
secondary: {
577576
// The secondary focus styles are exactly the same as the base styles.
578577
},
@@ -675,8 +674,7 @@ export const useSemanticButtonStyles = (_state: unknown): ButtonState => {
675674
appearance && (disabled || disabledFocusable) && rootDisabledStyles[appearance],
676675

677676
// Focus styles
678-
appearance === 'primary' && rootFocusStyles.primary,
679-
appearance === 'secondary' && rootFocusStyles.secondary,
677+
rootFocusStyles.base,
680678
rootFocusStyles[size],
681679
rootFocusStyles[shape],
682680

packages/react-components/semantic-style-hooks-preview/library/src/component-styles/Button/useSemanticToggleButtonStyles.styles.ts

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const useRootCheckedStyles = makeStyles({
1515
...shorthands.borderColor(semanticTokens.groupButtonNeutralStrokeSelected),
1616
color: semanticTokens.groupButtonNeutralForegroundSelected,
1717
...shorthands.borderWidth(semanticTokens.groupButtonStrokewidth),
18+
fontWeight: semanticTokens.groupButtonFontweightSelected,
1819
[`& .${buttonClassNames.icon}`]: {
1920
color: semanticTokens.groupButtonNeutralIconForegroundSelected,
2021
},
@@ -59,21 +60,25 @@ const useRootCheckedStyles = makeStyles({
5960
color: semanticTokens.groupButtonOutlineForegroundSelected,
6061
...shorthands.borderColor(semanticTokens.groupButtonOutlineStrokeSelected),
6162
...shorthands.borderWidth(semanticTokens.groupButtonOutlineStrokewidthSelected),
63+
...createCustomFocusIndicatorStyle({
64+
...shorthands.borderColor(semanticTokens.groupButtonOutlineStrokeSelected),
65+
...shorthands.borderWidth(semanticTokens.groupButtonOutlineStrokewidthSelected),
66+
}),
6267
[`& .${buttonClassNames.icon}`]: {
6368
color: semanticTokens.groupButtonOutlineIconForegroundSelected,
6469
},
6570

6671
':hover': {
72+
backgroundColor: semanticTokens.groupButtonOutlineBackgroundHoverSelected,
73+
...shorthands.borderColor(semanticTokens.groupButtonOutlineStrokeSelected),
6774
...shorthands.borderWidth(semanticTokens.groupButtonOutlineStrokewidthSelected),
6875
},
6976

7077
':hover:active': {
78+
backgroundColor: semanticTokens.groupButtonOutlineBackgroundPressedSelected,
7179
...shorthands.borderWidth(semanticTokens.groupButtonOutlineStrokewidthSelected),
72-
},
73-
74-
...createCustomFocusIndicatorStyle({
7580
...shorthands.borderColor(semanticTokens.groupButtonOutlineStrokeSelected),
76-
}),
81+
},
7782
},
7883
primary: {
7984
backgroundColor: semanticTokens.groupButtonPrimaryBackgroundSelected,
@@ -94,6 +99,13 @@ const useRootCheckedStyles = makeStyles({
9499
},
95100
secondary: {
96101
/* The secondary styles are exactly the same as the base styles. */
102+
':hover': {
103+
backgroundColor: semanticTokens.groupButtonNeutralBackgroundHoverSelected,
104+
},
105+
106+
':hover:active': {
107+
backgroundColor: semanticTokens.groupButtonNeutralBackgroundPressedSelected,
108+
},
97109
},
98110
subtle: {
99111
backgroundColor: semanticTokens.groupButtonSubtleBackgroundSelected,
@@ -105,12 +117,18 @@ const useRootCheckedStyles = makeStyles({
105117
},
106118

107119
':hover': {
120+
backgroundColor: semanticTokens.groupButtonSubtleBackgroundHoverSelected,
121+
...shorthands.borderColor(semanticTokens.groupButtonSubtleStrokeSelected),
122+
color: semanticTokens.groupButtonSubtleForegroundSelected,
108123
[`& .${buttonClassNames.icon}`]: {
109124
color: semanticTokens.groupButtonSubtleIconForegroundHoverSelected,
110125
},
111126
},
112127

113128
':hover:active': {
129+
backgroundColor: semanticTokens.groupButtonSubtleBackgroundPressedSelected,
130+
...shorthands.borderColor(semanticTokens.groupButtonSubtleStrokeSelected),
131+
color: semanticTokens.groupButtonSubtleForegroundSelected,
114132
[`& .${buttonClassNames.icon}`]: {
115133
color: semanticTokens.groupButtonSubtleIconForegroundPressedSelected,
116134
},

0 commit comments

Comments
 (0)