@ornikar/bumper 3.9.1 → 3.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +24 -0
- package/dist/definitions/shared/storybook/StorySection.d.ts.map +1 -1
- package/dist/definitions/shared/storybook/StoryTitle.d.ts.map +1 -1
- package/dist/definitions/system/actions/Button/Button.d.ts +4 -4
- package/dist/definitions/system/actions/Button/Button.d.ts.map +1 -1
- package/dist/definitions/system/actions/IconButton/IconButton.d.ts.map +1 -1
- package/dist/definitions/system/content/icon/Icon.d.ts.map +1 -1
- package/dist/definitions/system/content/typography/Typography.d.ts +15 -10
- package/dist/definitions/system/content/typography/Typography.d.ts.map +1 -1
- package/dist/definitions/system/content/typography/TypographyLink.d.ts +1 -0
- package/dist/definitions/system/content/typography/TypographyLink.d.ts.map +1 -1
- package/dist/definitions/system/core/tokens/palettes/deepPurpleColorPalette.d.ts +70 -69
- package/dist/definitions/system/core/tokens/palettes/deepPurpleColorPalette.d.ts.map +1 -1
- package/dist/definitions/system/loading/loader/Loader.d.ts +2 -2
- package/dist/definitions/system/loading/loader/Loader.d.ts.map +1 -1
- package/dist/definitions/system/loading/loader/LoaderBackgroundCircle.d.ts +2 -1
- package/dist/definitions/system/loading/loader/LoaderBackgroundCircle.d.ts.map +1 -1
- package/dist/definitions/system/loading/loader/LoaderCircleWrapper.d.ts +2 -1
- package/dist/definitions/system/loading/loader/LoaderCircleWrapper.d.ts.map +1 -1
- package/dist/definitions/system/types.d.ts +38 -1
- package/dist/definitions/system/types.d.ts.map +1 -1
- package/dist/definitions/tamagui.config.d.ts +142 -2
- package/dist/definitions/tamagui.config.d.ts.map +1 -1
- package/dist/index-metro.es.android.js +86 -84
- package/dist/index-metro.es.android.js.map +1 -1
- package/dist/index-metro.es.ios.js +86 -84
- package/dist/index-metro.es.ios.js.map +1 -1
- package/dist/index-node-22.22.cjs.js +86 -84
- package/dist/index-node-22.22.cjs.js.map +1 -1
- package/dist/index-node-22.22.cjs.web.js +86 -84
- package/dist/index-node-22.22.cjs.web.js.map +1 -1
- package/dist/index-node-22.22.es.mjs +86 -84
- package/dist/index-node-22.22.es.mjs.map +1 -1
- package/dist/index-node-22.22.es.web.mjs +86 -84
- package/dist/index-node-22.22.es.web.mjs.map +1 -1
- package/dist/index.es.js +86 -84
- package/dist/index.es.js.map +1 -1
- package/dist/index.es.web.js +86 -84
- package/dist/index.es.web.js.map +1 -1
- package/dist/storybook-metro.es.android.js +81 -80
- package/dist/storybook-metro.es.android.js.map +1 -1
- package/dist/storybook-metro.es.ios.js +81 -80
- package/dist/storybook-metro.es.ios.js.map +1 -1
- package/dist/storybook-node-22.22.cjs.js +81 -80
- package/dist/storybook-node-22.22.cjs.js.map +1 -1
- package/dist/storybook-node-22.22.cjs.web.js +81 -80
- package/dist/storybook-node-22.22.cjs.web.js.map +1 -1
- package/dist/storybook-node-22.22.es.mjs +81 -80
- package/dist/storybook-node-22.22.es.mjs.map +1 -1
- package/dist/storybook-node-22.22.es.web.mjs +81 -80
- package/dist/storybook-node-22.22.es.web.mjs.map +1 -1
- package/dist/storybook.es.js +81 -80
- package/dist/storybook.es.js.map +1 -1
- package/dist/storybook.es.web.js +81 -80
- package/dist/storybook.es.web.js.map +1 -1
- package/dist/tsbuildinfo +1 -1
- package/docs/migration/Typography.md +123 -35
- package/package.json +2 -2
- package/src/.eslintrc.json +2 -5
- package/src/shared/storybook/StorySection.tsx +8 -1
- package/src/shared/storybook/StoryTitle.tsx +8 -2
- package/src/system/actions/Button/Button.mdx +1 -1
- package/src/system/actions/Button/Button.tsx +5 -3
- package/src/system/actions/Button/__snapshots__/Button.features.stories.tsx.snap +10 -10
- package/src/system/actions/Button/__snapshots_web__/Button.features.stories.tsx.snap +2 -2
- package/src/system/actions/Button/utils/contentColor.ts +1 -1
- package/src/system/actions/IconButton/IconButton.tsx +3 -2
- package/src/system/actions/IconButton/__snapshots__/IconButton.features.stories.tsx.snap +10 -10
- package/src/system/actions/IconButton/__snapshots_web__/IconButton.features.stories.tsx.snap +2 -2
- package/src/system/content/icon/Icon.tsx +7 -2
- package/src/system/content/typography/Typography.features.stories.tsx +2 -2
- package/src/system/content/typography/Typography.stories.tsx +2 -2
- package/src/system/content/typography/Typography.tsx +21 -19
- package/src/system/content/typography/TypographyLink.features.stories.tsx +2 -2
- package/src/system/content/typography/TypographyLink.stories.tsx +2 -2
- package/src/system/content/typography/TypographyLink.tsx +4 -2
- package/src/system/core/themes/light/__snapshots__/light.stories.tsx.snap +7 -7
- package/src/system/core/themes/light/__snapshots_web__/light.stories.tsx.snap +7 -7
- package/src/system/core/themes/light/light.ts +73 -73
- package/src/system/core/tokens/palettes/__snapshots__/deepPurpleColorPalette.stories.tsx.snap +141 -70
- package/src/system/core/tokens/palettes/__snapshots_web__/deepPurpleColorPalette.stories.tsx.snap +91 -70
- package/src/system/core/tokens/palettes/deepPurpleColorPalette.ts +9 -8
- package/src/system/loading/loader/Loader.tsx +16 -15
- package/src/system/loading/loader/LoaderBackgroundCircle.tsx +8 -1
- package/src/system/loading/loader/LoaderCircleWrapper.tsx +11 -1
- package/src/system/types.ts +51 -2
- package/src/tamagui.config.ts +2 -1
|
@@ -51,8 +51,9 @@ const colorScales = {
|
|
|
51
51
|
grey: createColorScale({
|
|
52
52
|
0: '#ffffff',
|
|
53
53
|
1: '#ECECEC',
|
|
54
|
-
2: '#
|
|
55
|
-
3: '#
|
|
54
|
+
2: '#DCDCDC',
|
|
55
|
+
3: '#BABABA',
|
|
56
|
+
4: '#A8A8A8',
|
|
56
57
|
5: '#838383',
|
|
57
58
|
7: '#505050',
|
|
58
59
|
9: '#101010'
|
|
@@ -112,96 +113,96 @@ const colorScales = {
|
|
|
112
113
|
const transformColorScalesToTokens = () => {
|
|
113
114
|
return Object.fromEntries(Object.entries(colorScales).flatMap(([colorName, colorScale]) => {
|
|
114
115
|
return Object.entries(colorScale).map(([scaleNumber, colorValue]) => {
|
|
115
|
-
return [
|
|
116
|
+
return [`palette.${colorName}.${scaleNumber}`, colorValue];
|
|
116
117
|
});
|
|
117
118
|
}));
|
|
118
119
|
};
|
|
119
120
|
const deepPurpleColorPalette = _objectSpread(_objectSpread({}, transformColorScalesToTokens()), {}, {
|
|
120
|
-
white: '#FFFFFF',
|
|
121
|
-
black: '#000000',
|
|
122
|
-
transparent: 'transparent'
|
|
121
|
+
'palette.white': '#FFFFFF',
|
|
122
|
+
'palette.black': '#000000',
|
|
123
|
+
'palette.transparent': 'transparent'
|
|
123
124
|
});
|
|
124
125
|
|
|
125
126
|
// WARNING
|
|
126
127
|
// https://github.com/ornikar/kitt/blob/79e367e962c957c016c4df67dbcf515c8f45ff0e/@ornikar/kitt-universal/src/themes/late-ocean/colors.ts#L28
|
|
127
128
|
const light = {
|
|
128
129
|
// content
|
|
129
|
-
'content.base.low': deepPurpleColorPalette['grey.5'],
|
|
130
|
-
'content.base.mid': deepPurpleColorPalette['grey.7'],
|
|
131
|
-
'content.base.hi': deepPurpleColorPalette['grey.9'],
|
|
132
|
-
'content.base.onContrasted.low': deepPurpleColorPalette['white-alpha.60'],
|
|
133
|
-
'content.base.onContrasted.mid': deepPurpleColorPalette['white-alpha.80'],
|
|
134
|
-
'content.base.onContrasted.hi': deepPurpleColorPalette['grey.0'],
|
|
135
|
-
'content.accent': deepPurpleColorPalette['deepPurple.8'],
|
|
136
|
-
'content.promo': deepPurpleColorPalette['lightning.9'],
|
|
137
|
-
'content.promo.onContrasted': deepPurpleColorPalette['lightning.5'],
|
|
138
|
-
'content.info': deepPurpleColorPalette['blue.7'],
|
|
139
|
-
'content.success': deepPurpleColorPalette['green.7'],
|
|
140
|
-
'content.warning': deepPurpleColorPalette['yellow.7'],
|
|
141
|
-
'content.danger': deepPurpleColorPalette['red.7'],
|
|
142
|
-
'content.muted': deepPurpleColorPalette['beige.6'],
|
|
143
|
-
'content.disabled': deepPurpleColorPalette['grey.
|
|
144
|
-
'content.disabled.onContrasted': deepPurpleColorPalette['grey.
|
|
130
|
+
'content.base.low': deepPurpleColorPalette['palette.grey.5'],
|
|
131
|
+
'content.base.mid': deepPurpleColorPalette['palette.grey.7'],
|
|
132
|
+
'content.base.hi': deepPurpleColorPalette['palette.grey.9'],
|
|
133
|
+
'content.base.onContrasted.low': deepPurpleColorPalette['palette.white-alpha.60'],
|
|
134
|
+
'content.base.onContrasted.mid': deepPurpleColorPalette['palette.white-alpha.80'],
|
|
135
|
+
'content.base.onContrasted.hi': deepPurpleColorPalette['palette.grey.0'],
|
|
136
|
+
'content.accent': deepPurpleColorPalette['palette.deepPurple.8'],
|
|
137
|
+
'content.promo': deepPurpleColorPalette['palette.lightning.9'],
|
|
138
|
+
'content.promo.onContrasted': deepPurpleColorPalette['palette.lightning.5'],
|
|
139
|
+
'content.info': deepPurpleColorPalette['palette.blue.7'],
|
|
140
|
+
'content.success': deepPurpleColorPalette['palette.green.7'],
|
|
141
|
+
'content.warning': deepPurpleColorPalette['palette.yellow.7'],
|
|
142
|
+
'content.danger': deepPurpleColorPalette['palette.red.7'],
|
|
143
|
+
'content.muted': deepPurpleColorPalette['palette.beige.6'],
|
|
144
|
+
'content.disabled': deepPurpleColorPalette['palette.grey.4'],
|
|
145
|
+
'content.disabled.onContrasted': deepPurpleColorPalette['palette.grey.0'],
|
|
145
146
|
// backgrounds
|
|
146
|
-
'bg.base.low.default': deepPurpleColorPalette['grey.0'],
|
|
147
|
-
'bg.base.low.pressed': deepPurpleColorPalette['beige.1'],
|
|
148
|
-
'bg.base.mid.default': deepPurpleColorPalette['beige.1'],
|
|
149
|
-
'bg.base.mid.pressed': deepPurpleColorPalette['beige.2'],
|
|
150
|
-
'bg.base.hi.default': deepPurpleColorPalette['beige.2'],
|
|
151
|
-
'bg.base.hi.pressed': deepPurpleColorPalette['beige.3'],
|
|
152
|
-
'bg.accent.default': deepPurpleColorPalette['deepPurple.8'],
|
|
153
|
-
'bg.accent.pressed': deepPurpleColorPalette['deepPurple.7'],
|
|
154
|
-
'bg.promo.mid.default': deepPurpleColorPalette['lightning.5'],
|
|
155
|
-
'bg.promo.mid.pressed': deepPurpleColorPalette['lightning.4'],
|
|
156
|
-
'bg.promo.hi.default': deepPurpleColorPalette['lightning.9'],
|
|
157
|
-
'bg.promo.hi.pressed': deepPurpleColorPalette['lightning.8'],
|
|
158
|
-
'bg.highlight.mid.default': deepPurpleColorPalette['mauve.1'],
|
|
159
|
-
'bg.highlight.mid.pressed': deepPurpleColorPalette['mauve.2'],
|
|
160
|
-
'bg.highlight.hi.default': deepPurpleColorPalette['mauve.3'],
|
|
161
|
-
'bg.highlight.hi.pressed': deepPurpleColorPalette['mauve.4'],
|
|
162
|
-
'bg.info.mid': deepPurpleColorPalette['blue.1'],
|
|
163
|
-
'bg.info.hi': deepPurpleColorPalette['blue.6'],
|
|
164
|
-
'bg.success.mid': deepPurpleColorPalette['green.1'],
|
|
165
|
-
'bg.success.hi': deepPurpleColorPalette['green.6'],
|
|
166
|
-
'bg.warning.mid': deepPurpleColorPalette['yellow.1'],
|
|
167
|
-
'bg.warning.hi': deepPurpleColorPalette['yellow.6'],
|
|
168
|
-
'bg.danger.mid': deepPurpleColorPalette['red.1'],
|
|
169
|
-
'bg.danger.hi': deepPurpleColorPalette['red.6'],
|
|
170
|
-
'bg.disabled.mid': deepPurpleColorPalette['grey.1'],
|
|
171
|
-
'bg.disabled.hi': deepPurpleColorPalette['grey.3'],
|
|
172
|
-
'bg.overlay': deepPurpleColorPalette['grey-alpha.50'],
|
|
147
|
+
'bg.base.low.default': deepPurpleColorPalette['palette.grey.0'],
|
|
148
|
+
'bg.base.low.pressed': deepPurpleColorPalette['palette.beige.1'],
|
|
149
|
+
'bg.base.mid.default': deepPurpleColorPalette['palette.beige.1'],
|
|
150
|
+
'bg.base.mid.pressed': deepPurpleColorPalette['palette.beige.2'],
|
|
151
|
+
'bg.base.hi.default': deepPurpleColorPalette['palette.beige.2'],
|
|
152
|
+
'bg.base.hi.pressed': deepPurpleColorPalette['palette.beige.3'],
|
|
153
|
+
'bg.accent.default': deepPurpleColorPalette['palette.deepPurple.8'],
|
|
154
|
+
'bg.accent.pressed': deepPurpleColorPalette['palette.deepPurple.7'],
|
|
155
|
+
'bg.promo.mid.default': deepPurpleColorPalette['palette.lightning.5'],
|
|
156
|
+
'bg.promo.mid.pressed': deepPurpleColorPalette['palette.lightning.4'],
|
|
157
|
+
'bg.promo.hi.default': deepPurpleColorPalette['palette.lightning.9'],
|
|
158
|
+
'bg.promo.hi.pressed': deepPurpleColorPalette['palette.lightning.8'],
|
|
159
|
+
'bg.highlight.mid.default': deepPurpleColorPalette['palette.mauve.1'],
|
|
160
|
+
'bg.highlight.mid.pressed': deepPurpleColorPalette['palette.mauve.2'],
|
|
161
|
+
'bg.highlight.hi.default': deepPurpleColorPalette['palette.mauve.3'],
|
|
162
|
+
'bg.highlight.hi.pressed': deepPurpleColorPalette['palette.mauve.4'],
|
|
163
|
+
'bg.info.mid': deepPurpleColorPalette['palette.blue.1'],
|
|
164
|
+
'bg.info.hi': deepPurpleColorPalette['palette.blue.6'],
|
|
165
|
+
'bg.success.mid': deepPurpleColorPalette['palette.green.1'],
|
|
166
|
+
'bg.success.hi': deepPurpleColorPalette['palette.green.6'],
|
|
167
|
+
'bg.warning.mid': deepPurpleColorPalette['palette.yellow.1'],
|
|
168
|
+
'bg.warning.hi': deepPurpleColorPalette['palette.yellow.6'],
|
|
169
|
+
'bg.danger.mid': deepPurpleColorPalette['palette.red.1'],
|
|
170
|
+
'bg.danger.hi': deepPurpleColorPalette['palette.red.6'],
|
|
171
|
+
'bg.disabled.mid': deepPurpleColorPalette['palette.grey.1'],
|
|
172
|
+
'bg.disabled.hi': deepPurpleColorPalette['palette.grey.3'],
|
|
173
|
+
'bg.overlay': deepPurpleColorPalette['palette.grey-alpha.50'],
|
|
173
174
|
// borders
|
|
174
|
-
'border.base.low': deepPurpleColorPalette['beige.2'],
|
|
175
|
-
'border.base.mid': deepPurpleColorPalette['beige.3'],
|
|
176
|
-
'border.base.hi': deepPurpleColorPalette['grey.9'],
|
|
177
|
-
'border.base.onContrasted.mid': deepPurpleColorPalette['white-alpha.20'],
|
|
178
|
-
'border.base.onContrasted.hi': deepPurpleColorPalette['grey.0'],
|
|
179
|
-
'border.base.accent': deepPurpleColorPalette['deepPurple.8'],
|
|
180
|
-
'border.info': deepPurpleColorPalette['blue.6'],
|
|
181
|
-
'border.success': deepPurpleColorPalette['green.6'],
|
|
182
|
-
'border.warning': deepPurpleColorPalette['yellow.6'],
|
|
183
|
-
'border.danger': deepPurpleColorPalette['red.6'],
|
|
184
|
-
'border.disabled': deepPurpleColorPalette['grey.2'],
|
|
185
|
-
'border.highlight': deepPurpleColorPalette['mauve.3'],
|
|
186
|
-
'border.focus': deepPurpleColorPalette['blue.4'],
|
|
187
|
-
'border.transparent': deepPurpleColorPalette.transparent,
|
|
175
|
+
'border.base.low': deepPurpleColorPalette['palette.beige.2'],
|
|
176
|
+
'border.base.mid': deepPurpleColorPalette['palette.beige.3'],
|
|
177
|
+
'border.base.hi': deepPurpleColorPalette['palette.grey.9'],
|
|
178
|
+
'border.base.onContrasted.mid': deepPurpleColorPalette['palette.white-alpha.20'],
|
|
179
|
+
'border.base.onContrasted.hi': deepPurpleColorPalette['palette.grey.0'],
|
|
180
|
+
'border.base.accent': deepPurpleColorPalette['palette.deepPurple.8'],
|
|
181
|
+
'border.info': deepPurpleColorPalette['palette.blue.6'],
|
|
182
|
+
'border.success': deepPurpleColorPalette['palette.green.6'],
|
|
183
|
+
'border.warning': deepPurpleColorPalette['palette.yellow.6'],
|
|
184
|
+
'border.danger': deepPurpleColorPalette['palette.red.6'],
|
|
185
|
+
'border.disabled': deepPurpleColorPalette['palette.grey.2'],
|
|
186
|
+
'border.highlight': deepPurpleColorPalette['palette.mauve.3'],
|
|
187
|
+
'border.focus': deepPurpleColorPalette['palette.blue.4'],
|
|
188
|
+
'border.transparent': deepPurpleColorPalette['palette.transparent'],
|
|
188
189
|
// Buttons
|
|
189
|
-
'button.bg.primary.default': deepPurpleColorPalette['deepPurple.8'],
|
|
190
|
-
'button.bg.primary.pressed': deepPurpleColorPalette['deepPurple.7'],
|
|
191
|
-
'button.bg.primary.onContrasted.default': deepPurpleColorPalette['grey.0'],
|
|
192
|
-
'button.bg.primary.onContrasted.pressed': deepPurpleColorPalette['white-alpha.80'],
|
|
193
|
-
'button.bg.secondary.default': deepPurpleColorPalette.transparent,
|
|
194
|
-
'button.bg.secondary.pressed': deepPurpleColorPalette['deepPurple-alpha.10'],
|
|
195
|
-
'button.bg.secondary.onContrasted.default': deepPurpleColorPalette.transparent,
|
|
196
|
-
'button.bg.secondary.onContrasted.pressed': deepPurpleColorPalette['white-alpha.10'],
|
|
197
|
-
'button.bg.tertiary.default': deepPurpleColorPalette.transparent,
|
|
198
|
-
'button.bg.tertiary.pressed': deepPurpleColorPalette['deepPurple-alpha.10'],
|
|
199
|
-
'button.bg.tertiary.onContrasted.default': deepPurpleColorPalette.transparent,
|
|
200
|
-
'button.bg.tertiary.onContrasted.pressed': deepPurpleColorPalette['white-alpha.10'],
|
|
201
|
-
'button.bg.danger.default': deepPurpleColorPalette.transparent,
|
|
202
|
-
'button.bg.danger.pressed': deepPurpleColorPalette['red.1'],
|
|
203
|
-
'button.bg.danger.onContrasted.default': deepPurpleColorPalette.white,
|
|
204
|
-
'button.bg.danger.onContrasted.pressed': deepPurpleColorPalette['red.1']
|
|
190
|
+
'button.bg.primary.default': deepPurpleColorPalette['palette.deepPurple.8'],
|
|
191
|
+
'button.bg.primary.pressed': deepPurpleColorPalette['palette.deepPurple.7'],
|
|
192
|
+
'button.bg.primary.onContrasted.default': deepPurpleColorPalette['palette.grey.0'],
|
|
193
|
+
'button.bg.primary.onContrasted.pressed': deepPurpleColorPalette['palette.white-alpha.80'],
|
|
194
|
+
'button.bg.secondary.default': deepPurpleColorPalette['palette.transparent'],
|
|
195
|
+
'button.bg.secondary.pressed': deepPurpleColorPalette['palette.deepPurple-alpha.10'],
|
|
196
|
+
'button.bg.secondary.onContrasted.default': deepPurpleColorPalette['palette.transparent'],
|
|
197
|
+
'button.bg.secondary.onContrasted.pressed': deepPurpleColorPalette['palette.white-alpha.10'],
|
|
198
|
+
'button.bg.tertiary.default': deepPurpleColorPalette['palette.transparent'],
|
|
199
|
+
'button.bg.tertiary.pressed': deepPurpleColorPalette['palette.deepPurple-alpha.10'],
|
|
200
|
+
'button.bg.tertiary.onContrasted.default': deepPurpleColorPalette['palette.transparent'],
|
|
201
|
+
'button.bg.tertiary.onContrasted.pressed': deepPurpleColorPalette['palette.white-alpha.10'],
|
|
202
|
+
'button.bg.danger.default': deepPurpleColorPalette['palette.transparent'],
|
|
203
|
+
'button.bg.danger.pressed': deepPurpleColorPalette['palette.red.1'],
|
|
204
|
+
'button.bg.danger.onContrasted.default': deepPurpleColorPalette['palette.white'],
|
|
205
|
+
'button.bg.danger.onContrasted.pressed': deepPurpleColorPalette['palette.red.1']
|
|
205
206
|
};
|
|
206
207
|
|
|
207
208
|
const themes = {
|
|
@@ -406,7 +407,7 @@ const GTStandardNarrowFont = createFont({
|
|
|
406
407
|
face: GTStandardNarrowFaces
|
|
407
408
|
});
|
|
408
409
|
const tokens = createTokens({
|
|
409
|
-
color:
|
|
410
|
+
color: deepPurpleColorPalette,
|
|
410
411
|
space: spaceTokens,
|
|
411
412
|
size: sizeTokens,
|
|
412
413
|
radius: radiusTokens,
|
|
@@ -569,7 +570,8 @@ const LoaderCircleWrapper = styled(Svg, {
|
|
|
569
570
|
isForeground: {
|
|
570
571
|
true: {
|
|
571
572
|
position: 'absolute'
|
|
572
|
-
}
|
|
573
|
+
},
|
|
574
|
+
false: {}
|
|
573
575
|
}
|
|
574
576
|
}
|
|
575
577
|
});
|
|
@@ -709,7 +711,7 @@ const InternalTypography = styled(Text, {
|
|
|
709
711
|
fontWeight: '$semibold'
|
|
710
712
|
}, commonVariantStyles);
|
|
711
713
|
}
|
|
712
|
-
return
|
|
714
|
+
return {};
|
|
713
715
|
},
|
|
714
716
|
weight: {
|
|
715
717
|
regular: {
|
|
@@ -837,7 +839,7 @@ const context = createStyledContext({
|
|
|
837
839
|
|
|
838
840
|
function getButtonContentColor(type, disabled, isOnContrasted) {
|
|
839
841
|
if (disabled) {
|
|
840
|
-
return '$content.disabled';
|
|
842
|
+
return type === 'primary' ? '$content.disabled.onContrasted' : '$content.disabled';
|
|
841
843
|
}
|
|
842
844
|
switch (type) {
|
|
843
845
|
case 'secondary':
|
|
@@ -996,7 +998,7 @@ const InternalButtonFrame = styled(HStack, {
|
|
|
996
998
|
if (type === 'primary') {
|
|
997
999
|
if (disabled) {
|
|
998
1000
|
return _objectSpread(_objectSpread({}, commonTypeStyle), {}, {
|
|
999
|
-
backgroundColor: '$bg.disabled.
|
|
1001
|
+
backgroundColor: '$bg.disabled.hi'
|
|
1000
1002
|
});
|
|
1001
1003
|
}
|
|
1002
1004
|
}
|