Merge branch 'develop'

craftedbygc · Sep 23, 2022 · a3d2270 · a3d2270
2 parents a910cba + 16e82ca
commit a3d2270
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/dist/e.umd.js b/dist/e.umd.js
diff --git a/examples/index.html b/examples/index.html
@@ -36,6 +36,9 @@ <h2>Event Bus</h2>
         </div>
 
 
+        <a href="#sdsd" class="delegatedblurfocus">delegated blur focus</a>
+        <a href="#sdsd2" class="delegatedblurfocus">delegated blur focus</a>
+
 
 
         <script src="test.min.js"></script>
diff --git a/examples/test.js b/examples/test.js
@@ -1,4 +1,4 @@
-import E from '../instance'
+import E from '../src/e'
 
 const btn = document.getElementById('btn')
 const btn2 = document.getElementById('btn2')
@@ -16,7 +16,6 @@ class Foo {
         E.delegate('click','#btn3', this.onceHandler)
         E.delegate('click','.deep', this.delegateHandler)
 
-
         E.on('mouseenter', document.querySelectorAll('.nodelist'), () => console.log('nodelist'))
         E.on('mouseenter', [...document.querySelectorAll('.nodelist')], () => console.log('nodelist array'))
 
@@ -25,6 +24,8 @@ class Foo {
 		//E.off('mouseenter', '#mouseover', this.delegatedMouseEnter)
         //E.off('mouseleave', '#mouseover', this.delegatedMouseLeave)
 
+        E.delegate('blur focus', '.delegatedblurfocus', (e) => console.log(`delegated ${e.type}`))
+
         E.delegate('click','button, h2', () => console.log('qs example'))
 
         // Event bus example

diff --git a/src/e.d.ts b/src/e.d.ts
@@ -15,11 +15,11 @@ declare class E {
      * Bind event to a string, NodeList, or element.
      *
      * @param {string} event
-     * @param {string|NodeList|HTMLElement|Element|Window|Document|array|function} el
+     * @param {string|NodeList|HTMLElement|HTMLElement[]|Window|Document|function} el
      * @param {*} [callback]
      * @param {{}|boolean} [options]
      */
-    on(event: string, el: string | NodeList | HTMLElement | Element | Window | Document | any[] | Function, callback?: any, options?: {} | boolean): void;
+    on(event: string, el: string | NodeList | HTMLElement | HTMLElement[] | Window | Document | Function, callback?: any, options?: {} | boolean): void;
     /**
      * Add a delegated event.
      *

diff --git a/src/e.js b/src/e.js
@@ -34,7 +34,7 @@ class E {
      * Bind event to a string, NodeList, or element.
      *
      * @param {string} event
-     * @param {string|NodeList|HTMLElement|Element|Window|Document|array|function} el
+     * @param {string|NodeList|HTMLElement|HTMLElement[]|Window|Document|function} el
      * @param {*} [callback]
      * @param {{}|boolean} [options]
      */

diff --git a/src/utils.js b/src/utils.js
@@ -14,7 +14,7 @@ const listeners = {}
  * Events that don't bubble
  * @type {string[]}
  */
-const nonBubblers = ['mouseenter', 'mouseleave', 'pointerenter', 'pointerleave']
+const nonBubblers = ['mouseenter', 'mouseleave', 'pointerenter', 'pointerleave', 'blur', 'focus']
 
 /**
  * Make a bus stack if not already created.