Skip to content

Commit

Permalink
**Breaking:** Remove deprecated constants (#929)
Browse files Browse the repository at this point in the history
* Remove deprecated constants

* Remove unnecessary deprecated things

* Remove deprecated Status API

* Remove useless deprecate HOC

* Remove misleading deprecate word in Code

* Update snapshots

* Remove top margin from breadcrumbs

* Update snapshots. Again

* Update AvatarGroup to remove deprecated API

* Update Card's usage of Status

* Refactor Switch's color choices

* Update DatePicker styles

* Update Grid styles

* Update Messages stack style

* Fix Select styles

* Update snapshots

* Update AvatarGroup usage
  • Loading branch information
Tejas Kumar authored Mar 12, 2019
1 parent d01850c commit 08b7f61
Show file tree
Hide file tree
Showing 39 changed files with 149 additions and 489 deletions.
8 changes: 3 additions & 5 deletions src/AvatarGroup/AvatarGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export interface AvatarItem {
}

export interface AvatarGroupProps extends DefaultProps {
children?: React.ReactNode
children?: never
/** Avatars list */
avatars?: AvatarItem[]
avatars: AvatarItem[]
/** Maximum number of avatars to display */
maximumToDisplay?: number
/** More button handler */
Expand All @@ -29,9 +29,7 @@ const GroupedAvatar = styled(Avatar)({
})

const AvatarGroup: React.SFC<AvatarGroupProps> = ({ avatars, size, onMoreClick, ...props }) => {
const avatarsToDisplay = avatars
? avatars.map((avatar, i) => <GroupedAvatar addBorder size={size} key={i} {...avatar} />)
: props.children
const avatarsToDisplay = avatars.map((avatar, i) => <GroupedAvatar addBorder size={size} key={i} {...avatar} />)
const count = React.Children.count(avatarsToDisplay)
const mustSlice = props.maximumToDisplay! < count

Expand Down
21 changes: 0 additions & 21 deletions src/AvatarGroup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,3 @@ const avatars = [
<AvatarGroup avatars={avatars} maximumToDisplay={8} />
</>
```

### Should also work with the old API

```jsx
const avatars = [
{
name: "Peter Pan",
photo: "https://www.robots-and-dragons.de/sites/default/files/field/image/preview/disney-peter_pan.jpg",
},
{ name: "Wendy Darling" },
{ name: "John Darling" },
{ name: "Micheal Darling" },
{ name: "George Darling" },
{ name: "Tiger Lily" },
{ name: "Tinker Bell" },
{ name: "The Crocodile" },
{ name: "Captain Hook" },
{ name: "Mr. Smee" },
]
;<AvatarGroup>{avatars.map(({ name, photo }, i) => <Avatar key={i} name={name} photo={photo} />)}</AvatarGroup>
```
4 changes: 2 additions & 2 deletions src/Breadcrumbs/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ const Container = styled("div")({

const Slash = styled("span")(({ theme }) => ({
display: "inline-block",
margin: `0 ${theme.deprecated.spacing / 2}px`,
color: theme.deprecated.colors.gray,
margin: `0 ${theme.space.medium}px`,
color: theme.color.text.lightest,
":first-child": {
marginLeft: 0,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ exports[`Breadcrumbs Component Should initialize properly 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-1cv420n-breadcrumbs"
>
<span
class="css-udjxb6"
class="css-rgflzp"
>
/
</span>
Expand All @@ -29,7 +29,7 @@ exports[`Breadcrumbs Component Should initialize properly 1`] = `
</span>
</span>
<span
class="css-udjxb6"
class="css-rgflzp"
>
/
</span>
Expand Down
2 changes: 1 addition & 1 deletion src/Button/__tests__/__snapshots__/Button.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Button Component Should initialize properly 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<button
class="css-1po5ksq"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`ButtonGroup Component Should initialize properly 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-f3sa0o-buttongroup"
Expand Down
2 changes: 1 addition & 1 deletion src/Card/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const myData = {
repo: val => val.split(".com")[1],
status: val => (
<div>
<Status success={val === "deployed"} />
<Status state={val === "deployed" ? "success" : undefined} />
{val}
</div>
),
Expand Down
2 changes: 1 addition & 1 deletion src/Card/__tests__/__snapshots__/Card.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Card Should render 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-1wstrtr"
Expand Down
30 changes: 14 additions & 16 deletions src/CardColumns/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ The `CardColumns` component is used as a wrapper around groups of `CardColumn` c
<p>Here is the information available about this bundle.</p>
<CardColumns>
<CardColumn title="Contributors">
<AvatarGroup>
<Avatar name="Alice Bernoulli" />
<Avatar name="Clarence Dermot" />
</AvatarGroup>
<AvatarGroup avatars={[{ name: "Alice Bernoulli" }, { name: "Clarence Dermot" }]} />
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
Expand All @@ -28,10 +25,7 @@ The `CardColumns` component is used as a wrapper around groups of `CardColumn` c
<p>Here is the information available about this bundle.</p>
<CardColumns>
<CardColumn title="Contributors">
<AvatarGroup>
<Avatar name="Alice Bernoulli" />
<Avatar name="Clarence Dermot" />
</AvatarGroup>
<AvatarGroup avatars={[{ name: "Alice Bernoulli" }, { name: "Clarence Dermot" }]} />
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
Expand Down Expand Up @@ -96,15 +90,22 @@ The `CardColumns` component is used as a wrapper around groups of `CardColumn` c

### With an exact number of columns

Change the following to `columns={4}` on line 3 to see the columns shift.

```jsx
<Card title="Bundle information">
<p>Here is the information available about this bundle.</p>
<CardColumns columns={3}>
<CardColumn title="Contributors">
<AvatarGroup>
<Avatar name="Alice Bernoulli" />
<Avatar name="Clarence Dermot" />
</AvatarGroup>
<AvatarGroup avatars={[{ name: "Alice Bernoulli" }, { name: "Clarence Dermot" }]} />
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
<Chip>production</Chip>
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
<Chip>production</Chip>
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
Expand All @@ -121,10 +122,7 @@ Columns will always wrap and overflow if their containing element is not wide en
<p>Here is the information available about this bundle.</p>
<CardColumns columns={3} style={{ width: "200px" }}>
<CardColumn title="Contributors">
<AvatarGroup>
<Avatar name="Alice Bernoulli" />
<Avatar name="Clarence Dermot" />
</AvatarGroup>
<AvatarGroup avatars={[{ name: "Alice Bernoulli" }, { name: "Clarence Dermot" }]} />
</CardColumn>
<CardColumn title="Tags">
<Chip>agent-view</Chip>
Expand Down
2 changes: 1 addition & 1 deletion src/Chip/__tests__/__snapshots__/Chip.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Chip Should render 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-5qy0rm-chip"
Expand Down
2 changes: 1 addition & 1 deletion src/Code/Code.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const defaultCodeTheme = {
base0E: "#2aa198",

/**
* Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
* Opening/Closing Embedded Language Tags, e.g. <?php ?>
*/
base0F: "#268bd2",
}
Expand Down
2 changes: 1 addition & 1 deletion src/Code/__tests__/__snapshots__/Code.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Code Should render 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-1e9yps6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`ContextMenu Component Should render 1`] = `
class="css-ftf61z"
>
<div
class="css-16holpz-Messages"
class="css-p29iif"
/>
<div
class="css-lra4z2-contextmenu"
Expand Down
37 changes: 17 additions & 20 deletions src/DatePicker/DatePicker.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@ export const DatePickerCard = styled("div")<{ isExpanded: boolean }>(
left: 0,
},
({ theme, isExpanded }) => ({
backgroundColor: theme.deprecated.colors.white,
backgroundColor: theme.color.white,
display: isExpanded ? "block" : "none",
boxShadow: theme.deprecated.shadows.popup,
borderRadius: theme.deprecated.borderRadius,
boxShadow: theme.shadows.popup,
borderRadius: theme.borderRadius,
// Push down the card to the bottom of the input field,
// plus the twice the size of the outside focus shadow.
top: inputHeight + 6,
padding: `${(theme.deprecated.spacing * 3) / 4}px ${theme.deprecated.spacing}px ${(theme.deprecated.spacing * 4) /
3}px`,
padding: theme.space.content,
width: inputDefaultWidth,
zIndex: theme.deprecated.baseZIndex + 1000,
zIndex: theme.zIndex.selectOptions,
}),
)

Expand All @@ -43,24 +42,23 @@ export const Toggle = styled("div")(({ theme }) => ({
cursor: "pointer",
top: 1,
right: 1,
borderTopRightRadius: theme.deprecated.borderRadius,
borderBottomRightRadius: theme.deprecated.borderRadius,
borderTopRightRadius: theme.borderRadius,
borderBottomRightRadius: theme.borderRadius,
width: inputHeight - 2,
height: inputHeight - 2,
fontSize: 10,
display: "flex",
alignItems: "center",
justifyContent: "center",
zIndex: theme.deprecated.baseZIndex + 1000,
color: theme.deprecated.colors.inputBorder,
zIndex: theme.zIndex.selectOptions,
color: theme.color.text.default,
borderLeft: "1px solid",
borderColor: theme.deprecated.colors.inputBorder,
borderColor: theme.color.border.default,
"& svg": {
position: "relative",
pointerEvents: "none",
},
":hover": {
backgroundColor: theme.deprecated.colors.lighterBackground,
backgroundColor: theme.color.background.lighter,
},
}))

Expand All @@ -73,7 +71,6 @@ export const MonthNav = styled("div")(({ theme }) => ({
display: "inline-block",
},
"& > span": {
...theme.deprecated.typography.body,
userSelect: "none",
width: 120,
textAlign: "center",
Expand Down Expand Up @@ -135,7 +132,7 @@ const BaseDay = styled("div")(({ theme }) => ({
borderRadius: "50%",
backgroundClip: "content-box",
fontSize: theme.font.size.body,
fontWeght: theme.font.weight.regular,
fontWeight: theme.font.weight.regular,
}))

export const Day = styled(BaseDay)<{
Expand All @@ -162,16 +159,16 @@ export const DayOfWeek = styled(BaseDay)`
`

export const Input = styled("input")<{ isExpanded: boolean }>(({ theme, isExpanded }) => ({
...theme.deprecated.typography.body,
userSelect: "none",
borderRadius: theme.deprecated.borderRadius,
padding: (theme.deprecated.spacing * 2) / 3,
borderRadius: theme.borderRadius,
padding: theme.space.element / 3,
height: inputHeight,
cursor: "pointer",
border: "1px solid",
borderColor: "rgb(208, 217, 229)",
width: "100%",
position: "relative",
fontSize: theme.font.size.small,
"&:focus": mixins.inputFocus({
theme,
}),
Expand All @@ -194,11 +191,11 @@ export const ClearButton = styled("div")(({ theme }) => ({
right: -inputHeight + 1,
opacity: 0.3,
textAlign: "center",
zIndex: theme.deprecated.baseZIndex + 100,
zIndex: theme.zIndex.selectOptions,
"&:hover": {
opacity: 1,
"& svg": {
stroke: theme.deprecated.colors.warning,
stroke: theme.color.warning,
},
},
}))
Loading

0 comments on commit 08b7f61

Please sign in to comment.