reactive-di - npm Package Compare versions

Comparing version 4.0.14 to 4.0.15

CHANGELOG.md

@@ -5,2 +5,7 @@ # Change Log
 
+<a name="4.0.15"></a>
+## [4.0.15](https://github.com/zerkalica/reactive-di/compare/v4.0.14...v4.0.15) (2017-09-22)
+
+
+
 <a name="4.0.14"></a>
@@ -7,0 +12,0 @@ ## [4.0.14](https://github.com/zerkalica/reactive-di/compare/v4.0.13...v4.0.14) (2017-09-13)

dist/reactive-di.es.js

@@ -109,3 +109,4 @@ import { detached, memkey } from 'lom_atom';
     return new FakeSheet();
-  }
+  },
+  removeStyleSheet: function removeStyleSheet(sheet) {}
 };
@@ -121,16 +122,16 @@ var SheetManager = (_class2 = function () {
 
-    if (oldValue === undefined) {
-      var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+    if (oldValue !== undefined) {
+      this._sheetProcessor.removeStyleSheet(oldValue); // oldValue.detach()
 
-      newValue.attach();
-      return newValue;
     }
 
-    oldValue.update(undefined, this._injector.invoke(key));
-    oldValue.attach();
-    return oldValue;
+    var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+
+    newValue.attach();
+    return newValue;
   };
 
   SheetManager.prototype.destroy = function destroy(value) {
-    value.detach();
+    this._sheetProcessor.removeStyleSheet(value); // value.detach()
+
   };
@@ -373,2 +374,3 @@
     if (argDeps !== undefined) {
+      var sm = this._sheetManager;
       var resolved = this._resolved;
@@ -382,8 +384,19 @@
 
-          for (var prop in argDep) {
+          if (!resolved) {
+            for (var prop in argDep) {
+              // eslint-disable-line
+              var key = argDep[prop];
+
+              if (key.theme !== undefined) {
+                obj[prop] = sm.sheet(key).classes;
+              }
+            }
+          }
+
+          for (var _prop in argDep) {
             // eslint-disable-line
-            var key = argDep[prop];
-            var dep = key.theme === undefined ? this.value(key) : this._sheetManager.sheet(key).classes;
+            var _key = argDep[_prop];
+            var dep = _key.theme === undefined ? this.value(_key) : sm.sheet(_key).classes;
 
-            if (resolved === false && key.__lom_prop !== undefined) {
+            if (resolved === false && _key.__lom_prop !== undefined) {
               if (this._listeners === undefined) {
@@ -396,3 +409,3 @@ this._listeners = [];
 
-            obj[prop] = dep;
+            obj[_prop] = dep;
           }
@@ -402,3 +415,3 @@
         } else {
-          var _dep = argDep.theme === undefined ? this.value(argDep) : this._sheetManager.sheet(argDep).classes;
+          var _dep = argDep.theme === undefined ? this.value(argDep) : sm.sheet(argDep).classes;
 
@@ -632,2 +645,4 @@ if (resolved === false && argDep.__lom_prop !== undefined) {
   return function reactWrapper(render) {
+    var displayName = render.displayName || render.name;
+
     var WrappedComponent = function WrappedComponent(props, context) {
@@ -634,0 +649,0 @@ AtomizedComponent.call(this, props, context);

dist/reactive-di.js

@@ -113,3 +113,4 @@ 'use strict';
     return new FakeSheet();
-  }
+  },
+  removeStyleSheet: function removeStyleSheet(sheet) {}
 };
@@ -125,16 +126,16 @@ var SheetManager = (_class2 = function () {
 
-    if (oldValue === undefined) {
-      var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+    if (oldValue !== undefined) {
+      this._sheetProcessor.removeStyleSheet(oldValue); // oldValue.detach()
 
-      newValue.attach();
-      return newValue;
     }
 
-    oldValue.update(undefined, this._injector.invoke(key));
-    oldValue.attach();
-    return oldValue;
+    var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+
+    newValue.attach();
+    return newValue;
   };
 
   SheetManager.prototype.destroy = function destroy(value) {
-    value.detach();
+    this._sheetProcessor.removeStyleSheet(value); // value.detach()
+
   };
@@ -377,2 +378,3 @@
     if (argDeps !== undefined) {
+      var sm = this._sheetManager;
       var resolved = this._resolved;
@@ -386,8 +388,19 @@
 
-          for (var prop in argDep) {
+          if (!resolved) {
+            for (var prop in argDep) {
+              // eslint-disable-line
+              var key = argDep[prop];
+
+              if (key.theme !== undefined) {
+                obj[prop] = sm.sheet(key).classes;
+              }
+            }
+          }
+
+          for (var _prop in argDep) {
             // eslint-disable-line
-            var key = argDep[prop];
-            var dep = key.theme === undefined ? this.value(key) : this._sheetManager.sheet(key).classes;
+            var _key = argDep[_prop];
+            var dep = _key.theme === undefined ? this.value(_key) : sm.sheet(_key).classes;
 
-            if (resolved === false && key.__lom_prop !== undefined) {
+            if (resolved === false && _key.__lom_prop !== undefined) {
               if (this._listeners === undefined) {
@@ -400,3 +413,3 @@ this._listeners = [];
 
-            obj[prop] = dep;
+            obj[_prop] = dep;
           }
@@ -406,3 +419,3 @@
         } else {
-          var _dep = argDep.theme === undefined ? this.value(argDep) : this._sheetManager.sheet(argDep).classes;
+          var _dep = argDep.theme === undefined ? this.value(argDep) : sm.sheet(argDep).classes;
 
@@ -636,2 +649,4 @@ if (resolved === false && argDep.__lom_prop !== undefined) {
   return function reactWrapper(render) {
+    var displayName = render.displayName || render.name;
+
     var WrappedComponent = function WrappedComponent(props, context) {
@@ -638,0 +653,0 @@ AtomizedComponent.call(this, props, context);

dist/reactive-di.umd.js

@@ -113,3 +113,4 @@ (function (global, factory) {
     return new FakeSheet();
-  }
+  },
+  removeStyleSheet: function removeStyleSheet(sheet) {}
 };
@@ -125,16 +126,16 @@ var SheetManager = (_class2 = function () {
 
-    if (oldValue === undefined) {
-      var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+    if (oldValue !== undefined) {
+      this._sheetProcessor.removeStyleSheet(oldValue); // oldValue.detach()
 
-      newValue.attach();
-      return newValue;
     }
 
-    oldValue.update(undefined, this._injector.invoke(key));
-    oldValue.attach();
-    return oldValue;
+    var newValue = this._sheetProcessor.createStyleSheet(this._injector.invoke(key));
+
+    newValue.attach();
+    return newValue;
   };
 
   SheetManager.prototype.destroy = function destroy(value) {
-    value.detach();
+    this._sheetProcessor.removeStyleSheet(value); // value.detach()
+
   };
@@ -377,2 +378,3 @@
     if (argDeps !== undefined) {
+      var sm = this._sheetManager;
       var resolved = this._resolved;
@@ -386,8 +388,19 @@
 
-          for (var prop in argDep) {
+          if (!resolved) {
+            for (var prop in argDep) {
+              // eslint-disable-line
+              var key = argDep[prop];
+
+              if (key.theme !== undefined) {
+                obj[prop] = sm.sheet(key).classes;
+              }
+            }
+          }
+
+          for (var _prop in argDep) {
             // eslint-disable-line
-            var key = argDep[prop];
-            var dep = key.theme === undefined ? this.value(key) : this._sheetManager.sheet(key).classes;
+            var _key = argDep[_prop];
+            var dep = _key.theme === undefined ? this.value(_key) : sm.sheet(_key).classes;
 
-            if (resolved === false && key.__lom_prop !== undefined) {
+            if (resolved === false && _key.__lom_prop !== undefined) {
               if (this._listeners === undefined) {
@@ -400,3 +413,3 @@ this._listeners = [];
 
-            obj[prop] = dep;
+            obj[_prop] = dep;
           }
@@ -406,3 +419,3 @@
         } else {
-          var _dep = argDep.theme === undefined ? this.value(argDep) : this._sheetManager.sheet(argDep).classes;
+          var _dep = argDep.theme === undefined ? this.value(argDep) : sm.sheet(argDep).classes;
 
@@ -636,2 +649,4 @@ if (resolved === false && argDep.__lom_prop !== undefined) {
   return function reactWrapper(render) {
+    var displayName = render.displayName || render.name;
+
     var WrappedComponent = function WrappedComponent(props, context) {
@@ -638,0 +653,0 @@ AtomizedComponent.call(this, props, context);

package.json

 {
   "name": "reactive-di",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "Reactive dependency injection",
@@ -76,4 +76,4 @@ "publishConfig": {
   "dependencies": {
-    "lom_atom": "^1.1.2"
+    "lom_atom": "^1.1.3"
   }
 }

src/createReactWrapper.js

@@ -204,2 +204,3 @@ // @flow
     ): Class<IReactComponent<IElement>> {
+        const displayName = render.displayName || render.name
         const WrappedComponent = function(props: IPropsWithContext, context?: Object) {
@@ -206,0 +207,0 @@ AtomizedComponent.call(this, props, context)

src/Injector.js

@@ -14,3 +14,3 @@ // @flow
 export interface ISheet<V: Object> {
-    update(name?: string, props: V): ISheet<V>;
+    // update(props: V): ISheet<V>;
     attach(): ISheet<V>;
@@ -23,2 +23,3 @@ detach(): ISheet<V>;
     createStyleSheet<V: Object>(_cssObj: V, options: any): ISheet<V>;
+    removeStyleSheet<V: Object>(sheet: ISheet<V>): void;
 }
@@ -45,3 +46,4 @@
         return new FakeSheet()
-    }
+    },
+    removeStyleSheet<V: Object>(sheet: ISheet<V>) {}
 }
@@ -62,15 +64,15 @@
 
-        if (oldValue === undefined) {
-            const newValue: ISheet<V> = this._sheetProcessor.createStyleSheet(this._injector.invoke(key))
-            newValue.attach()
-            return newValue
+        if (oldValue !== undefined) {
+            this._sheetProcessor.removeStyleSheet(oldValue)
+            // oldValue.detach()
         }
+        const newValue: ISheet<V> = this._sheetProcessor.createStyleSheet(this._injector.invoke(key))
+        newValue.attach()
 
-        oldValue.update(undefined, this._injector.invoke(key))
-        oldValue.attach()
-        return oldValue
+        return newValue
     }
 
     destroy(value: ISheet<*>) {
-        value.detach()
+        this._sheetProcessor.removeStyleSheet(value)
+        // value.detach()
     }
@@ -279,2 +281,3 @@ }
         if (argDeps !== undefined) {
+            const sm = this._sheetManager
             const resolved = this._resolved
@@ -285,2 +288,11 @@ for (let i = 0, l = argDeps.length; i < l; i++) {
                     const obj = {}
+                    if (!resolved) {
+                        for (let prop in argDep) { // eslint-disable-line
+                            const key = argDep[prop]
+                            if (key.theme !== undefined) {
+                                obj[prop] = sm.sheet(key).classes
+                            }
+                        }
+                    }
+
                     for (let prop in argDep) { // eslint-disable-line
@@ -290,3 +302,3 @@ const key = argDep[prop]
                             ? this.value(key)
-                            : this._sheetManager.sheet(key).classes
+                            : sm.sheet(key).classes
 
@@ -307,3 +319,3 @@ if (resolved === false && key.__lom_prop !== undefined) {
                         ? this.value(argDep)
-                        : this._sheetManager.sheet(argDep).classes
+                        : sm.sheet(argDep).classes
 
@@ -310,0 +322,0 @@ if (resolved === false && argDep.__lom_prop !== undefined) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

202946

increased by2.27%

Lines of code

2164

increased by1.98%

Dependency changes

• Updatedlom_atom@^1.1.3