diff --git a/packages/@react-spectrum/s2/package.json b/packages/@react-spectrum/s2/package.json index f5b054c4583..995f2c631ce 100644 --- a/packages/@react-spectrum/s2/package.json +++ b/packages/@react-spectrum/s2/package.json @@ -120,7 +120,7 @@ "postpack": "git checkout -- package.json" }, "devDependencies": { - "@adobe/spectrum-tokens": "^13.0.0-beta.34", + "@adobe/spectrum-tokens": "^13.0.0-beta.46", "@parcel/macros": "2.12.1-canary.3165" }, "dependencies": { diff --git a/packages/@react-spectrum/s2/style/spectrum-theme.ts b/packages/@react-spectrum/s2/style/spectrum-theme.ts index d71cec5e31b..6afdda71e92 100644 --- a/packages/@react-spectrum/s2/style/spectrum-theme.ts +++ b/packages/@react-spectrum/s2/style/spectrum-theme.ts @@ -466,13 +466,6 @@ export const style = createTheme({ isFocusVisible: weirdColorToken('negative-background-color-key-focus'), isPressed: weirdColorToken('negative-background-color-down') }, - 'negative-subdued': { - default: colorToken('negative-subdued-background-color-default'), - isHovered: colorToken('negative-subdued-background-color-hover'), - isFocusVisible: colorToken('negative-subdued-background-color-key-focus'), - isPressed: colorToken('negative-subdued-background-color-down') - }, - // Sort of weird to have both subdued and subtle that map to the same color... 'negative-subtle': colorToken('negative-subtle-background-color-default'), informative: { default: weirdColorToken('informative-background-color-default'), @@ -739,11 +732,13 @@ export const style = createTheme({ boxShadow: { 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')}`, elevated: `${getToken('drop-shadow-elevated-x')} ${getToken('drop-shadow-elevated-y')} ${getToken('drop-shadow-elevated-blur')} ${colorToken('drop-shadow-elevated-color')}`, + dragged: `${getToken('drop-shadow-dragged-x')} ${getToken('drop-shadow-dragged-y')} ${getToken('drop-shadow-dragged-blur')} ${colorToken('drop-shadow-dragged-color')}`, none: 'none' }, filter: { 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')})`, elevated: `drop-shadow(${getToken('drop-shadow-elevated-x')} ${getToken('drop-shadow-elevated-y')} ${getToken('drop-shadow-elevated-blur')} ${colorToken('drop-shadow-elevated-color')})`, + dragged: `drop-shadow${getToken('drop-shadow-dragged-x')} ${getToken('drop-shadow-dragged-y')} ${getToken('drop-shadow-dragged-blur')} ${colorToken('drop-shadow-dragged-color')}`, none: 'none' }, borderTopStartRadius: createRenamedProperty('borderStartStartRadius', radius), diff --git a/packages/dev/parcel-transformer-s2-icon/package.json b/packages/dev/parcel-transformer-s2-icon/package.json index 7935a121aaa..8aa6e6ad3c3 100644 --- a/packages/dev/parcel-transformer-s2-icon/package.json +++ b/packages/dev/parcel-transformer-s2-icon/package.json @@ -6,7 +6,7 @@ "parcel": "2.0.0-dev.1599" }, "dependencies": { - "@adobe/spectrum-tokens": "^13.0.0-beta.34", + "@adobe/spectrum-tokens": "^13.0.0-beta.46", "@parcel/plugin": "2.0.0-dev.1601" }, "rsp": { diff --git a/yarn.lock b/yarn.lock index aa3677c282c..3dac3fa9cf6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,10 +143,10 @@ __metadata: languageName: unknown linkType: soft -"@adobe/spectrum-tokens@npm:^13.0.0-beta.34": - version: 13.0.0-beta.43 - resolution: "@adobe/spectrum-tokens@npm:13.0.0-beta.43" - checksum: 10c0/19f364f17a9722a27b64614a985e7bd52c3002f8e53ea0dbf55a5663e4067822762023e0f544ae6eb42e1159616e6cc124f66fd176c5f12da2325a038ed28c7d +"@adobe/spectrum-tokens@npm:^13.0.0-beta.46": + version: 13.0.0-beta.46 + resolution: "@adobe/spectrum-tokens@npm:13.0.0-beta.46" + checksum: 10c0/b76a0eed569e2f58c9e9c3aed9128ed13e6171d2d27bc74e92ee5e40eb2c1f2e15e9ac872be3d1815f57f7dd880a33c805b7e3f3e18ce2a7e19e506a1a56c895 languageName: node linkType: hard @@ -7427,7 +7427,7 @@ __metadata: version: 0.0.0-use.local resolution: "@react-spectrum/parcel-transformer-s2-icon@workspace:packages/dev/parcel-transformer-s2-icon" dependencies: - "@adobe/spectrum-tokens": "npm:^13.0.0-beta.34" + "@adobe/spectrum-tokens": "npm:^13.0.0-beta.46" "@parcel/plugin": "npm:2.0.0-dev.1601" languageName: unknown linkType: soft @@ -7541,7 +7541,7 @@ __metadata: version: 0.0.0-use.local resolution: "@react-spectrum/s2@workspace:packages/@react-spectrum/s2" dependencies: - "@adobe/spectrum-tokens": "npm:^13.0.0-beta.34" + "@adobe/spectrum-tokens": "npm:^13.0.0-beta.46" "@parcel/macros": "npm:2.12.1-canary.3165" "@react-aria/collections": "npm:3.0.0-alpha.4" "@react-aria/i18n": "npm:^3.12.2"