Simplify API for on and once

demiazz · May 4, 2017 · 7de5093 · 7de5093
1 parent 507ec08
commit 7de5093
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 174 deletions.
diff --git a/d.ts/homey.d.ts b/d.ts/homey.d.ts
@@ -3,7 +3,6 @@ type Elements = Element[];
 type EventDetails = { [key: string]: any };
 type EventListener = (event: Event) => any;
 type EventType = string;
-type EventTypes = string;
 type PredicateFn = (element: Element) => boolean;
 type Selector = string;
 
@@ -56,6 +55,6 @@ export function remove(element: Element): boolean;
  * Events
  */
 
-export function on(element: Element, eventTypes: EventTypes, listener: EventListener): () => void;
-export function once(element: Element, eventTypes: EventTypes, listener: EventListener): () => void;
+export function on(element: Element, eventType: EventType, listener: EventListener): () => void;
+export function once(element: Element, eventType: EventType, listener: EventListener): () => void;
 export function dispatch(element: Element, eventType: EventType, listener: EventListener): boolean;
diff --git a/spec/on.spec.js b/spec/on.spec.js
@@ -76,81 +76,4 @@ describe("on", () => {
     expect(listener).toHaveBeenCalledTimes(1);
     expect(listener).toHaveBeenCalledWith(listenedEvent);
   });
-
-  describe("when given space-separated events types list", () => {
-    it("adds listener for DOM events", () => {
-      on(subject, "click dblclick", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const events = [createEvent("click"), createEvent("dblclick")];
-
-      events.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(events.length);
-    });
-
-    it("adds listener for custom events", () => {
-      on(subject, "foo bar", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const events = [createEvent("foo"), createEvent("bar")];
-
-      events.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(events.length);
-    });
-
-    it("adds listener which called on each event trigger", () => {
-      on(subject, "click custom", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      for (let i = 0; i < 5; i += 1) {
-        const events = [createEvent("click"), createEvent("custom")];
-
-        // eslint-disable-next-line
-        events.forEach(event => {
-          subject.dispatchEvent(event);
-
-          expect(listener).toHaveBeenCalledWith(event);
-        });
-      }
-
-      expect(listener).toHaveBeenCalledTimes(10);
-    });
-
-    it("returns function for removing listener for all event types", () => {
-      const off = on(subject, "click custom", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const listenedEvents = [createEvent("click"), createEvent("custom")];
-
-      listenedEvents.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(listenedEvents.length);
-
-      off();
-
-      [createEvent("click"), createEvent("custom")].forEach(event => {
-        subject.dispatchEvent(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(listenedEvents.length);
-    });
-  });
 });
diff --git a/spec/once.spec.js b/spec/once.spec.js
@@ -72,78 +72,4 @@ describe("once", () => {
 
     expect(listener).not.toHaveBeenCalled();
   });
-
-  describe("when given space-separated events types list", () => {
-    it("adds listener for DOM events", () => {
-      once(subject, "click dblclick", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const events = [createEvent("click"), createEvent("dblclick")];
-
-      events.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(events.length);
-    });
-
-    it("adds listener for custom events", () => {
-      once(subject, "foo bar", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const events = [createEvent("foo"), createEvent("bar")];
-
-      events.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(events.length);
-    });
-
-    it("adds listener which called on first trigger for each event", () => {
-      once(subject, "click custom", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      const listenedEvents = [createEvent("click"), createEvent("custom")];
-
-      listenedEvents.forEach(event => {
-        subject.dispatchEvent(event);
-
-        expect(listener).toHaveBeenCalledWith(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(listenedEvents.length);
-
-      const unlistenedEvents = [createEvent("click"), createEvent("custom")];
-
-      unlistenedEvents.forEach(event => {
-        subject.dispatchEvent(event);
-      });
-
-      expect(listener).toHaveBeenCalledTimes(listenedEvents.length);
-    });
-
-    it("returns function for removing listener for all event types", () => {
-      const off = once(subject, "click custom", listener);
-
-      expect(listener).not.toHaveBeenCalled();
-
-      off();
-
-      const events = [createEvent("click"), createEvent("custom")];
-
-      events.forEach(event => {
-        subject.dispatchEvent(event);
-      });
-
-      expect(listener).not.toHaveBeenCalled();
-    });
-  });
 });
diff --git a/src/index.js b/src/index.js
@@ -10,8 +10,6 @@ type EventListener = (event: Event) => mixed;
 
 type EventType = string;
 
-type EventTypes = string;
-
 type PredicateFn = (element: Element) => boolean;
 
 type Selector = string;
@@ -206,36 +204,28 @@ function remove(element: Element): boolean {
 
 function on(
   element: Element,
-  eventTypes: EventTypes,
+  eventType: EventType,
   listener: EventListener
 ): () => void {
-  const offs = eventTypes.split(" ").map(eventType => {
-    element.addEventListener(eventType, listener);
-
-    return () => element.removeEventListener(eventType, listener);
-  });
+  element.addEventListener(eventType, listener);
 
-  return () => offs.forEach(off => off());
+  return () => element.removeEventListener(eventType, listener);
 }
 
 function once(
   element: Element,
-  eventTypes: EventTypes,
+  eventType: EventType,
   listener: EventListener
 ): () => void {
-  const offs = eventTypes.split(" ").map(eventType => {
-    const wrappedListener = event => {
-      element.removeEventListener(eventType, wrappedListener);
-
-      listener(event);
-    };
+  function wrappedListener(event) {
+    element.removeEventListener(eventType, wrappedListener);
 
-    element.addEventListener(eventType, wrappedListener);
+    listener(event);
+  }
 
-    return () => element.removeEventListener(eventType, wrappedListener);
-  });
+  element.addEventListener(eventType, wrappedListener);
 
-  return () => offs.forEach(off => off());
+  return () => element.removeEventListener(eventType, wrappedListener);
 }
 
 function dispatch(