Skip to content

Commit

Permalink
Merge pull request #158 from Yoctol/chore/bump-deps
Browse files Browse the repository at this point in the history 
chore: bump deps
  • Loading branch information
@jigsawye
jigsawye authored Apr 3, 2019
2 parents 7227293 + d55a746 commit 8a32481
Show file tree
Hide file tree
Showing 20 changed files with 756 additions and 616 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Run below commands:
```bash
cd tailor-ui
yarn
yarn start
yarn docs:dev
```

Watch files changed and check type:
Expand Down
62 changes: 31 additions & 31 deletions docs/Button.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,50 +37,50 @@ import { Button } from 'tailor-ui';
</Button>
</Playground>

### Type
### Variant

<Playground>
<Button type="primary">Primary</Button>
<Button type="primary-invert" ml="2">
<Button variant="primary">Primary</Button>
<Button variant="primary-invert" ml="2">
Primary Invert
</Button>
<br />
<br />
<Button type="danger">Danger</Button>
<Button type="danger-invert" ml="2">
<Button variant="danger">Danger</Button>
<Button variant="danger-invert" ml="2">
Danger Invert
</Button>
<br />
<br />
<Button type="regular">Regular</Button>
<Button type="normal" ml="2">
<Button variant="regular">Regular</Button>
<Button variant="normal" ml="2">
Normal
</Button>
</Playground>

### Rounded

