mobx 6.16.0 → 6.16.1

package/dist/mobx.umd.development.js

@@ -947,24 +947,44 @@
       var ann = this;
       var key = context.name,
         addInitializer = context.addInitializer;
+      var computedValues;
       // Defer ComputedValue creation until first access — avoids allocating
       // ComputedValues for getters that are never read on a given instance.
       // The factory is materialised by ObservableObjectAdministration on demand.
+      function createComputedValue(target, adm) {
+        var options = _extends({}, ann.options_, {
+          get: get,
+          context: target
+        });
+        options.name || (options.name =  adm.name_ + "." + key.toString() );
+        return new ComputedValue(options);
+      }
       addInitializer(function () {
         var _adm$lazyComputedKeys;
         var adm = asObservableObject(this)[$mobx];
         var target = this;
+        var observable = adm.values_.get(key);
+        if (observable instanceof ComputedValue && observable.derivation !== get) {
+          adm.values_["delete"](key);
+        }
         ((_adm$lazyComputedKeys = adm.lazyComputedKeys_) != null ? _adm$lazyComputedKeys : adm.lazyComputedKeys_ = new Map()).set(key, function () {
-          var options = _extends({}, ann.options_, {
-            get: get,
-            context: target
-          });
-          options.name || (options.name =  adm.name_ + "." + key.toString() );
-          return new ComputedValue(options);
+          return createComputedValue(target, adm);
         });
       });
       return function () {
-        return this[$mobx].getObservablePropValue_(key);
+        var adm = this[$mobx];
+        var observable = adm.values_.get(key);
+        if (observable instanceof ComputedValue && observable.derivation !== get) {
+          var _computedValues;
+          var computed = (_computedValues = computedValues) == null ? void 0 : _computedValues.get(this);
+          if (!computed) {
+            var _computedValues2;
+            computed = createComputedValue(this, adm);
+            ((_computedValues2 = computedValues) != null ? _computedValues2 : computedValues = new WeakMap()).set(this, computed);
+          }
+          return computed.get();
+        }
+        return adm.getObservablePropValue_(key);
       };
     }
     function assertComputedDescriptor(adm, _ref, key, _ref2) {