@kizmann/pico-js 2.0.8 → 2.0.10

package/src/dom/{DomEvent.js → DomEvent.ts}

@@ -1,27 +1,31 @@
-import { Arr, Hash, Mix, Obj, Dom, Run } from "../index.esm.js";
-import { PicoDom } from "../utils/Dom.js";
-
-/**
- * @memberof PicoDom
- */
-export class PicoDomEventStatic
+import { Arr, Hash, Mix, Obj, Dom, Run } from "../index.esm.ts";
+import { PicoDom, PicoDomInterface } from "../utils/Dom.ts";
+import PicoDomFinder from "./DomFinder.js";
+import PicoDomRectangle from "./DomRectangle.js";
+
+export interface PicoDomEvent extends PicoDomInterface,
+    PicoDomFinder,
+    PicoDomRectangle
 {
-    static $events = [];
+    //
 }
 
 /**
  * @memberof PicoDom
- * @extends {PicoDom}
  */
-export class PicoDomEventInstance
+export class PicoDomEvent
 {
+    /**
+     * @type {any[]}
+     */
+    static $events : any[] = [];
 
     /**
      * Bind event listener
      *
      * @example Dom.bind(el, "click", cb)
      *
-     * @param {Element} el Target element
+     * @param {any} el Target element
      * @param {string} event Event name
      * @param {function} cb Callback fn
      * @param {string} [selector] Event selector
@@ -29,7 +33,7 @@ export class PicoDomEventInstance
      * @param {any} [options] Listener options
      * @returns {PicoDom} Current instance
      */
-    bind(el, event, cb, selector = null, pause = false, options = {})
+    bind(el : any, event : string, cb : Function, selector : string = null, pause : boolean = false, options : any = {}) : PicoDom
     {
         if ( Mix.isPrim(options) ) {
             options = { id: options };
@@ -41,7 +45,7 @@ export class PicoDomEventInstance
 
         el.addEventListener(event, cb, options);
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -49,13 +53,13 @@ export class PicoDomEventInstance
      *
      * @example Dom.unbind(el, "click")
      *
-     * @param {Element} el Target element
+     * @param {any} el Target element
      * @param {string} event Event name
      * @param {string} [selector] Event selector
      * @param {any} [options] Listener options
      * @returns {PicoDom} Current instance
      */
-    unbind(el, event, selector = null, options = {})
+    unbind(el : any, event : string, selector : string = null, options : any = {}) : PicoDom
     {
         if ( Mix.isPrim(options) ) {
             options = { id: options };
@@ -66,20 +70,20 @@ export class PicoDomEventInstance
         });
 
         if ( indexes.length === 0 ) {
-            return;
+            return <PicoDom> <unknown> this;
         }
 
-        let args = (val) => {
+        let args = (val : any) => {
             return [event, val.cb, val.options];
         };
 
-        Arr.each(indexes.reverse(), (index) => {
+        Arr.each(indexes.reverse(), (index : any) => {
             el.removeEventListener(...args(Dom.$events[index]));
         });
 
         Arr.splices(Dom.$events, indexes);
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -88,32 +92,36 @@ export class PicoDomEventInstance
      * @example Dom.find("div").on("click", cb)
      *
      * @param {any} event Event name
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @param {any} [options] Listener options
      * @param {boolean} [pause] Pause listener
      * @param {string} [selector] Event selector
      * @returns {PicoDom} Current instance
      */
-    on(event, cb, options = {}, pause = false, selector = null)
+    on(event : any, cb : Function, options : any = {}, pause : boolean = false, selector : string = null) : PicoDom
     {
         if ( Mix.isPrim(options) ) {
             options = { id: options };
         }
 
-        // geht so nicht
-        // if ( Mix.isArr(event) ) {
-        //     return (Arr.each(event, (e) => this.on(e, cb, options, pause, selector)), this);
-        // }
+        const args = [
+            cb, options, pause, selector
+        ];
+
+        if ( Mix.isArr(event) ) {
+            // @ts-ignore
+            return (Arr.each(event, (e : any) => this.on(e, ...args)), this);
+        }
 
-        let fn = (e) => {
+        let fn = (e : any) => {
             cb.call(e.target, e, e.target);
         };
 
-        this.each((el) => {
+        this.each((el : any) => {
             this.bind(el, event, fn, selector, pause, options);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -122,30 +130,34 @@ export class PicoDomEventInstance
      * @example Dom.find("div").off("click")
      *
      * @param {any} event Event name
-     * @param {string} [selector] Event selector
+     * @param {any} [selector] Event selector
      * @param {any} [options] Listener options
      * @returns {PicoDom} Current instance
      */
-    off(event, selector = null, options = {})
+    off(event : any, selector : string = null, options : any = {}) : PicoDom
     {
         if ( Mix.isPrim(options) ) {
             options = { id: options };
         }
 
-        // geht so nicht
-        // if ( Mix.isArr(event) ) {
-        //     return (Arr.each(event, (e) => this.off(e, ...arguments)), this);
-        // }
+        const args = [
+            selector, options
+        ];
+
+        if ( Mix.isArr(event) ) {
+            // @ts-ignore
+            return (Arr.each(event, (e : any) => this.off(e, ...args)), this);
+        }
 
         if ( Mix.isObj(selector) ) {
             (options = selector, selector = null);
         }
 
-        this.each((el) => {
+        this.each((el : any) => {
             this.unbind(el, event, selector, options);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -156,17 +168,17 @@ export class PicoDomEventInstance
      * @param {any} [options] Listener options
      * @returns {PicoDom} Current instance
      */
-    optoff(options = {})
+    optoff(options : any = {}) : PicoDom
     {
         Run.async(() => {
             Arr.filterRemove(Dom.$events, { options });
         });
 
-        this.each((el) => {
+        this.each((el : any) => {
             el && el.removeAllListeners();
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -175,19 +187,20 @@ export class PicoDomEventInstance
      * @example Dom.find("div").once("click", cb)
      *
      * @param {any} event Event name
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @param {any} [options] Listener options
      * @returns {PicoDom} Current instance
      */
-    once(event, cb, options = {})
+    once(event : any, cb : Function, options : any = {}) : PicoDom
     {
         options.id = Hash.make(24);
 
         this.on(event, (e) => {
-            cb(e); this.off(event, options);
+            cb(e);
+            this.off(event, options);
         }, options);
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -197,14 +210,14 @@ export class PicoDomEventInstance
      *
      * @param {any} event Event name
      * @param {string} selector Event selector
-     * @param {function} cb Callback fn
+     * @param {Function} cb Callback fn
      * @param {any} [options] Listener options
      * @param {boolean} [pause] Pause listener
      * @returns {PicoDom} Current instance
      */
-    live(event, selector, cb, options = {}, pause = false)
+    live(event : any, selector : string, cb : Function, options : any = {}, pause : boolean = false) : PicoDom
     {
-        let fn = function (event) {
+        let fn = function (event : any) {
 
             let target = Dom.getNodeEvent(selector, event);
 
@@ -217,7 +230,7 @@ export class PicoDomEventInstance
 
         this.on(event, fn, options, pause, selector);
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
     /**
@@ -229,18 +242,18 @@ export class PicoDomEventInstance
      * @param {object} [detail] Event detail
      * @returns {PicoDom} Current instance
      */
-    fire(event, detail = {})
+    fire(event : string, detail : any = {}) : PicoDom
     {
         let callback = new CustomEvent(event, { detail });
 
-        this.each((el) => {
+        this.each((el : any) => {
             el.dispatchEvent(callback);
         });
 
-        return this;
+        return <PicoDom> <unknown> this;
     }
 
-    pointerdown(button = 1)
+    pointerdown(button : number = 1)
     {
         const rect = this.rect();
 
@@ -257,7 +270,7 @@ export class PicoDomEventInstance
             clientX: x, clientY: y
         });
 
-        this.each((el) => {
+        this.each((el : any) => {
             el.dispatchEvent(event);
         });
 
@@ -266,42 +279,25 @@ export class PicoDomEventInstance
 
 }
 
-/**
- * @see PicoDom.once
- */
-PicoDomEventInstance.prototype.one = function (...args) {
+// @ts-ignore
+PicoDomEvent.prototype.one = function (...args : Parameters<typeof PicoDomEvent.prototype.once>) {
     console.warn('Dom.one() is deprecated, use Dom.once() instead.');
     return this.once(...args);
 };
 
-
-PicoDomEventInstance.prototype.delayed = function () {
+// @ts-ignore
+PicoDomEvent.prototype.delayed = function () {
     console.error('Dom.delayed() is not implemented anymore.');
 };
 
-PicoDomEventInstance.prototype.pause = function () {
+// @ts-ignore
+PicoDomEvent.prototype.pause = function () {
     console.error('Dom.pause() is not implemented anymore.');
 };
 
-PicoDomEventInstance.prototype.unpause = function () {
+// @ts-ignore
+PicoDomEvent.prototype.unpause = function () {
     console.error('Dom.unpause() is not implemented anymore.');
 };
 
-/**
- * @param {typeof PicoDom} self
- * @returns {typeof PicoDom}
- */
-export const PicoDomEventPlugin = function (self) {
-
-    Obj.each(Mix.class(PicoDomEventStatic), (fn, id) => {
-        self[id] = fn;
-    });
-
-    Obj.each(Mix.proto(PicoDomEventInstance), (fn, id) => {
-        self.prototype[id] = fn;
-    });
-
-    // self.init.push(PicoDomEventInstance.constructor);
-
-    return self;
-}
+export default PicoDomEvent;