Skip to content

Commit

Permalink
fix: prevent boxShadow and ring styles inheritance NO-JIRA
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian-potepa committed Nov 22, 2023
1 parent d4d07c0 commit e7d14b2
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/components/Button/Button.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ const commonConfig = {

const defaultButtonConfig = {
...commonConfig,
ring: 'unset',
boxShadow: '$elevation-bottom-100',
appearance: {
primary: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/Checkbox/Checkbox.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ export const defaultConfig = {
hover: '$color-interaction-default-hover',
},
},
ring: '$border-width-focus',
borderRadius: '$border-radius-medium',
boxShadow: '0 0 #0000',
ring: '$border-width-focus',
ringInset: true,
ringColor: {
_: '$color-interaction-border-neutral-normal',
Expand Down
2 changes: 2 additions & 0 deletions src/components/Counter/Counter.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ export const defaultConfig = {
default: {
emphasis: {
high: {
boxShadow: '0 0 #0000',
ring: '$border-width-small',
ringColor: '$color-border-neutral-strong',
backgroundColor: '$color-background-default',
color: '$color-content-primary',
},
low: {
boxShadow: '0 0 #0000',
ring: '$border-width-small',
ringColor: '$color-border-neutral-subtle',
backgroundColor: '$color-background-default',
Expand Down
1 change: 1 addition & 0 deletions src/components/InlineBanner/InlineBanner.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const defaultConfig = {
p: '$space-component-padding-xLarge',
gap: '$space-component-gap-large',
borderRadius: '$border-radius-large',
boxShadow: '0 0 #0000',
ring: '$border-width-small',
ringInset: true,
intent: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/RadioButton/RadioButton.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ export const defaultConfig = {
alignItems: 'center',
flexShrink: 0,
backgroundColor: '$color-interaction-background-formField',
borderRadius: '$border-radius-full',
boxShadow: '0 0 #0000',
ring: {
_: '$border-width-focus',
checked: '5px',
},
borderRadius: '$border-radius-full',
ringInset: true,
ringColor: {
_: '$color-interaction-border-neutral-normal',
Expand Down
4 changes: 3 additions & 1 deletion src/components/SocialButton/SocialButton.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ export const defaultConfig = {
selected: '$color-action-outline-selected',
},
},
primary: {},
primary: {
ring: 'unset',
},
},
} satisfies SocialButtonConfig;

Expand Down
1 change: 1 addition & 0 deletions src/components/StatusDot/StatusDot.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const defaultConfig = {
},
},
hasStroke: {
boxShadow: '0 0 #0000',
ring: '$border-width-medium',
ringColor: '$color-border-inverted',
},
Expand Down
1 change: 1 addition & 0 deletions src/components/TextInput/TextInput.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export const defaultConfig = {
padding: '$space-component-padding-small $space-component-padding-large',
flexShrink: 0,
ringInset: true,
boxShadow: '0 0 #0000',
ring: '$border-width-small',
ringColor: {
_: '$color-interaction-border-neutral-normal',
Expand Down

0 comments on commit e7d14b2

Please sign in to comment.