Completely updated React, fixed #11, (hopefully)

goTorrentWebUI/node_modules/material-ui/styles/MuiThemeProvider.js

@@ -40,6 +40,10 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
+var _warning = require('warning');
+
+var _warning2 = _interopRequireDefault(_warning);
+
 var _brcast = require('brcast');
 
 var _brcast2 = _interopRequireDefault(_brcast);
@@ -82,10 +86,21 @@ var MuiThemeProvider = function (_React$Component) {
     value: function getChildContext() {
       var _ref;
 
-      return _ref = {}, (0, _defineProperty3.default)(_ref, _themeListener.CHANNEL, this.broadcast), (0, _defineProperty3.default)(_ref, 'muiThemeProviderOptions', {
-        sheetsManager: this.props.sheetsManager,
-        disableStylesGeneration: this.props.disableStylesGeneration
-      }), _ref;
+      var _props = this.props,
+          sheetsManager = _props.sheetsManager,
+          disableStylesGeneration = _props.disableStylesGeneration;
+
+      var muiThemeProviderOptions = this.context.muiThemeProviderOptions || {};
+
+      if (sheetsManager !== undefined) {
+        muiThemeProviderOptions.sheetsManager = sheetsManager;
+      }
+
+      if (disableStylesGeneration !== undefined) {
+        muiThemeProviderOptions.disableStylesGeneration = disableStylesGeneration;
+      }
+
+      return _ref = {}, (0, _defineProperty3.default)(_ref, _themeListener.CHANNEL, this.broadcast), (0, _defineProperty3.default)(_ref, 'muiThemeProviderOptions', muiThemeProviderOptions), _ref;
     }
   }, {
     key: 'componentDidMount',
@@ -124,6 +139,7 @@ var MuiThemeProvider = function (_React$Component) {
     value: function mergeOuterLocalTheme(localTheme) {
       // To support composition of theme.
       if (typeof localTheme === 'function') {
+        process.env.NODE_ENV !== "production" ? (0, _warning2.default)(this.outerTheme, ['Material-UI: you are providing a theme function property ' + 'to the MuiThemeProvider component:', '<MuiThemeProvider theme={outerTheme => outerTheme} />', '', 'However, no outer theme is present.', 'Make sure a theme is already injected higher in the React tree ' + 'or provide a theme object.'].join('\n')) : void 0;
         return localTheme(this.outerTheme);
       }
 
@@ -142,12 +158,6 @@ var MuiThemeProvider = function (_React$Component) {
   return MuiThemeProvider;
 }(_react2.default.Component);
 
-MuiThemeProvider.defaultProps = {
-  disableStylesGeneration: false,
-  sheetsManager: null
-};
-
-
 MuiThemeProvider.propTypes = process.env.NODE_ENV !== "production" ? {
   /**
    * You can only provide a single element with react@15, a node with react@16.
@@ -174,22 +184,14 @@ MuiThemeProvider.propTypes = process.env.NODE_ENV !== "production" ? {
   theme: _propTypes2.default.oneOfType([_propTypes2.default.object, _propTypes2.default.func]).isRequired
 } : {};
 
+MuiThemeProvider.propTypes = process.env.NODE_ENV !== "production" ? (0, _exactProp2.default)(MuiThemeProvider.propTypes, 'MuiThemeProvider') : {};
+
 MuiThemeProvider.childContextTypes = (0, _extends3.default)({}, _themeListener2.default.contextTypes, {
   muiThemeProviderOptions: _propTypes2.default.object
 });
 
-MuiThemeProvider.contextTypes = _themeListener2.default.contextTypes;
+MuiThemeProvider.contextTypes = (0, _extends3.default)({}, _themeListener2.default.contextTypes, {
+  muiThemeProviderOptions: _propTypes2.default.object
+});
 
-// Add a wrapper component to generate some helper messages in the development
-// environment.
-// eslint-disable-next-line import/no-mutable-exports
-var MuiThemeProviderWrapper = MuiThemeProvider;
-
-if (process.env.NODE_ENV !== 'production') {
-  MuiThemeProviderWrapper = function MuiThemeProviderWrapper(props) {
-    return _react2.default.createElement(MuiThemeProvider, props);
-  };
-  MuiThemeProviderWrapper.propTypes = (0, _exactProp2.default)(MuiThemeProvider.propTypes, 'MuiThemeProvider');
-}
-
-exports.default = MuiThemeProviderWrapper;
+exports.default = MuiThemeProvider;