Skip to content

Commit 591e672

Browse files
authored
bump: update s2 tokens to v46 (#6948)
* update tokens * fix dragged theme * remove deprecated token * remove comment
1 parent 32f8b8d commit 591e672

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed

packages/@react-spectrum/s2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"postpack": "git checkout -- package.json"
121121
},
122122
"devDependencies": {
123-
"@adobe/spectrum-tokens": "^13.0.0-beta.34",
123+
"@adobe/spectrum-tokens": "^13.0.0-beta.46",
124124
"@parcel/macros": "2.12.1-canary.3165"
125125
},
126126
"dependencies": {

packages/@react-spectrum/s2/style/spectrum-theme.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,13 +466,6 @@ export const style = createTheme({
466466
isFocusVisible: weirdColorToken('negative-background-color-key-focus'),
467467
isPressed: weirdColorToken('negative-background-color-down')
468468
},
469-
'negative-subdued': {
470-
default: colorToken('negative-subdued-background-color-default'),
471-
isHovered: colorToken('negative-subdued-background-color-hover'),
472-
isFocusVisible: colorToken('negative-subdued-background-color-key-focus'),
473-
isPressed: colorToken('negative-subdued-background-color-down')
474-
},
475-
// Sort of weird to have both subdued and subtle that map to the same color...
476469
'negative-subtle': colorToken('negative-subtle-background-color-default'),
477470
informative: {
478471
default: weirdColorToken('informative-background-color-default'),
@@ -739,11 +732,13 @@ export const style = createTheme({
739732
boxShadow: {
740733
emphasized: `${getToken('drop-shadow-emphasized-default-x')} ${getToken('drop-shadow-emphasized-default-y')} ${getToken('drop-shadow-emphasized-default-blur')} ${colorToken('drop-shadow-emphasized-default-color')}`,
741734
elevated: `${getToken('drop-shadow-elevated-x')} ${getToken('drop-shadow-elevated-y')} ${getToken('drop-shadow-elevated-blur')} ${colorToken('drop-shadow-elevated-color')}`,
735+
dragged: `${getToken('drop-shadow-dragged-x')} ${getToken('drop-shadow-dragged-y')} ${getToken('drop-shadow-dragged-blur')} ${colorToken('drop-shadow-dragged-color')}`,
742736
none: 'none'
743737
},
744738
filter: {
745739
emphasized: `drop-shadow(${getToken('drop-shadow-emphasized-default-x')} ${getToken('drop-shadow-emphasized-default-y')} ${getToken('drop-shadow-emphasized-default-blur')} ${colorToken('drop-shadow-emphasized-default-color')})`,
746740
elevated: `drop-shadow(${getToken('drop-shadow-elevated-x')} ${getToken('drop-shadow-elevated-y')} ${getToken('drop-shadow-elevated-blur')} ${colorToken('drop-shadow-elevated-color')})`,
741+
dragged: `drop-shadow${getToken('drop-shadow-dragged-x')} ${getToken('drop-shadow-dragged-y')} ${getToken('drop-shadow-dragged-blur')} ${colorToken('drop-shadow-dragged-color')}`,
747742
none: 'none'
748743
},
749744
borderTopStartRadius: createRenamedProperty('borderStartStartRadius', radius),

packages/dev/parcel-transformer-s2-icon/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"parcel": "2.0.0-dev.1599"
77
},
88
"dependencies": {
9-
"@adobe/spectrum-tokens": "^13.0.0-beta.34",
9+
"@adobe/spectrum-tokens": "^13.0.0-beta.46",
1010
"@parcel/plugin": "2.0.0-dev.1601"
1111
},
1212
"rsp": {

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ __metadata:
143143
languageName: unknown
144144
linkType: soft
145145

146-
"@adobe/spectrum-tokens@npm:^13.0.0-beta.34":
147-
version: 13.0.0-beta.43
148-
resolution: "@adobe/spectrum-tokens@npm:13.0.0-beta.43"
149-
checksum: 10c0/19f364f17a9722a27b64614a985e7bd52c3002f8e53ea0dbf55a5663e4067822762023e0f544ae6eb42e1159616e6cc124f66fd176c5f12da2325a038ed28c7d
146+
"@adobe/spectrum-tokens@npm:^13.0.0-beta.46":
147+
version: 13.0.0-beta.46
148+
resolution: "@adobe/spectrum-tokens@npm:13.0.0-beta.46"
149+
checksum: 10c0/b76a0eed569e2f58c9e9c3aed9128ed13e6171d2d27bc74e92ee5e40eb2c1f2e15e9ac872be3d1815f57f7dd880a33c805b7e3f3e18ce2a7e19e506a1a56c895
150150
languageName: node
151151
linkType: hard
152152

@@ -7427,7 +7427,7 @@ __metadata:
74277427
version: 0.0.0-use.local
74287428
resolution: "@react-spectrum/parcel-transformer-s2-icon@workspace:packages/dev/parcel-transformer-s2-icon"
74297429
dependencies:
7430-
"@adobe/spectrum-tokens": "npm:^13.0.0-beta.34"
7430+
"@adobe/spectrum-tokens": "npm:^13.0.0-beta.46"
74317431
"@parcel/plugin": "npm:2.0.0-dev.1601"
74327432
languageName: unknown
74337433
linkType: soft
@@ -7541,7 +7541,7 @@ __metadata:
75417541
version: 0.0.0-use.local
75427542
resolution: "@react-spectrum/s2@workspace:packages/@react-spectrum/s2"
75437543
dependencies:
7544-
"@adobe/spectrum-tokens": "npm:^13.0.0-beta.34"
7544+
"@adobe/spectrum-tokens": "npm:^13.0.0-beta.46"
75457545
"@parcel/macros": "npm:2.12.1-canary.3165"
75467546
"@react-aria/collections": "npm:3.0.0-alpha.4"
75477547
"@react-aria/i18n": "npm:^3.12.2"

0 commit comments

Comments
 (0)