diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c5d1afa49..935bd4dfc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### BREAKING CHANGES +- removed logic for adding borders by default if the `Icon` has the `circular` prop @mnajdova ([#907](https://github.com/stardust-ui/react/pull/907)) + ### Features - Export `lock` SVG icon @VyshnaviDasari ([#906](https://github.com/stardust-ui/react/pull/906)) - Adding status behavior @kolaps33 ([#880](https://github.com/stardust-ui/react/pull/880)) diff --git a/docs/src/examples/components/Animation/Types/AnimationExample.tsx b/docs/src/examples/components/Animation/Types/AnimationExample.tsx index 1401bcbaf6..c4ef960f4e 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExample.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExample.tsx @@ -17,7 +17,7 @@ const spinner = { const AnimationExample = () => ( - + ) diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleDelay.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleDelay.tsx index 870798c023..69e87858c1 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleDelay.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleDelay.tsx @@ -20,7 +20,7 @@ const AnimationExampleDelay = () => (
- + diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleDirection.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleDirection.tsx index 5582331bab..1fe4beeb2e 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleDirection.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleDirection.tsx @@ -22,16 +22,16 @@ const AnimationExampleDirection = () => ( - + - + - + - + diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleDuration.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleDuration.tsx index a1792c9f13..d32ef096b4 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleDuration.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleDuration.tsx @@ -17,7 +17,7 @@ const spinner = { const AnimationExampleDuration = () => ( - + ) diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleFillMode.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleFillMode.tsx index cf5712cf13..7a33ec8380 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleFillMode.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleFillMode.tsx @@ -18,16 +18,16 @@ const AnimationExampleFillMode = () => ( - + - + - + - + diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleIterationCount.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleIterationCount.tsx index bfa4b025b7..90b6ef3d9c 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleIterationCount.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleIterationCount.tsx @@ -22,16 +22,16 @@ const AnimationExampleIterationCount = () => ( - + - + - + - + diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleKeyframeParams.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleKeyframeParams.tsx index d76dc484c8..112efb54ba 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleKeyframeParams.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleKeyframeParams.tsx @@ -19,13 +19,13 @@ const AnimationExample = () => (
- + - + - +
diff --git a/docs/src/examples/components/Animation/Types/AnimationExamplePlayState.tsx b/docs/src/examples/components/Animation/Types/AnimationExamplePlayState.tsx index 7180e8f537..38c16ee140 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExamplePlayState.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExamplePlayState.tsx @@ -38,7 +38,7 @@ class AnimationExamplePlayState extends React.Component {

- + diff --git a/docs/src/examples/components/Animation/Types/AnimationExampleTimingFunction.tsx b/docs/src/examples/components/Animation/Types/AnimationExampleTimingFunction.tsx index 1442b14d7f..aa18dacac4 100644 --- a/docs/src/examples/components/Animation/Types/AnimationExampleTimingFunction.tsx +++ b/docs/src/examples/components/Animation/Types/AnimationExampleTimingFunction.tsx @@ -24,22 +24,22 @@ const AnimationExampleTimingFunction = () => ( - + - + - + - + - + - + diff --git a/docs/src/examples/components/Avatar/Variations/AvatarExampleImageCustomization.shorthand.tsx b/docs/src/examples/components/Avatar/Variations/AvatarExampleImageCustomization.shorthand.tsx index 3c3f8a6207..f2f012ba58 100644 --- a/docs/src/examples/components/Avatar/Variations/AvatarExampleImageCustomization.shorthand.tsx +++ b/docs/src/examples/components/Avatar/Variations/AvatarExampleImageCustomization.shorthand.tsx @@ -17,7 +17,13 @@ const AvatarExampleImageCustomizationShorthand = () => ( image={ // This example does not react to the avatar size variable // and otherwise produces bad results when border is applied compared to "normal" image - + } status={{ color: 'green', icon: 'check', title: 'Available' }} /> diff --git a/docs/src/examples/components/Icon/Variations/IconExampleCircular.shorthand.tsx b/docs/src/examples/components/Icon/Variations/IconExampleCircular.shorthand.tsx index 41facfdb3e..cba85f6218 100644 --- a/docs/src/examples/components/Icon/Variations/IconExampleCircular.shorthand.tsx +++ b/docs/src/examples/components/Icon/Variations/IconExampleCircular.shorthand.tsx @@ -3,17 +3,17 @@ import { Icon } from '@stardust-ui/react' const IconExampleCircular = () => (
- - - - - - - - - - - + + + + + + + + + + +
) diff --git a/packages/react/src/components/RadioGroup/RadioGroupItem.tsx b/packages/react/src/components/RadioGroup/RadioGroupItem.tsx index 7e81877829..72dc25f531 100644 --- a/packages/react/src/components/RadioGroup/RadioGroupItem.tsx +++ b/packages/react/src/components/RadioGroup/RadioGroupItem.tsx @@ -159,6 +159,7 @@ class RadioGroupItem extends AutoControlledComponent< {Icon.create(icon || '', { defaultProps: { circular: true, + bordered: true, size: 'smaller', styles: styles.icon, }, diff --git a/packages/react/src/themes/teams/components/Icon/iconStyles.ts b/packages/react/src/themes/teams/components/Icon/iconStyles.ts index b899f4554f..8251650246 100644 --- a/packages/react/src/themes/teams/components/Icon/iconStyles.ts +++ b/packages/react/src/themes/teams/components/Icon/iconStyles.ts @@ -58,12 +58,11 @@ const getXSpacingStyles = (xSpacing: IconXSpacing, horizontalSpace: string): ICS } } -const getBorderedStyles = (circular: boolean, boxShadowColor: string): ICSSInJSStyle => { +const getBorderedStyles = (boxShadowColor: string): ICSSInJSStyle => { return { ...getPaddedStyle(), boxShadow: `0 0 0 .05rem ${boxShadowColor} inset`, - ...(circular ? { borderRadius: '50%' } : {}), } } @@ -119,8 +118,10 @@ const iconStyles: ComponentSlotStylesInput = { ...getXSpacingStyles(xSpacing, v.horizontalSpace), - ...((bordered || v.borderColor || circular) && - getBorderedStyles(circular, v.borderColor || getIconColor(color, v))), + ...(circular && { ...getPaddedStyle(), borderRadius: '50%' }), + + ...((bordered || v.borderColor) && + getBorderedStyles(v.borderColor || getIconColor(color, v))), ...(!rtl && { transform: `rotate(${rotate}deg)`,