<Playground>
<Button rounded type="primary">
<Button rounded variant="primary">
Primary
</Button>
<Button rounded type="primary-invert" ml="2">
<Button rounded variant="primary-invert" ml="2">
Primary Invert
</Button>
<br />
<br />
<Button rounded type="danger">
<Button rounded variant="danger">
Danger
</Button>
<Button rounded type="danger-invert" ml="2">
<Button rounded variant="danger-invert" ml="2">
Danger Invert
</Button>
<br />
<br />
<Button rounded type="regular">
<Button rounded variant="regular">
Regular
</Button>
<Button rounded type="normal" ml="2">
<Button rounded variant="normal" ml="2">
Normal
</Button>
</Playground>
Expand All @@ -92,80 +92,80 @@ import { MdArrowForward } from 'react-icons/md';
```

<Playground>
<Button icon={MdArrowForward} type="primary">
<Button icon={MdArrowForward} variant="primary">
Primary
</Button>
<Button icon={MdArrowForward} type="primary-invert" ml="2">
<Button icon={MdArrowForward} variant="primary-invert" ml="2">
Primary Invert
</Button>
<br />
<br />
<Button icon={MdArrowForward} type="danger">
<Button icon={MdArrowForward} variant="danger">
Danger
</Button>
<Button icon={MdArrowForward} type="danger-invert" ml="2">
<Button icon={MdArrowForward} variant="danger-invert" ml="2">
Danger Invert
</Button>
<br />
<br />
<Button icon={MdArrowForward} type="regular">
<Button icon={MdArrowForward} variant="regular">
Regular
</Button>
<Button icon={MdArrowForward} type="normal" ml="2">
<Button icon={MdArrowForward} variant="normal" ml="2">
Normal
</Button>
</Playground>

### Disabled

<Playground>
<Button disabled type="primary">
<Button disabled variant="primary">
Primary
</Button>
<Button disabled type="primary-invert" ml="2">
<Button disabled variant="primary-invert" ml="2">
Primary Invert
</Button>
<br />
<br />
<Button disabled type="danger">
<Button disabled variant="danger">
Danger
</Button>
<Button disabled type="danger-invert" ml="2">
<Button disabled variant="danger-invert" ml="2">
Danger Invert
</Button>
<br />
<br />
<Button disabled type="regular">
<Button disabled variant="regular">
Regular
</Button>
<Button disabled type="normal" ml="2">
<Button disabled variant="normal" ml="2">
Normal
</Button>
</Playground>

### Loading

<Playground>
<Button loading type="primary">
<Button loading variant="primary">
Primary
</Button>
<Button loading type="primary-invert" ml="2">
<Button loading variant="primary-invert" ml="2">
Primary Invert
</Button>
<br />
<br />
<Button loading type="danger">
<Button loading variant="danger">
Danger
</Button>
<Button loading type="danger-invert" ml="2">
<Button loading variant="danger-invert" ml="2">
Danger Invert
</Button>
<br />
<br />
<Button loading type="regular">
<Button loading variant="regular">
Regular
</Button>
<Button loading type="normal" ml="2">
<Button loading variant="normal" ml="2">
Normal
</Button>
</Playground>
Expand Down
4 changes: 2 additions & 2 deletions docs/Drawer.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ import { Drawer } from 'tailor-ui';
visible={visible}
onClose={() => setVisible(false)}
footer={
<Button type="primary" onClick={() => setVisible(false)}>Close Drawer</Button>
<Button variant="primary" onClick={() => setVisible(false)}>Close Drawer</Button>
}
>
Content...
Expand Down Expand Up @@ -124,7 +124,7 @@ import { Drawer } from 'tailor-ui';
closable={false}
maskClosable={false}
footer={
<Button type="primary" onClick={() => setVisible(false)}>Close Drawer</Button>
<Button variant="primary" onClick={() => setVisible(false)}>Close Drawer</Button>
}
>
Content...
Expand Down
4 changes: 2 additions & 2 deletions docs/Steps.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@ When the task is complicated or has a certain sequence in the series of subtasks
</Flex>

{step < steps.length - 1 && (
<Button type="primary" onClick={() => setStep(step + 1)}>Next</Button>
<Button variant="primary" onClick={() => setStep(step + 1)}>Next</Button>
)}
{step === steps.length - 1 && (
<Button
type="primary"
variant="primary"
onClick={() => message.success('Processing complete!')}
>
Done
Expand Down
10 changes: 5 additions & 5 deletions docs/Table.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { Table } from 'tailor-ui';
<Table.Column>10,000</Table.Column>
<Table.Column>1,000 NTD</Table.Column>
<Table.Column>
<Button type="primary-invert">Action</Button>
<Button variant="primary-invert">Action</Button>
</Table.Column>
</Table.Row>
))}
Expand All @@ -64,7 +64,7 @@ import { Table } from 'tailor-ui';
}
footer={
<Space py="24px" px="4">
<Button type="regular">+ Button</Button>
<Button variant="regular">+ Button</Button>
</Space>
}
>
Expand All @@ -83,7 +83,7 @@ import { Table } from 'tailor-ui';
<Table.Column>10,000</Table.Column>
<Table.Column>1,000 NTD</Table.Column>
<Table.Column>
<Button type="primary-invert">Action</Button>
<Button variant="primary-invert">Action</Button>
</Table.Column>
</Table.Row>
))}
Expand Down Expand Up @@ -117,7 +117,7 @@ import { Table } from 'tailor-ui';
height="80px"
px="4"
>
<Button type="primary-invert" rounded>
<Button variant="primary-invert" rounded>
Action
</Button>
</Flex>
Expand All @@ -139,7 +139,7 @@ import { Table } from 'tailor-ui';
<Table.Column>10,000</Table.Column>
<Table.Column>1,000 NTD</Table.Column>
<Table.Column>
<Button type="primary-invert">Action</Button>
<Button variant="primary-invert">Action</Button>
</Table.Column>
</Table.Row>
))}
Expand Down
44 changes: 22 additions & 22 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,43 +34,43 @@
"testonly:cov": "jest --coverage --runInBand",
"testonly:watch": "jest --watch",
"type-check": "tsc --build tsconfig.build.json",
"watch": "yarn type-check -- --watch"
"watch": "yarn type-check --watch"
},
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0",
"styled-components": ">=4.1.0"
},
"devDependencies": {
"@babel/cli": "^7.2.3",
"@babel/core": "^7.4.0",
"@babel/cli": "^7.4.3",
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-class-properties": "^7.4.0",
"@babel/plugin-transform-runtime": "^7.4.0",
"@babel/polyfill": "^7.4.0",
"@babel/preset-env": "^7.4.2",
"@babel/plugin-transform-runtime": "^7.4.3",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.3.3",
"@types/jest": "^24.0.11",
"@types/lodash.debounce": "^4.0.6",
"@types/ramda": "^0.26.5",
"@types/react": "16.8.8",
"@types/ramda": "^0.26.6",
"@types/react": "16.8.10",
"@types/react-dom": "^16.8.3",
"@types/react-select": "^2.0.15",
"@types/styled-components": "4.1.12",
"@types/styled-system": "^4.0.0",
"@typescript-eslint/eslint-plugin": "^1.5.0",
"@typescript-eslint/parser": "^1.5.0",
"@typescript-eslint/eslint-plugin": "^1.6.0",
"@typescript-eslint/parser": "^1.6.0",
"babel-core": "^7.0.0-0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.5.0",
"babel-jest": "^24.6.0",
"babel-plugin-module-resolver": "^3.2.0",
"babel-plugin-ramda": "^2.0.0",
"babel-plugin-styled-components": "^1.10.0",
"babel-plugin-typescript-to-proptypes": "^0.17.1",
"cross-env": "^5.2.0",
"docz": "^0.13.7",
"docz-theme-default": "^0.13.7",
"eslint": "^5.15.3",
"eslint": "^5.16.0",
"eslint-config-yoctol": "^0.21.1",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-jest": "^2.1.1",
Expand All @@ -82,23 +82,23 @@
"eslint-plugin-sort-imports-es6-autofix": "^0.4.0",
"eslint-plugin-typescript": "^0.14.0",
"husky": "^1.3.1",
"jest": "^24.5.0",
"jest": "^24.6.0",
"jest-dom": "^3.1.3",
"jest-styled-components": "^6.3.1",
"lerna": "^3.13.1",
"lint-staged": "^8.1.5",
"moment": "^2.24.0",
"polished": "^3.1.0",
"polished": "^3.2.0",
"prettier": "^1.16.4",
"prettier-package-json": "^2.1.0",
"react": "^16.8.5",
"react-dom": "^16.8.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-icons": "^3.5.0",
"react-spring": "^8.0.18",
"react-testing-library": "^6.0.2",
"rollup": "^1.7.3",
"react-spring": "^8.0.19",
"react-testing-library": "^6.0.4",
"rollup": "^1.8.0",
"rollup-plugin-babel": "^4.3.2",
"rollup-plugin-commonjs": "^9.2.2",
"rollup-plugin-commonjs": "^9.2.3",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-resolve": "^4.0.1",
"rollup-plugin-size-snapshot": "^0.8.0",
Expand All @@ -107,8 +107,8 @@
"stylelint-config-prettier": "^5.0.0",
"stylelint-config-styled-components": "^0.1.1",
"stylelint-config-yoctol": "^1.1.1",
"stylelint-processor-styled-components": "^1.5.2",
"ts-jest": "^24.0.0",
"stylelint-processor-styled-components": "^1.6.0",
"ts-jest": "^24.0.1",
"typescript": "3.3.4000"
},
"husky": {
Expand Down
6 changes: 3 additions & 3 deletions packages/tailor-ui-lab/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
"tailor-ui": ">=0.4.0"
},
"devDependencies": {
"rollup-plugin-commonjs": "^9.2.2"
"rollup-plugin-commonjs": "^9.2.3"
},
"publishConfig": {
"access": "public"
},
"dependencies": {
"@tailor-ui/utils": "^0.0.1",
"lodash.debounce": "^4.0.8",
"polished": "^3.1.0",
"styled-system": "^4.0.8"
"polished": "^3.2.0",
"styled-system": "^4.1.0"
}
}
2 changes: 1 addition & 1 deletion packages/tailor-ui-lab/src/Popconfirm/Popconfirm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const PopconfirmContent: FunctionComponent<
<Button
ml="2"
size="sm"
type="primary"
variant="primary"
onClick={(event: MouseEvent) => {
hideTooltip();
if (onConfirm) {
Expand Down
2 changes: 1 addition & 1 deletion packages/tailor-ui-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"access": "public"
},
"devDependencies": {
"rollup-plugin-commonjs": "^9.2.2"
"rollup-plugin-commonjs": "^9.2.3"
}
}
Loading

0 comments on commit 8a32481

Please sign in to comment.