Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/5app/base5-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
diondiondion committed Jan 30, 2020
2 parents 4ee4768 + 83ab2fe commit 0b137de
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [6.17.5](https://github.com/5app/base5-ui/compare/v6.17.4...v6.17.5) (2020-01-23)


### Bug Fixes

* **Table:** Remove outdated isLoading prop ([a889b41](https://github.com/5app/base5-ui/commit/a889b415ae4f572b9d1463491b022b28b5306ec5))

## [6.17.4](https://github.com/5app/base5-ui/compare/v6.17.3...v6.17.4) (2020-01-15)


Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "base5-ui",
"version": "6.17.4",
"version": "6.17.5",
"description": "5app's reusable UI component library",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -37,8 +37,8 @@
"@babel/preset-env": "^7.6.3",
"@commitlint/cli": "^8.2.0",
"@commitlint/config-conventional": "^8.2.0",
"@semantic-release/changelog": "^3.0.5",
"@semantic-release/git": "^8.0.0",
"@semantic-release/changelog": "^5.0.0",
"@semantic-release/git": "^9.0.0",
"@testing-library/react": "^9.3.1",
"@testing-library/jest-dom": "^5.0.0",
"babel-eslint": "^10.0.2",
Expand All @@ -54,14 +54,14 @@
"eslint-plugin-react-hooks": "^2.2.0",
"gh-pages": "^2.1.1",
"husky": "^4.0.3",
"jest": "^24.9.0",
"jest": "^25.0.0",
"pixo": "^1.1.2",
"prettier": "^1.18.2",
"prop-types": "^15.7.2",
"react": "^16.11.0",
"react-docgen-annotation-resolver": "^2.0.0",
"react-dom": "^16.11.0",
"semantic-release": "^16.0.0",
"semantic-release": "^17.0.0",
"styled-components": "^5.0.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/Table/README.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The table data is provided as an array of objects. The column names defined will
```

<Playground>
<Table isLoading data={dummyData.slice(0, 4)} itemKey="name">
<Table data={dummyData.slice(0, 4)} itemKey="name">
<Column isHeading name="Name" />
<Column name="Email" />
<Column name="Country" cellRenderer={item => item.region} />
Expand Down

0 comments on commit 0b137de

Please sign in to comment.