Skip to content

Commit

Permalink
feat(IconButton): Complete component IconButton
Browse files Browse the repository at this point in the history
  • Loading branch information
xinyao27 committed Jul 10, 2019
1 parent 1319fa1 commit 5f989e3
Show file tree
Hide file tree
Showing 16 changed files with 927 additions and 62 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -30,7 +30,7 @@
"husky": "^2.4.0",
"jest": "^24.8.0",
"jest-config": "^24.8.0",
"jest-styled-components": "^6.3.3",
"jest-styled-components": "^7.0.0-beta.1",
"lerna": "^3.14.1",
"lint-staged": "^8.1.7",
"prettier": "^1.17.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/fluent-ui.com/package.json
Expand Up @@ -45,7 +45,7 @@
"react-dom": "^16.8.6",
"react-helmet": "^5.2.1",
"react-live": "^2.1.2",
"styled-components": "^4.3.2"
"styled-components": "^5.0.0-beta.8"
},
"devDependencies": {
"@types/markdown-to-jsx": "^6.9.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/fluent-ui.com/src/docs/components/Button/README.md
Expand Up @@ -42,3 +42,11 @@ Use the `size` property.
<Button size="large">large</Button>
</>
```

## As

As a

```jsx
<Button as="a" href="#">As a</Button>
```
60 changes: 60 additions & 0 deletions packages/fluent-ui.com/src/docs/components/IconButton/README.md
@@ -0,0 +1,60 @@
---
title: IconButton
components: IconButton
---

# IconButtons

## Variant

Button default style

```jsx
<IconButton>
<Icon.Accept />
</IconButton>
```

Highlighted button

```jsx
<IconButton variant="accent">
<Icon.Accept />
</IconButton>
```

## Disabled

```jsx
<IconButton disabled>
<Icon.Accept />
</IconButton>
```

## Sizes

Use the `size` property.

```jsx
<>
<IconButton size="small" variant="accent">
<Icon.Accept />
</IconButton>
<IconButton size="medium" variant="accent">
<Icon.Accept />
</IconButton>
<IconButton size="large" variant="accent">
<Icon.Accept />
</IconButton>
</>
```

## As

As a

```jsx
<IconButton as="a" href="#">
<Icon.Accept />
</IconButton>
```
2 changes: 1 addition & 1 deletion packages/fluent-ui/package.json
Expand Up @@ -38,7 +38,7 @@
"peerDependencies": {
"react": ">= 16.8.0",
"react-dom": ">= 16.8.0",
"styled-components": ">= 4.X"
"styled-components": ">= 5.X"
},
"dependencies": {
"@fluent-ui/icons": "^0.0.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/fluent-ui/src/Button/Button.styled.ts
Expand Up @@ -44,13 +44,13 @@ const sizes = variant({
default: 'medium',
variants: {
small: css`
${th.size('small')}
${th.size('small.button')}
`,
medium: css`
${th.size('medium')}
${th.size('medium.button')}
`,
large: css`
${th.size('large')}
${th.size('large.button')}
`
}
})
Expand Down
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Command acrylic 1`] = `
.c1 {
.c0 {
background-color: #e6e6e6;
position: relative;
overflow: hidden;
Expand Down Expand Up @@ -59,7 +59,7 @@ exports[`Command acrylic 1`] = `
fill: currentColor;
}
.c0 {
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -132,14 +132,14 @@ exports[`Command acrylic 1`] = `
}
@supports (-webkit-backdrop-filter:blur(10px)) or (backdrop-filter:blur(10px)) {
.c1 {
.c0 {
background: none !important;
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
}
.c1::before,
.c1::after {
.c0::before,
.c0::after {
content: '';
position: absolute;
left: 0;
Expand All @@ -148,21 +148,21 @@ exports[`Command acrylic 1`] = `
bottom: 0;
}
.c1::before {
.c0::before {
z-index: -2;
opacity: 0.5;
background-color: #e6e6e6;
}
.c1::after {
.c0::after {
z-index: -1;
opacity: 0.25;
background-image: url(data:image/png;base64,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);
}
}
<div
className="c0 c1"
className="sc-AykKC c0 c1"
>
<div
className="c2"
Expand Down Expand Up @@ -228,7 +228,7 @@ exports[`Command acrylic 1`] = `
`;

exports[`Command basic 1`] = `
.c1 {
.c0 {
background-color: #e6e6e6;
}
Expand Down Expand Up @@ -284,7 +284,7 @@ exports[`Command basic 1`] = `
fill: currentColor;
}
.c0 {
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -423,7 +423,7 @@ exports[`Command basic 1`] = `
`;

exports[`Command button with label 1`] = `
.c1 {
.c0 {
background-color: #e6e6e6;
}
Expand Down Expand Up @@ -479,7 +479,7 @@ exports[`Command button with label 1`] = `
fill: currentColor;
}
.c0 {
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -640,7 +640,7 @@ exports[`Command button with label 1`] = `
`;

exports[`Command reveal 1`] = `
.c1 {
.c0 {
background-color: #e6e6e6;
}
Expand Down Expand Up @@ -696,7 +696,7 @@ exports[`Command reveal 1`] = `
fill: currentColor;
}
.c0 {
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -880,7 +880,7 @@ exports[`Command reveal 1`] = `
`;

exports[`Command without Content and Secondary 1`] = `
.c1 {
.c0 {
background-color: #e6e6e6;
position: relative;
overflow: hidden;
Expand Down Expand Up @@ -925,7 +925,7 @@ exports[`Command without Content and Secondary 1`] = `
fill: currentColor;
}
.c0 {
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand Down Expand Up @@ -984,14 +984,14 @@ exports[`Command without Content and Secondary 1`] = `
}
@supports (-webkit-backdrop-filter:blur(10px)) or (backdrop-filter:blur(10px)) {
.c1 {
.c0 {
background: none !important;
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
}
.c1::before,
.c1::after {
.c0::before,
.c0::after {
content: '';
position: absolute;
left: 0;
Expand All @@ -1000,21 +1000,21 @@ exports[`Command without Content and Secondary 1`] = `
bottom: 0;
}
.c1::before {
.c0::before {
z-index: -2;
opacity: 0.5;
background-color: #e6e6e6;
}
.c1::after {
.c0::after {
z-index: -1;
opacity: 0.25;
background-image: url(data:image/png;base64,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);
}
}
<div
className="c0 c1"
className="sc-AykKC c0 c1"
>
<div
className="c2"
Expand Down
70 changes: 70 additions & 0 deletions packages/fluent-ui/src/IconButton/IconButton.styled.ts
@@ -0,0 +1,70 @@
import { styled, th, css, variant } from '../styles/styled'
import { IconButtonProps } from './IconButton'

const base = css`
border: none;
outline: none;
padding: 12px;
line-height: 1;
display: inline-flex;
flex-direction: column;
align-items: center;
justify-content: center;
cursor: pointer;
color: inherit;
transition: ${th.transition('button')};
&:hover {
background-color: ${th.color('primary.light2')};
}
&:active {
color: ${th.color('black.default')};
background-color: ${th.color('primary.default')};
}
&:disabled {
color: ${th.color('primary.dark3')};
background-color: ${th.color('primary.default')};
cursor: not-allowed;
pointer-events: none;
}
`

const variants = variant({
prop: 'variant',
default: 'primary',
variants: {
primary: css``,
accent: css`
color: ${th.color('white.default')};
background-color: ${th.color('accent.default')};
&:hover {
background-color: ${th.color('accent.dark1')};
}
&:active {
color: ${th.color('white.default')};
background-color: ${th.color('accent.default')};
}
`
}
})

const sizes = variant({
prop: 'size',
default: 'medium',
variants: {
small: css`
${th.size('small.iconButton')}
`,
medium: css`
${th.size('medium.iconButton')}
`,
large: css`
${th.size('large.iconButton')}
`
}
})

export const IconButtonStyled = styled.button<IconButtonProps>`
${base}
${variants}
${sizes}
`

0 comments on commit 5f989e3

Please sign in to comment.