From 29b04f2b149a66e405426ff83b65fbdc8d9a1ae1 Mon Sep 17 00:00:00 2001 From: Ben Fox-Moore Date: Tue, 23 Aug 2016 02:05:32 +0200 Subject: [PATCH 1/2] Replace react-addons-update with immutability-helper as Facebook are deprecating their addon --- components/ripple/Ripple.js | 2 +- package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/ripple/Ripple.js b/components/ripple/Ripple.js index b7a6b757..e919e18f 100644 --- a/components/ripple/Ripple.js +++ b/components/ripple/Ripple.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import ReactDOM from 'react-dom'; import classnames from 'classnames'; -import update from 'react-addons-update'; +import update from 'immutability-helper'; import { themr } from 'react-css-themr'; import { RIPPLE } from '../identifiers.js'; import events from '../utils/events'; diff --git a/package.json b/package.json index 56aaca45..93a8f819 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "express": "~4.13.4", "extract-text-webpack-plugin": "~1.0.1", "glob": "~7.0.3", + "immutability-helper": "~2.0.0", "karma": "~1.1.2", "karma-chrome-launcher": "~1.0.1", "karma-cli": "~1.0.0", @@ -76,9 +77,8 @@ "phantomjs-prebuilt": "~2.1.7", "postcss-loader": "~0.9.1", "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-test-utils": "~15.3.0", "react-docgen": "~2.8.2", "react-dom": "~15.3.0", "react-transform-catch-errors": "~1.0.2", @@ -114,10 +114,10 @@ "license": "MIT", "peerDependencies": { "classnames": "~2.2.0", + "immutability-helper": "~2.0.0", "normalize.css": "~4.2.0", "react": "~0.14 || ~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" } } From 9d7e3db26333592a979e236da516b3cba000a6f1 Mon Sep 17 00:00:00 2001 From: Justin Schultz Date: Wed, 24 Aug 2016 10:25:33 -0600 Subject: [PATCH 2/2] Passes IconMenu's theme to the inner Menu. --- components/menu/IconMenu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/components/menu/IconMenu.js b/components/menu/IconMenu.js index bd321f99..4427412b 100644 --- a/components/menu/IconMenu.js +++ b/components/menu/IconMenu.js @@ -71,6 +71,7 @@ const factory = (IconButton, Menu) => { ripple={this.props.menuRipple} selectable={this.props.selectable} selected={this.props.selected} + theme={this.props.theme} > {this.props.children}