Skip to content
This repository was archived by the owner on Mar 4, 2020. It is now read-only.

fix(Icon): bordered and circular props not working as expected #907

Merged
mnajdova merged 10 commits into from
Feb 21, 2019
Merged

fix(Icon): bordered and circular props not working as expected #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
695e01f
-fixed circular icons not to appear with border by default
Feb 15, 2019
2954771
-updated changelog
Feb 15, 2019
d9f00a2
-improved examples
Feb 20, 2019
b175223
Merge branch 'master' into fix/icon-circular-without-border
Feb 20, 2019
0ba54de
-reverted description on the border example
Feb 20, 2019
018482a
-introduce breaking changes in the changelog
Feb 20, 2019
6a26e92
-fix typo on the changelog
Feb 20, 2019
3644191
-fix
Feb 20, 2019
f200233
Merge branch 'master' into fix/icon-circular-without-border
Feb 21, 2019
9aafc77
-fixed avatar icon example
Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion docs/src/examples/components/Animation/Types/AnimationExample.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const spinner = {
const AnimationExample = () => (
<Provider theme={{ animations: { spinner } }}>
<Animation name="spinner">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Provider>
)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/examples/components/Animation/Types/AnimationExampleDelay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const AnimationExampleDelay = () => (
<br />
<Provider theme={{ animations: { spinner } }}>
<Animation name="spinner" delay="5s">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Provider>
</div>
Expand Down
8 changes: 4 additions & 4 deletions docs/src/examples/components/Animation/Types/AnimationExampleDirection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ const AnimationExampleDirection = () => (
<Text content="Alternate" />
<Text content="Alternate reverse" />
<Animation name="spinner">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" direction="reverse">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" direction="alternate">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" direction="alternate-reverse">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Grid>
</Provider>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/examples/components/Animation/Types/AnimationExampleDuration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const spinner = {
const AnimationExampleDuration = () => (
<Provider theme={{ animations: { spinner } }}>
<Animation name="spinner" duration="1s">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Provider>
)
Expand Down
8 changes: 4 additions & 4 deletions docs/src/examples/components/Animation/Types/AnimationExampleFillMode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ const AnimationExampleFillMode = () => (
<Text content="Backwards" />
<Text content="Both" />
<Animation name="colorChanger" fillMode="none" delay="3s" iterationCount="1">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="colorChanger" fillMode="forwards" delay="3s" iterationCount="1">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="colorChanger" fillMode="backwards" delay="3s" iterationCount="1">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="colorChanger" fillMode="both" delay="3s" iterationCount="1">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Grid>
</Provider>
Expand Down
8 changes: 4 additions & 4 deletions docs/src/examples/components/Animation/Types/AnimationExampleIterationCount.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ const AnimationExampleIterationCount = () => (
<Text content="5 iterations" />
<Text content="Infinite" />
<Animation name="spinner" iterationCount="1">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" iterationCount="2">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" iterationCount="5">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" iterationCount="infinite">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Grid>
</Provider>
Expand Down
6 changes: 3 additions & 3 deletions docs/src/examples/components/Animation/Types/AnimationExampleKeyframeParams.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ const AnimationExample = () => (
<Provider theme={{ animations: { colorChanger } }}>
<div>
<Animation name="colorChanger">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="colorChanger" keyframeParams={{ fromColor: 'green', toColor: 'yellow' }}>
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="colorChanger" keyframeParams={{ toColor: 'black' }}>
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</div>
</Provider>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/examples/components/Animation/Types/AnimationExamplePlayState.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AnimationExamplePlayState extends React.Component {
<br />
<br />
<Animation name="spinner" playState={this.state.playState}>
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</div>
</Provider>
Expand Down
12 changes: 6 additions & 6 deletions docs/src/examples/components/Animation/Types/AnimationExampleTimingFunction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ const AnimationExampleTimingFunction = () => (
<Text content="Ease in out" />
<Text content="Cubic bezier" />
<Animation name="spinner" timingFunction="ease">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" timingFunction="linear">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" timingFunction="ease-in">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" timingFunction="ease-out">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" timingFunction="ease-in-out">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
<Animation name="spinner" timingFunction="cubic-bezier(0.1, 0.5, 0.1, 0.5)">
<Icon name="umbrella" circular />
<Icon name="umbrella" circular bordered />
</Animation>
</Grid>
</Provider>
Expand Down
8 changes: 7 additions & 1 deletion docs/src/examples/components/Avatar/Variations/AvatarExampleImageCustomization.shorthand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
<Icon name="user" circular variables={{ color: 'blue' }} styles={{ padding: '8px' }} />
<Icon
name="user"
circular
bordered
variables={{ color: 'blue' }}
styles={{ boxSizing: 'border-box', padding: '8px' }}
/>
}
status={{ color: 'green', icon: 'check', title: 'Available' }}
/>
Expand Down
22 changes: 11 additions & 11 deletions docs/src/examples/components/Icon/Variations/IconExampleCircular.shorthand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import { Icon } from '@stardust-ui/react'

const IconExampleCircular = () => (
<div>
<Icon name="chess rook" circular />
<Icon name="book" circular />
<Icon name="expand" circular />
<Icon name="play" circular />
<Icon name="call" circular />
<Icon name="call-video" circular />
<Icon name="stop" circular />
<Icon name="calendar alternate outline" circular />
<Icon name="coffee" circular />
<Icon name="compass outline" circular />
<Icon name="area chart" circular />
<Icon name="chess rook" circular bordered />
<Icon name="book" circular bordered />
<Icon name="expand" circular bordered />
<Icon name="play" circular bordered />
<Icon name="call" circular bordered />
<Icon name="call-video" circular bordered />
<Icon name="stop" circular bordered />
<Icon name="calendar alternate outline" circular bordered />
<Icon name="coffee" circular bordered />
<Icon name="compass outline" circular bordered />
<Icon name="area chart" circular bordered />
</div>
)

Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/RadioGroup/RadioGroupItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class RadioGroupItem extends AutoControlledComponent<
{Icon.create(icon || '', {
defaultProps: {
circular: true,
bordered: true,
size: 'smaller',
styles: styles.icon,
},
Expand Down
9 changes: 5 additions & 4 deletions packages/react/src/themes/teams/components/Icon/iconStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%' } : {}),
}
}

Expand Down Expand Up @@ -119,8 +118,10 @@ const iconStyles: ComponentSlotStylesInput<IconProps, IconVariables> = {

...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)`,
Expand Down