Skip to content

Commit 93bb166

Browse files
committed
Merge branch 'master' into docs/Input
2 parents 2ed9db3 + d215e54 commit 93bb166

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Change Log
22

3+
## [v0.56.1](https://github.com/Semantic-Org/Semantic-UI-React/tree/v0.56.1) (2016-10-14)
4+
[Full Changelog](https://github.com/Semantic-Org/Semantic-UI-React/compare/v0.56.0...v0.56.1)
5+
6+
**Fixed bugs:**
7+
8+
- Menu.Item allows icon to be set as boolean [\#681](https://github.com/Semantic-Org/Semantic-UI-React/issues/681)
9+
10+
**Closed issues:**
11+
12+
- How to conditional hide/show an element/component ? [\#675](https://github.com/Semantic-Org/Semantic-UI-React/issues/675)
13+
14+
**Merged pull requests:**
15+
16+
- fix\(MenuItem\): allow bool/string icon proptype [\#683](https://github.com/Semantic-Org/Semantic-UI-React/pull/683) ([levithomason](https://github.com/levithomason))
17+
- docs\(Breadcrumb\): refactor and use index.js [\#671](https://github.com/Semantic-Org/Semantic-UI-React/pull/671) ([dpkwhan](https://github.com/dpkwhan))
18+
- docs\(Step\): refactor and fix an issue [\#668](https://github.com/Semantic-Org/Semantic-UI-React/pull/668) ([dpkwhan](https://github.com/dpkwhan))
19+
- docs\(Card\): refactor, add trailing . in description and fix typo [\#667](https://github.com/Semantic-Org/Semantic-UI-React/pull/667) ([dpkwhan](https://github.com/dpkwhan))
20+
- docs\(progress\): refactor, add trailing . to description and use stateless functional expression [\#664](https://github.com/Semantic-Org/Semantic-UI-React/pull/664) ([dpkwhan](https://github.com/dpkwhan))
21+
- docs\(confirm\): add trailing . to description [\#663](https://github.com/Semantic-Org/Semantic-UI-React/pull/663) ([dpkwhan](https://github.com/dpkwhan))
22+
- docs\(Radio\): refactor, use stateless functional expression and fix a typo [\#662](https://github.com/Semantic-Org/Semantic-UI-React/pull/662) ([dpkwhan](https://github.com/dpkwhan))
23+
324
## [v0.56.0](https://github.com/Semantic-Org/Semantic-UI-React/tree/v0.56.0) (2016-10-11)
425
[Full Changelog](https://github.com/Semantic-Org/Semantic-UI-React/compare/v0.55.2...v0.56.0)
526

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "semantic-ui-react",
3-
"version": "0.56.0",
3+
"version": "0.56.1",
44
"description": "The official Semantic-UI-React integration.",
55
"main": "dist/commonjs/index.js",
66
"files": [

src/collections/Menu/MenuItem.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ export default class MenuItem extends Component {
5454
header: PropTypes.bool,
5555

5656
/** MenuItem can be only icon. */
57-
icon: PropTypes.bool,
57+
icon: PropTypes.oneOfType([
58+
PropTypes.bool,
59+
customPropTypes.itemShorthand,
60+
]),
5861

5962
/** MenuItem index inside Menu. */
6063
index: PropTypes.number,

0 commit comments

Comments
 (0)