improve callback api interface

patrickkunka · May 8, 2018 · 3d25cf8 · 3d25cf8
1 parent b7f8737
commit 3d25cf8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/bundle/easydropdown.js b/bundle/easydropdown.js
diff --git a/bundle/easydropdown.js.map b/bundle/easydropdown.js.map
diff --git a/demos/easydropdown.js b/demos/easydropdown.js
diff --git a/demos/easydropdown.js.map b/demos/easydropdown.js.map
diff --git a/src/Easydropdown/Easydropdown.test.ts b/src/Easydropdown/Easydropdown.test.ts
@@ -75,6 +75,20 @@ describe('Easydropdown', () => {
         assert.isTrue(onCloseSpy.called);
     });
 
+    it('does not invoke consumer callbacks if not provided', () => {
+        const select = createSelect();
+
+        const edd = new Easydropdown(select, {});
+
+        edd.actions.selectOption(1);
+
+        edd.open();
+
+        edd.actions.close();
+
+        assert.isTrue(true);
+    });
+
     describe('.open()', () => {
         it('programmatically opens the select', () => {
             const select = createSelect();

diff --git a/src/Easydropdown/Easydropdown.ts b/src/Easydropdown/Easydropdown.ts
@@ -3,6 +3,7 @@ import merge from 'helpful-merge';
 import Config                 from '../Config/Config';
 import ICallback              from '../Config/Interfaces/ICallback';
 import IConfig                from '../Config/Interfaces/IConfig';
+import ISelectCallback        from '../Config/Interfaces/ISelectCallback';
 import bindEvents             from '../Events/bindEvents';
 import EventBinding           from '../Events/EventBinding';
 import Dom                    from '../Renderer/Dom';
@@ -112,7 +113,6 @@ class Easydropdown {
         const {callbacks} = this.config;
 
         let cb: ICallback;
-        let arg: any;
 
         this.renderer.update(state, key);
 
@@ -124,15 +124,14 @@ class Easydropdown {
                     cb = callbacks.onClose;
                 }
 
+                if (typeof cb === 'function') cb();
+
                 break;
             case 'selectedIndex':
                 cb = callbacks.onSelect;
-                arg = state.value;
 
-                break;
+                if (typeof cb === 'function') (cb as ISelectCallback)(state.value);
         }
-
-        if (typeof cb === 'function') cb(arg);
     }
 }