Skip to content

Commit 371f22f

Browse files
jluyausnowystinger
authored andcommitted
NumberField (#168)
* Numberfield initial work * feedback updates * mroe feedback updates * make expanded state the default state * update styles * quick color and size adjustments * fixes for safari bug --------- Co-authored-by: Rob Snow <[email protected]>
1 parent 841928c commit 371f22f

File tree

12 files changed

+523
-34
lines changed

12 files changed

+523
-34
lines changed

packages/@react-spectrum/s2/src/ComboBox.tsx

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,27 @@ const inputButton = style({
109109
marginStart: 'text-to-control',
110110
aspectRatio: 'square',
111111
flexShrink: 0,
112-
transition: 'default',
112+
transition: {
113+
default: 'default',
114+
forcedColors: 'none'
115+
},
113116
backgroundColor: {
114117
default: baseColor('gray-100'),
115118
isOpen: 'gray-200',
116-
isDisabled: 'disabled'
119+
isDisabled: 'disabled',
120+
forcedColors: {
121+
default: 'ButtonText',
122+
isHovered: 'Highlight',
123+
isOpen: 'Highlight',
124+
isDisabled: 'GrayText'
125+
}
117126
},
118127
color: {
119128
default: 'neutral',
120-
isDisabled: 'disabled'
129+
isDisabled: 'disabled',
130+
forcedColors: {
131+
default: 'ButtonFace'
132+
}
121133
}
122134
});
123135

0 commit comments

Comments
 (0)