mobx-react 5.4.0 → 5.4.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # MobX-React Changelog
 
+### 5.4.3
+
+* Fixed [#612](https://github.com/mobxjs/mobx-react/issues/612), `contextType` was hoisted by `inject`, which shouldn't the case.
+
+### 5.4.1 / 5.4.2
+
+* Fixed issue where `react-is` wasn't properly rolled-up into the package. Fixes [#608](https://github.com/mobxjs/mobx-react/issues/608)
+
 ### 5.4.0
 
 * Added support for forward refs, fixes [#602](https://github.com/mobxjs/mobx-react/issues/602)

package/README.md

@@ -34,6 +34,7 @@ If you are using [React hooks](https://reactjs.org/docs/hooks-intro.html) with l
 *   Minimal MobX, React, ES6(babel), JSPM with hot reloading modules:
     [jspm-react](https://github.com/capaj/jspm-react)
 *   React Native Counter: [Mobx-React-Native-Counter](https://github.com/bartonhammond/mobx-react-native-counter)
+*   React Native, TypeScript, React Navigation: [Ignite Bowser](https://github.com/infinitered/ignite-bowser)
 
 ## API documentation
 
@@ -201,7 +202,7 @@ class TodoView extends React.Component {
 ```
 
 *   `componentWillReact` doesn't take arguments
-*   `componentWillReact` won't fire before the initial render (use use `componentDidMount` or `constructor` instead)
+*   `componentWillReact` won't fire before the initial render (use `componentDidMount` or `constructor` instead)
 
 ### `PropTypes`
 
@@ -441,7 +442,7 @@ class SomeComponent extends React.Component {
         disposeOnUnmount(this, reaction(...))
 
         // or function array
-        disposeOnUmount(this, [
+        disposeOnUnmount(this, [
             reaction(...),
             reaction(...)
         ])

package/custom.js

@@ -1,8 +1,16 @@
+/** @license mobx-react v5.4.4
+ * custom.js
+ *
+ * Copyright (c) 2015 Michel Weststrate.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('mobx')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'react', 'mobx'], factory) :
-  (factory((global.mobxReact = {}),global.React,global.mobx));
-}(this, (function (exports,React,mobx) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('mobx'), require('react')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'mobx', 'react'], factory) :
+  (factory((global.mobxReact = {}),global.mobx,global.React));
+}(this, (function (exports,mobx,React) { 'use strict';
 
   var React__default = 'default' in React ? React['default'] : React;
 
@@ -57,25 +65,6 @@
     return obj;
   }
 
-  function _objectSpread(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-      var ownKeys = Object.keys(source);
-
-      if (typeof Object.getOwnPropertySymbols === 'function') {
-        ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-          return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-        }));
-      }
-
-      ownKeys.forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    }
-
-    return target;
-  }
-
   function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
       throw new TypeError("Super expression must either be null or a function");
@@ -135,33 +124,35 @@
 
   var reactIs_production_min = createCommonjsModule(function (module, exports) {
   Object.defineProperty(exports,"__esModule",{value:!0});
-  var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.forward_ref"):60112,n=b?Symbol.for("react.placeholder"):60113;
-  function q(a){if("object"===typeof a&&null!==a){var p=a.$$typeof;switch(p){case c:switch(a=a.type,a){case l:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case m:case h:return a;default:return p}}case d:return p}}}exports.typeOf=q;exports.AsyncMode=l;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=m;exports.Fragment=e;exports.Profiler=g;exports.Portal=d;exports.StrictMode=f;
-  exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===l||a===g||a===f||a===n||"object"===typeof a&&null!==a&&("function"===typeof a.then||a.$$typeof===h||a.$$typeof===k||a.$$typeof===m)};exports.isAsyncMode=function(a){return q(a)===l};exports.isContextConsumer=function(a){return q(a)===k};exports.isContextProvider=function(a){return q(a)===h};exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};
-  exports.isForwardRef=function(a){return q(a)===m};exports.isFragment=function(a){return q(a)===e};exports.isProfiler=function(a){return q(a)===g};exports.isPortal=function(a){return q(a)===d};exports.isStrictMode=function(a){return q(a)===f};
+  var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.concurrent_mode"):60111,n=b?Symbol.for("react.forward_ref"):60112,p=b?Symbol.for("react.suspense"):60113,r=b?Symbol.for("react.memo"):
+  60115,t=b?Symbol.for("react.lazy"):60116;function u(a){if("object"===typeof a&&null!==a){var q=a.$$typeof;switch(q){case c:switch(a=a.type,a){case l:case m:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case n:case h:return a;default:return q}}case d:return q}}}function v(a){return u(a)===m}exports.typeOf=u;exports.AsyncMode=l;exports.ConcurrentMode=m;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=n;exports.Fragment=e;
+  exports.Profiler=g;exports.Portal=d;exports.StrictMode=f;exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===m||a===g||a===f||a===p||"object"===typeof a&&null!==a&&(a.$$typeof===t||a.$$typeof===r||a.$$typeof===h||a.$$typeof===k||a.$$typeof===n)};exports.isAsyncMode=function(a){return v(a)||u(a)===l};exports.isConcurrentMode=v;exports.isContextConsumer=function(a){return u(a)===k};exports.isContextProvider=function(a){return u(a)===h};
+  exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};exports.isForwardRef=function(a){return u(a)===n};exports.isFragment=function(a){return u(a)===e};exports.isProfiler=function(a){return u(a)===g};exports.isPortal=function(a){return u(a)===d};exports.isStrictMode=function(a){return u(a)===f};
   });
 
   unwrapExports(reactIs_production_min);
   var reactIs_production_min_1 = reactIs_production_min.typeOf;
   var reactIs_production_min_2 = reactIs_production_min.AsyncMode;
-  var reactIs_production_min_3 = reactIs_production_min.ContextConsumer;
-  var reactIs_production_min_4 = reactIs_production_min.ContextProvider;
-  var reactIs_production_min_5 = reactIs_production_min.Element;
-  var reactIs_production_min_6 = reactIs_production_min.ForwardRef;
-  var reactIs_production_min_7 = reactIs_production_min.Fragment;
-  var reactIs_production_min_8 = reactIs_production_min.Profiler;
-  var reactIs_production_min_9 = reactIs_production_min.Portal;
-  var reactIs_production_min_10 = reactIs_production_min.StrictMode;
-  var reactIs_production_min_11 = reactIs_production_min.isValidElementType;
-  var reactIs_production_min_12 = reactIs_production_min.isAsyncMode;
-  var reactIs_production_min_13 = reactIs_production_min.isContextConsumer;
-  var reactIs_production_min_14 = reactIs_production_min.isContextProvider;
-  var reactIs_production_min_15 = reactIs_production_min.isElement;
-  var reactIs_production_min_16 = reactIs_production_min.isForwardRef;
-  var reactIs_production_min_17 = reactIs_production_min.isFragment;
-  var reactIs_production_min_18 = reactIs_production_min.isProfiler;
-  var reactIs_production_min_19 = reactIs_production_min.isPortal;
-  var reactIs_production_min_20 = reactIs_production_min.isStrictMode;
+  var reactIs_production_min_3 = reactIs_production_min.ConcurrentMode;
+  var reactIs_production_min_4 = reactIs_production_min.ContextConsumer;
+  var reactIs_production_min_5 = reactIs_production_min.ContextProvider;
+  var reactIs_production_min_6 = reactIs_production_min.Element;
+  var reactIs_production_min_7 = reactIs_production_min.ForwardRef;
+  var reactIs_production_min_8 = reactIs_production_min.Fragment;
+  var reactIs_production_min_9 = reactIs_production_min.Profiler;
+  var reactIs_production_min_10 = reactIs_production_min.Portal;
+  var reactIs_production_min_11 = reactIs_production_min.StrictMode;
+  var reactIs_production_min_12 = reactIs_production_min.isValidElementType;
+  var reactIs_production_min_13 = reactIs_production_min.isAsyncMode;
+  var reactIs_production_min_14 = reactIs_production_min.isConcurrentMode;
+  var reactIs_production_min_15 = reactIs_production_min.isContextConsumer;
+  var reactIs_production_min_16 = reactIs_production_min.isContextProvider;
+  var reactIs_production_min_17 = reactIs_production_min.isElement;
+  var reactIs_production_min_18 = reactIs_production_min.isForwardRef;
+  var reactIs_production_min_19 = reactIs_production_min.isFragment;
+  var reactIs_production_min_20 = reactIs_production_min.isProfiler;
+  var reactIs_production_min_21 = reactIs_production_min.isPortal;
+  var reactIs_production_min_22 = reactIs_production_min.isStrictMode;
 
   var reactIs = createCommonjsModule(function (module) {
 
@@ -170,22 +161,19 @@
   }
   });
 
-  var _ReactIs$ForwardRef;
-
-  function _defineProperty$1(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
   /**
    * Copyright 2015, Yahoo! Inc.
    * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
    */
 
-
   var REACT_STATICS = {
       childContextTypes: true,
+      contextType: true,
       contextTypes: true,
       defaultProps: true,
       displayName: true,
       getDefaultProps: true,
+      getDerivedStateFromError: true,
       getDerivedStateFromProps: true,
       mixins: true,
       propTypes: true,
@@ -202,7 +190,16 @@
       arity: true
   };
 
-  var TYPE_STATICS = _defineProperty$1({}, reactIs.ForwardRef, (_ReactIs$ForwardRef = {}, _defineProperty$1(_ReactIs$ForwardRef, '$$typeof', true), _defineProperty$1(_ReactIs$ForwardRef, 'render', true), _ReactIs$ForwardRef));
+  var FORWARD_REF_STATICS = {
+      '$$typeof': true,
+      render: true,
+      defaultProps: true,
+      displayName: true,
+      propTypes: true
+  };
+
+  var TYPE_STATICS = {};
+  TYPE_STATICS[reactIs.ForwardRef] = FORWARD_REF_STATICS;
 
   var defineProperty = Object.defineProperty;
   var getOwnPropertyNames = Object.getOwnPropertyNames;
@@ -457,7 +454,8 @@
     return !(component.prototype && component.prototype.render);
   }
   var symbolId = 0;
-  function newSymbol(name) {
+
+  function createSymbol(name) {
     if (typeof Symbol === "function") {
       return Symbol(name);
     }
@@ -466,6 +464,15 @@
     symbolId++;
     return symbol;
   }
+
+  var createdSymbols = {};
+  function newSymbol(name) {
+    if (!createdSymbols[name]) {
+      createdSymbols[name] = createSymbol(name);
+    }
+
+    return createdSymbols[name];
+  }
   var mobxMixins = newSymbol("patchMixins");
   var mobxPatchedDefinition = newSymbol("patchedDefinition");
 
@@ -711,8 +718,6 @@
     }
   }
 
-  var ReactIs = require("react-is");
-
   var mobxAdminProperty = mobx.$mobx || "$mobx";
   var mobxIsUnmounted = newSymbol("isUnmounted");
   /**
@@ -726,7 +731,9 @@
   var componentByNodeRegistry = typeof WeakMap !== "undefined" ? new WeakMap() : undefined;
   var renderReporter = new EventEmitter();
   var skipRenderKey = newSymbol("skipRender");
-  var isForcingUpdateKey = newSymbol("isForcingUpdate");
+  var isForcingUpdateKey = newSymbol("isForcingUpdate"); // Using react-is had some issues (and operates on elements, not on types), see #608 / #609
+
+  var ReactForwardRefSymbol = typeof React.forwardRef === "function" && React.forwardRef(function (_props, _ref) {})["$$typeof"];
   /**
    * Helper to set `prop` to `this` as non-enumerable (hidden prop)
    * @param target
@@ -1022,16 +1029,15 @@
     // not the ForwardRef HoC
 
 
-    if (componentClass["$$typeof"] === ReactIs.ForwardRef) {
+    if (ReactForwardRefSymbol && componentClass["$$typeof"] === ReactForwardRefSymbol) {
       var _baseRender = componentClass.render;
-      if (typeof _baseRender !== "function") throw new Error("render property of ForwardRef was not a function");
-      return _objectSpread({}, componentClass, {
-        render: function render() {
-          var _arguments = arguments;
-          return React__default.createElement(Observer, null, function () {
-            return _baseRender.apply(undefined, _arguments);
-          });
-        }
+      if (typeof _baseRender !== "function") throw new Error("render property of ForwardRef was not a function"); // TODO: do we need to hoist statics from baseRender to the forward ref?
+
+      return React.forwardRef(function ObserverForwardRef() {
+        var _arguments = arguments;
+        return React__default.createElement(Observer, null, function () {
+          return _baseRender.apply(undefined, _arguments);
+        });
       });
     } // Stateless function component:
     // If it is function but doesn't seem to be a react class constructor,
@@ -1098,10 +1104,10 @@
     }
   }
 
-  var Observer = observer(function (_ref) {
-    var children = _ref.children,
-        observerInject = _ref.inject,
-        render = _ref.render;
+  var Observer = observer(function (_ref2) {
+    var children = _ref2.children,
+        observerInject = _ref2.inject,
+        render = _ref2.render;
     var component = children || render;
 
     if (typeof component === "undefined") {

package/custom.module.js

@@ -1,5 +1,13 @@
-import React__default, { Component, createElement, PureComponent, Children } from 'react';
+/** @license mobx-react v5.4.4
+ * custom.module.js
+ *
+ * Copyright (c) 2015 Michel Weststrate.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { isObservableArray, isObservableObject, isObservableMap, untracked, createAtom, Reaction, _allowStateChanges, $mobx, spy, getDebugName } from 'mobx';
+import React__default, { Component, createElement, PureComponent, forwardRef, Children } from 'react';
 
 function _typeof(obj) {
   if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
@@ -52,25 +60,6 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
-function _objectSpread(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-    var ownKeys = Object.keys(source);
-
-    if (typeof Object.getOwnPropertySymbols === 'function') {
-      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-      }));
-    }
-
-    ownKeys.forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    });
-  }
-
-  return target;
-}
-
 function _inherits(subClass, superClass) {
   if (typeof superClass !== "function" && superClass !== null) {
     throw new TypeError("Super expression must either be null or a function");
@@ -130,33 +119,35 @@ function createCommonjsModule(fn, module) {
 
 var reactIs_production_min = createCommonjsModule(function (module, exports) {
 Object.defineProperty(exports,"__esModule",{value:!0});
-var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.forward_ref"):60112,n=b?Symbol.for("react.placeholder"):60113;
-function q(a){if("object"===typeof a&&null!==a){var p=a.$$typeof;switch(p){case c:switch(a=a.type,a){case l:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case m:case h:return a;default:return p}}case d:return p}}}exports.typeOf=q;exports.AsyncMode=l;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=m;exports.Fragment=e;exports.Profiler=g;exports.Portal=d;exports.StrictMode=f;
-exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===l||a===g||a===f||a===n||"object"===typeof a&&null!==a&&("function"===typeof a.then||a.$$typeof===h||a.$$typeof===k||a.$$typeof===m)};exports.isAsyncMode=function(a){return q(a)===l};exports.isContextConsumer=function(a){return q(a)===k};exports.isContextProvider=function(a){return q(a)===h};exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};
-exports.isForwardRef=function(a){return q(a)===m};exports.isFragment=function(a){return q(a)===e};exports.isProfiler=function(a){return q(a)===g};exports.isPortal=function(a){return q(a)===d};exports.isStrictMode=function(a){return q(a)===f};
+var b="function"===typeof Symbol&&Symbol.for,c=b?Symbol.for("react.element"):60103,d=b?Symbol.for("react.portal"):60106,e=b?Symbol.for("react.fragment"):60107,f=b?Symbol.for("react.strict_mode"):60108,g=b?Symbol.for("react.profiler"):60114,h=b?Symbol.for("react.provider"):60109,k=b?Symbol.for("react.context"):60110,l=b?Symbol.for("react.async_mode"):60111,m=b?Symbol.for("react.concurrent_mode"):60111,n=b?Symbol.for("react.forward_ref"):60112,p=b?Symbol.for("react.suspense"):60113,r=b?Symbol.for("react.memo"):
+60115,t=b?Symbol.for("react.lazy"):60116;function u(a){if("object"===typeof a&&null!==a){var q=a.$$typeof;switch(q){case c:switch(a=a.type,a){case l:case m:case e:case g:case f:return a;default:switch(a=a&&a.$$typeof,a){case k:case n:case h:return a;default:return q}}case d:return q}}}function v(a){return u(a)===m}exports.typeOf=u;exports.AsyncMode=l;exports.ConcurrentMode=m;exports.ContextConsumer=k;exports.ContextProvider=h;exports.Element=c;exports.ForwardRef=n;exports.Fragment=e;
+exports.Profiler=g;exports.Portal=d;exports.StrictMode=f;exports.isValidElementType=function(a){return "string"===typeof a||"function"===typeof a||a===e||a===m||a===g||a===f||a===p||"object"===typeof a&&null!==a&&(a.$$typeof===t||a.$$typeof===r||a.$$typeof===h||a.$$typeof===k||a.$$typeof===n)};exports.isAsyncMode=function(a){return v(a)||u(a)===l};exports.isConcurrentMode=v;exports.isContextConsumer=function(a){return u(a)===k};exports.isContextProvider=function(a){return u(a)===h};
+exports.isElement=function(a){return "object"===typeof a&&null!==a&&a.$$typeof===c};exports.isForwardRef=function(a){return u(a)===n};exports.isFragment=function(a){return u(a)===e};exports.isProfiler=function(a){return u(a)===g};exports.isPortal=function(a){return u(a)===d};exports.isStrictMode=function(a){return u(a)===f};
 });
 
 unwrapExports(reactIs_production_min);
 var reactIs_production_min_1 = reactIs_production_min.typeOf;
 var reactIs_production_min_2 = reactIs_production_min.AsyncMode;
-var reactIs_production_min_3 = reactIs_production_min.ContextConsumer;
-var reactIs_production_min_4 = reactIs_production_min.ContextProvider;
-var reactIs_production_min_5 = reactIs_production_min.Element;
-var reactIs_production_min_6 = reactIs_production_min.ForwardRef;
-var reactIs_production_min_7 = reactIs_production_min.Fragment;
-var reactIs_production_min_8 = reactIs_production_min.Profiler;
-var reactIs_production_min_9 = reactIs_production_min.Portal;
-var reactIs_production_min_10 = reactIs_production_min.StrictMode;
-var reactIs_production_min_11 = reactIs_production_min.isValidElementType;
-var reactIs_production_min_12 = reactIs_production_min.isAsyncMode;
-var reactIs_production_min_13 = reactIs_production_min.isContextConsumer;
-var reactIs_production_min_14 = reactIs_production_min.isContextProvider;
-var reactIs_production_min_15 = reactIs_production_min.isElement;
-var reactIs_production_min_16 = reactIs_production_min.isForwardRef;
-var reactIs_production_min_17 = reactIs_production_min.isFragment;
-var reactIs_production_min_18 = reactIs_production_min.isProfiler;
-var reactIs_production_min_19 = reactIs_production_min.isPortal;
-var reactIs_production_min_20 = reactIs_production_min.isStrictMode;
+var reactIs_production_min_3 = reactIs_production_min.ConcurrentMode;
+var reactIs_production_min_4 = reactIs_production_min.ContextConsumer;
+var reactIs_production_min_5 = reactIs_production_min.ContextProvider;
+var reactIs_production_min_6 = reactIs_production_min.Element;
+var reactIs_production_min_7 = reactIs_production_min.ForwardRef;
+var reactIs_production_min_8 = reactIs_production_min.Fragment;
+var reactIs_production_min_9 = reactIs_production_min.Profiler;
+var reactIs_production_min_10 = reactIs_production_min.Portal;
+var reactIs_production_min_11 = reactIs_production_min.StrictMode;
+var reactIs_production_min_12 = reactIs_production_min.isValidElementType;
+var reactIs_production_min_13 = reactIs_production_min.isAsyncMode;
+var reactIs_production_min_14 = reactIs_production_min.isConcurrentMode;
+var reactIs_production_min_15 = reactIs_production_min.isContextConsumer;
+var reactIs_production_min_16 = reactIs_production_min.isContextProvider;
+var reactIs_production_min_17 = reactIs_production_min.isElement;
+var reactIs_production_min_18 = reactIs_production_min.isForwardRef;
+var reactIs_production_min_19 = reactIs_production_min.isFragment;
+var reactIs_production_min_20 = reactIs_production_min.isProfiler;
+var reactIs_production_min_21 = reactIs_production_min.isPortal;
+var reactIs_production_min_22 = reactIs_production_min.isStrictMode;
 
 var reactIs = createCommonjsModule(function (module) {
 
@@ -165,22 +156,19 @@ var reactIs = createCommonjsModule(function (module) {
 }
 });
 
-var _ReactIs$ForwardRef;
-
-function _defineProperty$1(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 /**
  * Copyright 2015, Yahoo! Inc.
  * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
 
-
 var REACT_STATICS = {
     childContextTypes: true,
+    contextType: true,
     contextTypes: true,
     defaultProps: true,
     displayName: true,
     getDefaultProps: true,
+    getDerivedStateFromError: true,
     getDerivedStateFromProps: true,
     mixins: true,
     propTypes: true,
@@ -197,7 +185,16 @@ var KNOWN_STATICS = {
     arity: true
 };
 
-var TYPE_STATICS = _defineProperty$1({}, reactIs.ForwardRef, (_ReactIs$ForwardRef = {}, _defineProperty$1(_ReactIs$ForwardRef, '$$typeof', true), _defineProperty$1(_ReactIs$ForwardRef, 'render', true), _ReactIs$ForwardRef));
+var FORWARD_REF_STATICS = {
+    '$$typeof': true,
+    render: true,
+    defaultProps: true,
+    displayName: true,
+    propTypes: true
+};
+
+var TYPE_STATICS = {};
+TYPE_STATICS[reactIs.ForwardRef] = FORWARD_REF_STATICS;
 
 var defineProperty = Object.defineProperty;
 var getOwnPropertyNames = Object.getOwnPropertyNames;
@@ -452,7 +449,8 @@ function isStateless(component) {
   return !(component.prototype && component.prototype.render);
 }
 var symbolId = 0;
-function newSymbol(name) {
+
+function createSymbol(name) {
   if (typeof Symbol === "function") {
     return Symbol(name);
   }
@@ -461,6 +459,15 @@ function newSymbol(name) {
   symbolId++;
   return symbol;
 }
+
+var createdSymbols = {};
+function newSymbol(name) {
+  if (!createdSymbols[name]) {
+    createdSymbols[name] = createSymbol(name);
+  }
+
+  return createdSymbols[name];
+}
 var mobxMixins = newSymbol("patchMixins");
 var mobxPatchedDefinition = newSymbol("patchedDefinition");
 
@@ -706,8 +713,6 @@ function inject()
   }
 }
 
-var ReactIs = require("react-is");
-
 var mobxAdminProperty = $mobx || "$mobx";
 var mobxIsUnmounted = newSymbol("isUnmounted");
 /**
@@ -721,7 +726,9 @@ var warnedAboutObserverInjectDeprecation = false; // WeakMap<Node, Object>;
 var componentByNodeRegistry = typeof WeakMap !== "undefined" ? new WeakMap() : undefined;
 var renderReporter = new EventEmitter();
 var skipRenderKey = newSymbol("skipRender");
-var isForcingUpdateKey = newSymbol("isForcingUpdate");
+var isForcingUpdateKey = newSymbol("isForcingUpdate"); // Using react-is had some issues (and operates on elements, not on types), see #608 / #609
+
+var ReactForwardRefSymbol = typeof forwardRef === "function" && forwardRef(function (_props, _ref) {})["$$typeof"];
 /**
  * Helper to set `prop` to `this` as non-enumerable (hidden prop)
  * @param target
@@ -1017,16 +1024,15 @@ function observer(arg1, arg2) {
   // not the ForwardRef HoC
 
 
-  if (componentClass["$$typeof"] === ReactIs.ForwardRef) {
+  if (ReactForwardRefSymbol && componentClass["$$typeof"] === ReactForwardRefSymbol) {
     var _baseRender = componentClass.render;
-    if (typeof _baseRender !== "function") throw new Error("render property of ForwardRef was not a function");
-    return _objectSpread({}, componentClass, {
-      render: function render() {
-        var _arguments = arguments;
-        return React__default.createElement(Observer, null, function () {
-          return _baseRender.apply(undefined, _arguments);
-        });
-      }
+    if (typeof _baseRender !== "function") throw new Error("render property of ForwardRef was not a function"); // TODO: do we need to hoist statics from baseRender to the forward ref?
+
+    return forwardRef(function ObserverForwardRef() {
+      var _arguments = arguments;
+      return React__default.createElement(Observer, null, function () {
+        return _baseRender.apply(undefined, _arguments);
+      });
     });
   } // Stateless function component:
   // If it is function but doesn't seem to be a react class constructor,
@@ -1093,10 +1099,10 @@ function mixinLifecycleEvents(target) {
   }
 }
 
-var Observer = observer(function (_ref) {
-  var children = _ref.children,
-      observerInject = _ref.inject,
-      render = _ref.render;
+var Observer = observer(function (_ref2) {
+  var children = _ref2.children,
+      observerInject = _ref2.inject,
+      render = _ref2.render;
   var component = children || render;
 
   if (typeof component === "undefined") {

package/dist/mobx-react.d.ts

@@ -0,0 +1,105 @@
+/**
+ * Turns a React component or stateless render function into a reactive component.
+ */
+import * as React from "react"
+
+export {
+    useObservable,
+    useComputed,
+    useDisposable,
+    IObserverOptions,
+    useObserver,
+    Observer
+} from "mobx-react-lite"
+
+export type IReactComponent<P = any> =
+    | React.StatelessComponent<P>
+    | React.ComponentClass<P>
+    | React.ClassicComponentClass<P>
+
+/**
+ * Observer
+ */
+
+export function observer<T extends IReactComponent>(target: T): T
+
+/**
+ * Inject
+ */
+export type IValueMap = { [key: string]: any }
+export type IStoresToProps<
+    S extends IValueMap = {},
+    P extends IValueMap = {},
+    I extends IValueMap = {},
+    C extends IValueMap = {}
+> = (stores: S, nextProps: P, context: C) => I
+
+export type IWrappedComponent<P> = {
+    wrappedComponent: IReactComponent<P>
+}
+
+// Ideally we would want to return React.ComponentClass<Partial<P>>,
+// but TS doesn't allow such things in decorators, like we do in the non-decorator version
+// See also #256
+export function inject(
+    ...stores: string[]
+): <T extends IReactComponent<any>>(
+    target: T
+) => T & (T extends IReactComponent<infer P> ? IWrappedComponent<P> : never)
+export function inject<S, P, I, C>(
+    fn: IStoresToProps<S, P, I, C>
+): <T extends IReactComponent>(target: T) => T & IWrappedComponent<P>
+
+// Ideal implementation:
+// export function inject
+// (
+// fn: IStoresToProps
+// ):
+// <P>(target: IReactComponent<P>) => IReactComponent<Partial<P>> & IWrappedComponent<IReactComponent<Partial<P>>>
+//
+// Or even better: (but that would require type inference to work other way around)
+// export function inject<P, I>
+// (
+// fn: IStoresToProps<any, P, I>
+// ):
+// <T extends IReactComponent<P & S>(target: T) => IReactComponent<P> & IWrappedComponent<T>
+
+/**
+ * disposeOnUnmount
+ */
+type Disposer = () => void
+export function disposeOnUnmount(target: React.Component<any, any>, propertyKey: string): void
+export function disposeOnUnmount<TF extends Disposer | Disposer[]>(
+    target: React.Component<any, any>,
+    fn: TF
+): TF
+
+/**
+ * Utilities
+ */
+export class Provider extends React.Component<any, {}> {}
+
+export function useStaticRendering(value: boolean): void
+
+/**
+ * @deprecated, use PropTypes instead
+ */
+export const propTypes: {
+    observableArray: React.Requireable<any>
+    observableArrayOf: (type: React.Validator<any>) => React.Requireable<any>
+    observableMap: React.Requireable<any>
+    observableObject: React.Requireable<any>
+    arrayOrObservableArray: React.Requireable<any>
+    arrayOrObservableArrayOf: (type: React.Validator<any>) => React.Requireable<any>
+    objectOrObservableObject: React.Requireable<any>
+}
+
+export const PropTypes: {
+    observableArray: React.Requireable<any>
+    observableArrayOf: (type: React.Validator<any>) => React.Requireable<any>
+    observableMap: React.Requireable<any>
+    observableObject: React.Requireable<any>
+    arrayOrObservableArray: React.Requireable<any>
+    arrayOrObservableArrayOf: (type: React.Validator<any>) => React.Requireable<any>
+    objectOrObservableObject: React.Requireable<any>
+}

package/dist/mobx-react.js

@@ -0,0 +1,2 @@
+var e,r=require("react-dom"),t=require("react"),n=(e=t)&&"object"==typeof e&&"default"in e?e.default:e,o=require("mobx");if(!t.useState)throw new Error("mobx-react-lite requires React with Hooks support");if(!o.spy)throw new Error("mobx-react-lite requires mobx at least version 4 to be available");var i=function(){},a=!1;function u(){return a}var c=function(){return(c=Object.assign||function(e){for(var r,t=1,n=arguments.length;t<n;t++)for(var o in r=arguments[t])Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);return e}).apply(this,arguments)};function s(e){return e.current?o.getDependencyTree(e.current):"<unknown>"}var f=[];function p(e,r){if(void 0===r&&(r="observed"),u())return e();var n,i,a,c=(a=function(e,r){var t="function"==typeof Symbol&&e[Symbol.iterator];if(!t)return e;var n,o,i=t.call(e),a=[];try{for(;(void 0===r||r-- >0)&&!(n=i.next()).done;)a.push(n.value)}catch(e){o={error:e}}finally{try{n&&!n.done&&(t=i.return)&&t.call(i)}finally{if(o)throw o.error}}return a}(t.useState(0),2)[1],t.useCallback(function(){a(function(e){return e+1})},[])),p=t.useRef(null);if(p.current||(p.current=new o.Reaction("observer("+r+")",function(){c()})),t.useDebugValue(p,s),function(e){t.useEffect(function(){return e},f)}(function(){p.current.dispose()}),p.current.track(function(){try{n=e()}catch(e){i=e}}),i)throw p.current.dispose(),i;return n}var l={$$typeof:!0,render:!0,compare:!0,type:!0};function d(e){var r=e.children||e.render;return"function"!=typeof r?null:p(r)}function b(e,r,t,n,o){var i="function"==typeof e[r],a="function"==typeof e["children"===r?"render":"children"];return i&&a?new Error("MobX Observer: Do not use children and render in the same time in`"+t):i||a?null:new Error("Invalid prop `"+o+"` of type `"+typeof e[r]+"` supplied to `"+t+"`, expected `function`.")}d.propTypes={children:b,render:b},d.displayName="Observer";var y=0,v={};function h(e){return v[e]||(v[e]=function(e){if("function"==typeof Symbol)return Symbol(e);var r="__$mobx-react "+e+" ("+y+")";return y++,r}(e)),v[e]}function m(e,r){if(w(e,r))return!0;if("object"!=typeof e||null===e||"object"!=typeof r||null===r)return!1;var t=Object.keys(e),n=Object.keys(r);if(t.length!==n.length)return!1;for(var o=0;o<t.length;o++)if(!hasOwnProperty.call(r,t[o])||!w(e[t[o]],r[t[o]]))return!1;return!0}function w(e,r){return e===r?0!==e||1/e==1/r:e!=e&&r!=r}var O={$$typeof:1,render:1,compare:1,type:1,childContextTypes:1,contextType:1,contextTypes:1,defaultProps:1,getDefaultProps:1,getDerivedStateFromError:1,getDerivedStateFromProps:1,mixins:1,propTypes:1},g=!1,j=h("skipRender"),x=h("isForcingUpdate"),P="function"==typeof t.forwardRef&&t.forwardRef(function(e,r){}).$$typeof;function E(e,r,t){Object.hasOwnProperty.call(e,r)?e[r]=t:Object.defineProperty(e,r,{enumerable:!1,configurable:!0,writable:!0,value:t})}function R(e,r){return g&&console.warn("[mobx-react] It seems that a re-rendering of a React component is triggered while in static (server-side) mode. Please make sure components are rendered only once server-side."),this.state!==r||!m(this.props,e)}function C(e,r){var t=h("reactProp_"+r+"_valueHolder"),n=h("reactProp_"+r+"_atomHolder");function i(){return this[n]||E(this,n,o.createAtom("reactive "+r)),this[n]}Object.defineProperty(e,r,{configurable:!0,enumerable:!0,get:function(){return i.call(this).reportObserved(),this[t]},set:function(e){this[x]||m(this[t],e)?E(this,t,e):(E(this,t,e),E(this,j,!0),i.call(this).reportChanged(),E(this,j,!1))}})}function k(e){if(!0===e.isMobxInjector&&console.warn("Mobx observer: You are trying to use 'observer' on a component that already has 'inject'. Please apply 'observer' before applying 'inject'"),P&&e.$$typeof===P){var r=e.render;if("function"!=typeof r)throw new Error("render property of ForwardRef was not a function");return t.forwardRef(function(){var e=arguments;return n.createElement(d,null,function(){return r.apply(void 0,e)})})}return"function"!=typeof e||e.prototype&&e.prototype.render||e.isReactClass||t.Component.isPrototypeOf(e)?function(e){var r=e.prototype||e;if(r.componentWillReact)throw new Error("The componentWillReact life-cycle event is no longer supported");if(e.__proto__!==t.PureComponent)if(r.shouldComponentUpdate){if(r.shouldComponentUpdate!==R)throw new Error("It is not allowed to use shouldComponentUpdate in observer based components.")}else r.shouldComponentUpdate=R;C(r,"props"),C(r,"state");var o=r.render;return r.render=function(){if(!this.baseRender){var e=o.bind(this);this.baseRender=function(){return e()}}return n.createElement(d,null,this.baseRender)},e}(e):function(e,r){if(u())return e;var n,o,i,a=c({forwardRef:!1},void 0),s=e.displayName||e.name,f=function(r,t){return p(function(){return e(r,t)},s)};return n=t.memo(a.forwardRef?t.forwardRef(f):f),o=e,i=n,Object.keys(o).forEach(function(e){o.hasOwnProperty(e)&&!l[e]&&Object.defineProperty(i,e,Object.getOwnPropertyDescriptor(o,e))}),n.displayName=s,n}(e)}var _={children:!0,key:!0,ref:!0},S=t.createContext({}),U=function(e){function r(r,t){e.call(this,r,t),this.state=Object.assign({},t,T(r))}return e&&(r.__proto__=e),(r.prototype=Object.create(e&&e.prototype)).constructor=r,r.prototype.render=function(){return t.createElement(S.Provider,{value:this.state},t.Children.only(this.props.children))},r.getDerivedStateFromProps=function(e,r){if(!m(r,Object.assign({},r,T(e))))throw new Error("MobX Provider: The set of provided stores has changed. Please avoid changing stores as the change might not propagate to all children");return r},r}(t.Component);function T(e){var r={};if(!e)return r;for(var t in e)A(t)&&(r[t]=e[t]);return r}function A(e){return!_[e]&&"suppressChangedStoreWarning"!==e}function M(e,r,o,i){var a=function(e,r){var t=e.displayName||e.name||e.constructor&&e.constructor.name||"Component";return r?"inject-with-"+r+"("+t+")":"inject("+t+")"}(r,o),u=function(n){function o(){n.apply(this,arguments)}return n&&(o.__proto__=n),(o.prototype=Object.create(n&&n.prototype)).constructor=o,o.prototype.render=function(){var n=this.props,o=n.forwardRef,i=function(e,r){var t={};for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&-1===r.indexOf(n)&&(t[n]=e[n]);return t}(n,["forwardRef"]);return Object.assign(i,e(this.context||{},i)||{}),o&&!function(e){return!(e.prototype&&e.prototype.render)}(r)&&(i.ref=this.props.forwardRef),t.createElement(r,i)},o}(t.Component);u.contextType=S,i&&(u=k(u)),u.isMobxInjector=!0;var c,s,f=n.forwardRef(function(e,r){return n.createElement(u,Object.assign({},e,{forwardRef:r}))});return c=r,s=f,Object.keys(c).forEach(function(e){c.hasOwnProperty(e)&&!O[e]&&Object.defineProperty(s,e,Object.getOwnPropertyDescriptor(c,e))}),f.wrappedComponent=r,f.displayName=a,f}U.contextType=S;var D=h("disposeOnUnmount"),q=h("originalOnUnmount");function $(){var e=this;this[q]&&this[q](),this[D]&&(this[D].forEach(function(r){var t="string"==typeof r?e[r]:r;if(null!=t){if("function"!=typeof t)throw new Error("[mobx-react] disposeOnUnmount only works on functions such as disposers returned by reactions, autorun, etc.");t()}}),this[D]=[])}function I(e){function r(r,t,n,i,a,u){for(var c=[],s=arguments.length-6;s-- >0;)c[s]=arguments[s+6];return o.untracked(function(){return i=i||"<<anonymous>>",u=u||n,null==t[n]?r?new Error("The "+a+" `"+u+"` is marked as required in `"+i+"`, but its value is `"+(null===t[n]?"null":"undefined")+"`."):null:e.apply(void 0,[t,n,i,a,u].concat(c))})}var t=r.bind(null,!1);return t.isRequired=r.bind(null,!0),t}function W(e){var r=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":function(e,r){return"symbol"===e||"Symbol"===r["@@toStringTag"]||"function"==typeof Symbol&&r instanceof Symbol}(r,e)?"symbol":r}function F(e,r){return I(function(t,n,i,a,u){return o.untracked(function(){if(e&&W(t[n])===r.toLowerCase())return null;var a;switch(r){case"Array":a=o.isObservableArray;break;case"Object":a=o.isObservableObject;break;case"Map":a=o.isObservableMap;break;default:throw new Error("Unexpected mobxType: "+r)}var c=t[n];if(!a(c)){var s=function(e){var r=W(e);if("object"===r){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return r}(c),f=e?" or javascript `"+r.toLowerCase()+"`":"";return new Error("Invalid prop `"+u+"` of type `"+s+"` supplied to `"+i+"`, expected `mobx.Observable"+r+"`"+f+".")}return null})})}function N(e,r){return I(function(t,n,i,a,u){for(var c=[],s=arguments.length-5;s-- >0;)c[s]=arguments[s+5];return o.untracked(function(){if("function"!=typeof r)return new Error("Property `"+u+"` of component `"+i+"` has invalid PropType notation.");var o=F(e,"Array")(t,n,i);if(o instanceof Error)return o;for(var s=t[n],f=0;f<s.length;f++)if((o=r.apply(void 0,[s,f,i,a,u+"["+f+"]"].concat(c)))instanceof Error)return o;return null})})}var H={observableArray:F(!1,"Array"),observableArrayOf:N.bind(null,!1),observableMap:F(!1,"Map"),observableObject:F(!1,"Object"),arrayOrObservableArray:F(!0,"Array"),arrayOrObservableArrayOf:N.bind(null,!0),objectOrObservableObject:F(!0,"Object")};if(!t.Component)throw new Error("mobx-react requires React to be available");if(!o.observable)throw new Error("mobx-react requires mobx to be available");"function"==typeof r.unstable_batchedUpdates&&o.configure({reactionScheduler:r.unstable_batchedUpdates}),exports.useObservable=function(e){var r=t.useRef(null);return r.current||(r.current=o.observable(e)),r.current},exports.useComputed=function(e,r){return void 0===r&&(r=[]),t.useMemo(function(){return o.computed(e)},r).get()},exports.useDisposable=function(e,r){void 0===r&&(r=[]);var n=t.useRef(null),o=t.useRef(!1);function a(r){if(o.current)return i;if(!n.current){var t=e();if("function"!=typeof t){var a=new Error("generated disposer must be a function");return console.error(a),i}n.current=t}return function(){n.current&&(n.current(),n.current=null),r&&(o.current=!0)}}return t.useEffect(function(){return a(!1)},r),a(!0)},exports.useObserver=p,exports.Observer=d,exports.observer=k,exports.useStaticRendering=function(e){g=e,a=e},exports.Provider=U,exports.inject=function(){for(var e,r=[],t=arguments.length;t--;)r[t]=arguments[t];return"function"==typeof arguments[0]?(e=arguments[0],function(r){return M(e,r,e.name,!0)}):function(e){return M(function(e){return function(r,t){return e.forEach(function(e){if(!(e in t)){if(!(e in r))throw new Error("MobX injector: Store '"+e+"' is not available! Make sure it is provided by some Provider");t[e]=r[e]}}),t}}(r),e,r.join("-"),!1)}},exports.disposeOnUnmount=function e(r,n){if(Array.isArray(n))return n.map(function(t){return e(r,t)});var o=Object.getPrototypeOf(r).constructor||Object.getPrototypeOf(r.constructor),i=Object.getPrototypeOf(r.constructor);if(o!==t.Component&&o!==t.PureComponent&&i!==t.Component&&i!==t.PureComponent)throw new Error("[mobx-react] disposeOnUnmount only supports direct subclasses of React.Component or React.PureComponent.");if("string"!=typeof n&&"function"!=typeof n)throw new Error("[mobx-react] disposeOnUnmount only works if the parameter is either a property key or a function.");var a=!!r[D];return(r[D]||(r[D]=[])).push(n),a||(r.componentWillUnmount&&(r[q]=r.componentWillUnmount),Object.defineProperty(r,"componentWillUnmount",{get:function(){return $},set:function(e){this[D].push(e),this[q]=void 0},configurable:!1,enumerable:!1})),"string"!=typeof n?n:void 0},exports.PropTypes=H;
+//# sourceMappingURL=mobx-react.js.map