Merge branch 'dev' of github.com:soyjavi/react-toolbox into dev
* 'dev' of github.com:soyjavi/react-toolbox: Passes IconMenu's theme to the inner Menu. Replace react-addons-update with immutability-helper as Facebook are deprecating their addonold
commit
9b48fa03dd
|
@ -71,6 +71,7 @@ const factory = (IconButton, Menu) => {
|
||||||
ripple={this.props.menuRipple}
|
ripple={this.props.menuRipple}
|
||||||
selectable={this.props.selectable}
|
selectable={this.props.selectable}
|
||||||
selected={this.props.selected}
|
selected={this.props.selected}
|
||||||
|
theme={this.props.theme}
|
||||||
>
|
>
|
||||||
{this.props.children}
|
{this.props.children}
|
||||||
</Menu>
|
</Menu>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import React, { Component, PropTypes } from 'react';
|
import React, { Component, PropTypes } from 'react';
|
||||||
import ReactDOM from 'react-dom';
|
import ReactDOM from 'react-dom';
|
||||||
import classnames from 'classnames';
|
import classnames from 'classnames';
|
||||||
import update from 'react-addons-update';
|
import update from 'immutability-helper';
|
||||||
import { themr } from 'react-css-themr';
|
import { themr } from 'react-css-themr';
|
||||||
import { RIPPLE } from '../identifiers.js';
|
import { RIPPLE } from '../identifiers.js';
|
||||||
import events from '../utils/events';
|
import events from '../utils/events';
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
"express": "~4.13.4",
|
"express": "~4.13.4",
|
||||||
"extract-text-webpack-plugin": "~1.0.1",
|
"extract-text-webpack-plugin": "~1.0.1",
|
||||||
"glob": "~7.0.3",
|
"glob": "~7.0.3",
|
||||||
|
"immutability-helper": "~2.0.0",
|
||||||
"karma": "~1.1.2",
|
"karma": "~1.1.2",
|
||||||
"karma-chrome-launcher": "~1.0.1",
|
"karma-chrome-launcher": "~1.0.1",
|
||||||
"karma-cli": "~1.0.0",
|
"karma-cli": "~1.0.0",
|
||||||
|
@ -76,9 +77,8 @@
|
||||||
"phantomjs-prebuilt": "~2.1.7",
|
"phantomjs-prebuilt": "~2.1.7",
|
||||||
"postcss-loader": "~0.9.1",
|
"postcss-loader": "~0.9.1",
|
||||||
"react": "~15.3.0",
|
"react": "~15.3.0",
|
||||||
"react-addons-update": "~15.3.0",
|
|
||||||
"react-addons-test-utils": "~15.3.0",
|
|
||||||
"react-addons-css-transition-group": "~15.3.0",
|
"react-addons-css-transition-group": "~15.3.0",
|
||||||
|
"react-addons-test-utils": "~15.3.0",
|
||||||
"react-docgen": "~2.8.2",
|
"react-docgen": "~2.8.2",
|
||||||
"react-dom": "~15.3.0",
|
"react-dom": "~15.3.0",
|
||||||
"react-transform-catch-errors": "~1.0.2",
|
"react-transform-catch-errors": "~1.0.2",
|
||||||
|
@ -113,10 +113,10 @@
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"classnames": "~2.2.0",
|
"classnames": "~2.2.0",
|
||||||
|
"immutability-helper": "~2.0.0",
|
||||||
"normalize.css": "~4.2.0",
|
"normalize.css": "~4.2.0",
|
||||||
"react": "~0.14 || ~15.3.0",
|
"react": "~0.14 || ~15.3.0",
|
||||||
"react-addons-css-transition-group": "~0.14.0 || ~15.3.0",
|
"react-addons-css-transition-group": "~0.14.0 || ~15.3.0",
|
||||||
"react-addons-update": "~0.14 || ~15.3.0",
|
|
||||||
"react-dom": "~0.14.0 || ~15.3.0"
|
"react-dom": "~0.14.0 || ~15.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue