stump-cycle-dom - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12

lib/cjs/EventDelegator.js

@@ -101,23 +101,34 @@ "use strict";
             dest = this.insertListener(subject, scopeChecker, eventType, options);
+            return subject;
         }
         else {
-            var self_1 = this;
-            var finder = new ElementFinder_1.ElementFinder(namespace, this.isolateModule);
-            var input_1;
-            var new_subject_1 = xstream_1.default.never();
-            var listener_1 = {
-                next: function (x) { return subject.shamefullySendNext(x); },
-                error: function (e) { return subject.shamefullySendError(e); },
-                complete: function () {
-                    subject.shamefullySendComplete();
-                    self_1.nonBubblingListenersToAdd.delete(input_1);
-                    new_subject_1.removeListener(listener_1);
-                }
-            };
-            new_subject_1.addListener(listener_1);
-            dest = this.insertListener(new_subject_1, scopeChecker, eventType, options);
-            input_1 = [eventType, finder, dest];
-            this.setupNonBubblingListener(input_1);
+            var found = this.nonBubblingListenersToAdd.find(function (x) {
+                var _sub = x[0], et = x[1], ef = x[2], _ = x[3];
+                return eventType === et && utils_1.isEqualNamespace(ef.namespace, namespace);
+            });
+            if (!found) {
+                var self_1 = this;
+                var finder = new ElementFinder_1.ElementFinder(namespace, this.isolateModule);
+                var input_1;
+                var new_subject_1 = xstream_1.default.never();
+                var listener_1 = {
+                    next: function (x) { return subject.shamefullySendNext(x); },
+                    error: function (e) { return subject.shamefullySendError(e); },
+                    complete: function () {
+                        subject.shamefullySendComplete();
+                        self_1.nonBubblingListenersToAdd.delete(input_1);
+                        new_subject_1.removeListener(listener_1);
+                    }
+                };
+                new_subject_1.addListener(listener_1);
+                dest = this.insertListener(new_subject_1, scopeChecker, eventType, options);
+                input_1 = [subject, eventType, finder, dest];
+                this.setupNonBubblingListener(input_1);
+                return subject;
+            }
+            else {
+                var sub = found[0], _ = found[1];
+                return sub;
+            }
         }
-        return subject;
     };
@@ -206,3 +217,3 @@ EventDelegator.prototype.removeElement = function (element, namespace) {
     EventDelegator.prototype.setupNonBubblingListener = function (input) {
-        var eventType = input[0], elementFinder = input[1], destination = input[2];
+        var sub = input[0], eventType = input[1], elementFinder = input[2], destination = input[3];
         if (!this.origin) {
@@ -219,3 +230,3 @@ this.nonBubblingListenersToAdd.add(input);
                 if (!subs || !subs[eventType]) {
-                    var sub = fromEvent_1.fromEvent(element, eventType, false, false, destination.passive).subscribe({
+                    var sub_1 = fromEvent_1.fromEvent(element, eventType, false, false, destination.passive).subscribe({
                         next: function (ev) {
@@ -234,4 +245,4 @@ return self_2.onEvent(eventType, ev, !!destination.passive, false);
                     }
-                    map.set(element, { sub: sub, destination: destination });
-                    element.subs = __assign({}, subs, (_a = {}, _a[eventType] = sub, _a));
+                    map.set(element, { sub: sub_1, destination: destination });
+                    element.subs = __assign({}, subs, (_a = {}, _a[eventType] = sub_1, _a));
                 }
@@ -238,0 +249,0 @@ });

lib/cjs/RemovalSet.d.ts

@@ -7,4 +7,5 @@ export default class RemovalSet<T> {
     forEach(f: (t: T) => void): void;
+    find(f: (t: T) => boolean): T | undefined;
     delete(t: T): void;
     flush(): void;
 }

lib/cjs/RemovalSet.js

@@ -16,2 +16,7 @@ "use strict";
     };
+    RemovalSet.prototype.find = function (f) {
+        return Array.from(this._set).find(function (x) {
+            return f(x);
+        });
+    };
     RemovalSet.prototype.delete = function (t) {
@@ -18,0 +23,0 @@ if (this.toDelete.length === this.toDeleteSize) {

lib/es6/EventDelegator.js

@@ -14,3 +14,3 @@ var __assign = (this && this.__assign) || function () {
 import { ScopeChecker } from './ScopeChecker';
-import { getSelectors } from './utils';
+import { getSelectors, isEqualNamespace } from './utils';
 import { ElementFinder } from './ElementFinder';
@@ -100,23 +100,34 @@ import SymbolTree from './SymbolTree';
             dest = this.insertListener(subject, scopeChecker, eventType, options);
+            return subject;
         }
         else {
-            var self_1 = this;
-            var finder = new ElementFinder(namespace, this.isolateModule);
-            var input_1;
-            var new_subject_1 = xs.never();
-            var listener_1 = {
-                next: function (x) { return subject.shamefullySendNext(x); },
-                error: function (e) { return subject.shamefullySendError(e); },
-                complete: function () {
-                    subject.shamefullySendComplete();
-                    self_1.nonBubblingListenersToAdd.delete(input_1);
-                    new_subject_1.removeListener(listener_1);
-                }
-            };
-            new_subject_1.addListener(listener_1);
-            dest = this.insertListener(new_subject_1, scopeChecker, eventType, options);
-            input_1 = [eventType, finder, dest];
-            this.setupNonBubblingListener(input_1);
+            var found = this.nonBubblingListenersToAdd.find(function (x) {
+                var _sub = x[0], et = x[1], ef = x[2], _ = x[3];
+                return eventType === et && isEqualNamespace(ef.namespace, namespace);
+            });
+            if (!found) {
+                var self_1 = this;
+                var finder = new ElementFinder(namespace, this.isolateModule);
+                var input_1;
+                var new_subject_1 = xs.never();
+                var listener_1 = {
+                    next: function (x) { return subject.shamefullySendNext(x); },
+                    error: function (e) { return subject.shamefullySendError(e); },
+                    complete: function () {
+                        subject.shamefullySendComplete();
+                        self_1.nonBubblingListenersToAdd.delete(input_1);
+                        new_subject_1.removeListener(listener_1);
+                    }
+                };
+                new_subject_1.addListener(listener_1);
+                dest = this.insertListener(new_subject_1, scopeChecker, eventType, options);
+                input_1 = [subject, eventType, finder, dest];
+                this.setupNonBubblingListener(input_1);
+                return subject;
+            }
+            else {
+                var sub = found[0], _ = found[1];
+                return sub;
+            }
         }
-        return subject;
     };
@@ -205,3 +216,3 @@ EventDelegator.prototype.removeElement = function (element, namespace) {
     EventDelegator.prototype.setupNonBubblingListener = function (input) {
-        var eventType = input[0], elementFinder = input[1], destination = input[2];
+        var sub = input[0], eventType = input[1], elementFinder = input[2], destination = input[3];
         if (!this.origin) {
@@ -218,3 +229,3 @@ this.nonBubblingListenersToAdd.add(input);
                 if (!subs || !subs[eventType]) {
-                    var sub = fromEvent(element, eventType, false, false, destination.passive).subscribe({
+                    var sub_1 = fromEvent(element, eventType, false, false, destination.passive).subscribe({
                         next: function (ev) {
@@ -233,4 +244,4 @@ return self_2.onEvent(eventType, ev, !!destination.passive, false);
                     }
-                    map.set(element, { sub: sub, destination: destination });
-                    element.subs = __assign({}, subs, (_a = {}, _a[eventType] = sub, _a));
+                    map.set(element, { sub: sub_1, destination: destination });
+                    element.subs = __assign({}, subs, (_a = {}, _a[eventType] = sub_1, _a));
                 }
@@ -237,0 +248,0 @@ });

lib/es6/RemovalSet.d.ts

@@ -7,4 +7,5 @@ export default class RemovalSet<T> {
     forEach(f: (t: T) => void): void;
+    find(f: (t: T) => boolean): T | undefined;
     delete(t: T): void;
     flush(): void;
 }

lib/es6/RemovalSet.js

@@ -14,2 +14,7 @@ var RemovalSet = /** @class */ (function () {
     };
+    RemovalSet.prototype.find = function (f) {
+        return Array.from(this._set).find(function (x) {
+            return f(x);
+        });
+    };
     RemovalSet.prototype.delete = function (t) {
@@ -16,0 +21,0 @@ if (this.toDelete.length === this.toDeleteSize) {

package.json

 {
   "name": "stump-cycle-dom",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "The standard DOM Driver for Cycle.js, based on Snabbdom",
@@ -5,0 +5,0 @@ "license": "MIT",

src/EventDelegator.ts

 import xs, {Stream, Subscription} from 'xstream';
 import {ScopeChecker} from './ScopeChecker';
 import {IsolateModule} from './IsolateModule';
-import {getSelectors, makeInsert} from './utils';
+import {getSelectors, isEqualNamespace, makeInsert} from './utils';
 import {ElementFinder} from './ElementFinder';
@@ -93,3 +93,3 @@ import {EventsFnOptions} from './DOMSource';
   private nonBubblingListenersToAdd = new RemovalSet<
-    [string, ElementFinder, Destination]
+    [Stream<Event>, string, ElementFinder, Destination]
   >();
@@ -150,26 +150,37 @@
       dest = this.insertListener(subject, scopeChecker, eventType, options);
+      return subject
     } else {
-      const self = this
-      const finder = new ElementFinder(namespace, this.isolateModule);
-      let input: any
-      const new_subject = xs.never()
-      const listener = {
-        next: (x: any) => subject.shamefullySendNext(x),
-        error: (e: any) => subject.shamefullySendError(e),
-        complete: () => {
-          subject.shamefullySendComplete()
-          self.nonBubblingListenersToAdd.delete(input);
-          new_subject.removeListener(listener)
+      const found = this.nonBubblingListenersToAdd.find(x => {
+        const [_sub, et, ef, _] = x
+        return eventType === et && isEqualNamespace(ef.namespace, namespace)
+      })
+      
+      if (!found) {
+        const self = this
+        const finder = new ElementFinder(namespace, this.isolateModule);
+        let input: any
+        const new_subject = xs.never()
+        const listener = {
+          next: (x: any) => subject.shamefullySendNext(x),
+          error: (e: any) => subject.shamefullySendError(e),
+          complete: () => {
+            subject.shamefullySendComplete()
+            self.nonBubblingListenersToAdd.delete(input);
+            new_subject.removeListener(listener)
+          }
         }
+  
+        new_subject.addListener(listener)
+  
+        dest = this.insertListener(new_subject, scopeChecker, eventType, options);
+        input = [subject, eventType, finder, dest];
+  
+        this.setupNonBubblingListener(input);
+
+        return subject
+      } else {
+        const [sub, _] = found
+        return sub
       }
-
-      new_subject.addListener(listener)
-
-      dest = this.insertListener(new_subject, scopeChecker, eventType, options);
-      input = [eventType, finder, dest];
-
-      this.setupNonBubblingListener(input);
     }
-
-    return subject;
   }
@@ -291,5 +302,5 @@
   private setupNonBubblingListener(
-    input: [string, ElementFinder, Destination]
+    input: [Stream<Event>, string, ElementFinder, Destination]
   ): void {
-    const [eventType, elementFinder, destination] = input;
+    const [sub, eventType, elementFinder, destination] = input;
     if (!this.origin) {
@@ -296,0 +307,0 @@ this.nonBubblingListenersToAdd.add(input);

src/RemovalSet.ts

@@ -15,2 +15,8 @@ export default class RemovalSet<T> {
 
+  public find(f: (t: T) => boolean): T | undefined {
+    return Array.from(this._set).find(x => {
+      return f(x)
+    })
+  }
+
   public delete(t: T): void {
@@ -17,0 +23,0 @@ if (this.toDelete.length === this.toDeleteSize) {

No alert changes

Improved metrics

Total package byte prevSize

530642

increased by0.58%

Lines of code

11897

increased by0.41%

No dependency changes