@whitesev/domutils 1.8.0 → 1.8.2

package/dist/index.amd.js

@@ -115,47 +115,7 @@ define((function () { 'use strict';
     const cache = createCache(LAST_NUMBER_WEAK_MAP);
     const generateUniqueNumber = createGenerateUniqueNumber(cache, LAST_NUMBER_WEAK_MAP);
 
-    const isMessagePort = (sender) => {
-        return typeof sender.start === 'function';
-    };
-
-    const PORT_MAP = new WeakMap();
-
-    const extendBrokerImplementation = (partialBrokerImplementation) => ({
-        ...partialBrokerImplementation,
-        connect: ({ call }) => {
-            return async () => {
-                const { port1, port2 } = new MessageChannel();
-                const portId = await call('connect', { port: port1 }, [port1]);
-                PORT_MAP.set(port2, portId);
-                return port2;
-            };
-        },
-        disconnect: ({ call }) => {
-            return async (port) => {
-                const portId = PORT_MAP.get(port);
-                if (portId === undefined) {
-                    throw new Error('The given port is not connected.');
-                }
-                await call('disconnect', { portId });
-            };
-        },
-        isSupported: ({ call }) => {
-            return () => call('isSupported');
-        }
-    });
-
-    const ONGOING_REQUESTS = new WeakMap();
-    const createOrGetOngoingRequests = (sender) => {
-        if (ONGOING_REQUESTS.has(sender)) {
-            // @todo TypeScript needs to be convinced that has() works as expected.
-            return ONGOING_REQUESTS.get(sender);
-        }
-        const ongoingRequests = new Map();
-        ONGOING_REQUESTS.set(sender, ongoingRequests);
-        return ongoingRequests;
-    };
-    const createBroker = (brokerImplementation) => {
+    const createBrokerFactory = (createOrGetOngoingRequests, extendBrokerImplementation, generateUniqueNumber, isMessagePort) => (brokerImplementation) => {
         const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
         return (sender) => {
             const ongoingRequests = createOrGetOngoingRequests(sender);
@@ -198,82 +158,116 @@ define((function () { 'use strict';
         };
     };
 
-    // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
-    const scheduledIntervalsState = new Map([[0, null]]); // tslint:disable-line no-empty
-    const scheduledTimeoutsState = new Map([[0, null]]); // tslint:disable-line no-empty
-    const wrap = createBroker({
-        clearInterval: ({ call }) => {
-            return (timerId) => {
-                if (typeof scheduledIntervalsState.get(timerId) === 'symbol') {
-                    scheduledIntervalsState.set(timerId, null);
-                    call('clear', { timerId, timerType: 'interval' }).then(() => {
-                        scheduledIntervalsState.delete(timerId);
-                    });
-                }
+    const createCreateOrGetOngoingRequests = (ongoingRequestsMap) => (sender) => {
+        if (ongoingRequestsMap.has(sender)) {
+            // @todo TypeScript needs to be convinced that has() works as expected.
+            return ongoingRequestsMap.get(sender);
+        }
+        const ongoingRequests = new Map();
+        ongoingRequestsMap.set(sender, ongoingRequests);
+        return ongoingRequests;
+    };
+
+    const createExtendBrokerImplementation = (portMap) => (partialBrokerImplementation) => ({
+        ...partialBrokerImplementation,
+        connect: ({ call }) => {
+            return async () => {
+                const { port1, port2 } = new MessageChannel();
+                const portId = await call('connect', { port: port1 }, [port1]);
+                portMap.set(port2, portId);
+                return port2;
             };
         },
-        clearTimeout: ({ call }) => {
-            return (timerId) => {
-                if (typeof scheduledTimeoutsState.get(timerId) === 'symbol') {
-                    scheduledTimeoutsState.set(timerId, null);
-                    call('clear', { timerId, timerType: 'timeout' }).then(() => {
-                        scheduledTimeoutsState.delete(timerId);
-                    });
+        disconnect: ({ call }) => {
+            return async (port) => {
+                const portId = portMap.get(port);
+                if (portId === undefined) {
+                    throw new Error('The given port is not connected.');
                 }
+                await call('disconnect', { portId });
             };
         },
-        setInterval: ({ call }) => {
-            return (func, delay = 0, ...args) => {
-                const symbol = Symbol();
-                const timerId = generateUniqueNumber(scheduledIntervalsState);
-                scheduledIntervalsState.set(timerId, symbol);
-                const schedule = () => call('set', {
-                    delay,
-                    now: performance.timeOrigin + performance.now(),
-                    timerId,
-                    timerType: 'interval'
-                }).then(() => {
-                    const state = scheduledIntervalsState.get(timerId);
-                    if (state === undefined) {
-                        throw new Error('The timer is in an undefined state.');
-                    }
-                    if (state === symbol) {
-                        func(...args);
-                        // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
-                        if (scheduledIntervalsState.get(timerId) === symbol) {
-                            schedule();
-                        }
-                    }
-                });
-                schedule();
-                return timerId;
-            };
-        },
-        setTimeout: ({ call }) => {
-            return (func, delay = 0, ...args) => {
-                const symbol = Symbol();
-                const timerId = generateUniqueNumber(scheduledTimeoutsState);
-                scheduledTimeoutsState.set(timerId, symbol);
-                call('set', {
-                    delay,
-                    now: performance.timeOrigin + performance.now(),
-                    timerId,
-                    timerType: 'timeout'
-                }).then(() => {
-                    const state = scheduledTimeoutsState.get(timerId);
-                    if (state === undefined) {
-                        throw new Error('The timer is in an undefined state.');
-                    }
-                    if (state === symbol) {
-                        // A timeout can be savely deleted because it is only called once.
-                        scheduledTimeoutsState.delete(timerId);
-                        func(...args);
-                    }
-                });
-                return timerId;
-            };
+        isSupported: ({ call }) => {
+            return () => call('isSupported');
         }
     });
+
+    const isMessagePort = (sender) => {
+        return typeof sender.start === 'function';
+    };
+
+    const createBroker = createBrokerFactory(createCreateOrGetOngoingRequests(new WeakMap()), createExtendBrokerImplementation(new WeakMap()), generateUniqueNumber, isMessagePort);
+
+    const createClearIntervalFactory = (scheduledIntervalsState) => (clear) => (timerId) => {
+        if (typeof scheduledIntervalsState.get(timerId) === 'symbol') {
+            scheduledIntervalsState.set(timerId, null);
+            clear(timerId).then(() => {
+                scheduledIntervalsState.delete(timerId);
+            });
+        }
+    };
+
+    const createClearTimeoutFactory = (scheduledTimeoutsState) => (clear) => (timerId) => {
+        if (typeof scheduledTimeoutsState.get(timerId) === 'symbol') {
+            scheduledTimeoutsState.set(timerId, null);
+            clear(timerId).then(() => {
+                scheduledTimeoutsState.delete(timerId);
+            });
+        }
+    };
+
+    const createSetIntervalFactory = (generateUniqueNumber, scheduledIntervalsState) => (set) => (func, delay = 0, ...args) => {
+        const symbol = Symbol();
+        const timerId = generateUniqueNumber(scheduledIntervalsState);
+        scheduledIntervalsState.set(timerId, symbol);
+        const schedule = () => set(delay, timerId).then(() => {
+            const state = scheduledIntervalsState.get(timerId);
+            if (state === undefined) {
+                throw new Error('The timer is in an undefined state.');
+            }
+            if (state === symbol) {
+                func(...args);
+                // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
+                if (scheduledIntervalsState.get(timerId) === symbol) {
+                    schedule();
+                }
+            }
+        });
+        schedule();
+        return timerId;
+    };
+
+    const createSetTimeoutFactory = (generateUniqueNumber, scheduledTimeoutsState) => (set) => (func, delay = 0, ...args) => {
+        const symbol = Symbol();
+        const timerId = generateUniqueNumber(scheduledTimeoutsState);
+        scheduledTimeoutsState.set(timerId, symbol);
+        set(delay, timerId).then(() => {
+            const state = scheduledTimeoutsState.get(timerId);
+            if (state === undefined) {
+                throw new Error('The timer is in an undefined state.');
+            }
+            if (state === symbol) {
+                // A timeout can be savely deleted because it is only called once.
+                scheduledTimeoutsState.delete(timerId);
+                func(...args);
+            }
+        });
+        return timerId;
+    };
+
+    // Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
+    const scheduledIntervalsState = new Map([[0, null]]); // tslint:disable-line no-empty
+    const scheduledTimeoutsState = new Map([[0, null]]); // tslint:disable-line no-empty
+    const createClearInterval = createClearIntervalFactory(scheduledIntervalsState);
+    const createClearTimeout = createClearTimeoutFactory(scheduledTimeoutsState);
+    const createSetInterval = createSetIntervalFactory(generateUniqueNumber, scheduledIntervalsState);
+    const createSetTimeout = createSetTimeoutFactory(generateUniqueNumber, scheduledTimeoutsState);
+    const wrap = createBroker({
+        clearInterval: ({ call }) => createClearInterval((timerId) => call('clear', { timerId, timerType: 'interval' })),
+        clearTimeout: ({ call }) => createClearTimeout((timerId) => call('clear', { timerId, timerType: 'timeout' })),
+        setInterval: ({ call }) => createSetInterval((delay, timerId) => call('set', { delay, now: performance.timeOrigin + performance.now(), timerId, timerType: 'interval' })),
+        setTimeout: ({ call }) => createSetTimeout((delay, timerId) => call('set', { delay, now: performance.timeOrigin + performance.now(), timerId, timerType: 'timeout' }))
+    });
     const load = (url) => {
         const worker = new Worker(url);
         return wrap(worker);
@@ -295,7 +289,7 @@ define((function () { 'use strict';
     };
 
     // This is the minified and stringified code of the worker-timers-worker package.
-    const worker = `(()=>{var e={455:function(e,t){!function(e){"use strict";var t=function(e){return function(t){var r=e(t);return t.add(r),r}},r=function(e){return function(t,r){return e.set(t,r),r}},n=void 0===Number.MAX_SAFE_INTEGER?9007199254740991:Number.MAX_SAFE_INTEGER,o=536870912,s=2*o,a=function(e,t){return function(r){var a=t.get(r),i=void 0===a?r.size:a<s?a+1:0;if(!r.has(i))return e(r,i);if(r.size<o){for(;r.has(i);)i=Math.floor(Math.random()*s);return e(r,i)}if(r.size>n)throw new Error("Congratulations, you created a collection of unique numbers which uses all available integers!");for(;r.has(i);)i=Math.floor(Math.random()*n);return e(r,i)}},i=new WeakMap,u=r(i),c=a(u,i),l=t(c);e.addUniqueNumber=l,e.generateUniqueNumber=c}(t)}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n].call(s.exports,s,s.exports,r),s.exports}(()=>{"use strict";const e=-32603,t=-32602,n=-32601,o=(e,t)=>Object.assign(new Error(e),{status:t}),s=t=>o('The handler of the method called "'.concat(t,'" returned an unexpected result.'),e),a=(t,r)=>async({data:{id:a,method:i,params:u}})=>{const c=r[i];try{if(void 0===c)throw(e=>o('The requested method called "'.concat(e,'" is not supported.'),n))(i);const r=void 0===u?c():c(u);if(void 0===r)throw(t=>o('The handler of the method called "'.concat(t,'" returned no required result.'),e))(i);const l=r instanceof Promise?await r:r;if(null===a){if(void 0!==l.result)throw s(i)}else{if(void 0===l.result)throw s(i);const{result:e,transferables:r=[]}=l;t.postMessage({id:a,result:e},r)}}catch(e){const{message:r,status:n=-32603}=e;t.postMessage({error:{code:n,message:r},id:a})}};var i=r(455);const u=new Map,c=(e,r,n)=>({...r,connect:({port:t})=>{t.start();const n=e(t,r),o=(0,i.generateUniqueNumber)(u);return u.set(o,()=>{n(),t.close(),u.delete(o)}),{result:o}},disconnect:({portId:e})=>{const r=u.get(e);if(void 0===r)throw(e=>o('The specified parameter called "portId" with the given value "'.concat(e,'" does not identify a port connected to this worker.'),t))(e);return r(),{result:null}},isSupported:async()=>{if(await new Promise(e=>{const t=new ArrayBuffer(0),{port1:r,port2:n}=new MessageChannel;r.onmessage=({data:t})=>e(null!==t),n.postMessage(t,[t])})){const e=n();return{result:e instanceof Promise?await e:e}}return{result:!1}}}),l=(e,t,r=()=>!0)=>{const n=c(l,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},d=(e,t)=>r=>{const n=t.get(r);if(void 0===n)return Promise.resolve(!1);const[o,s]=n;return e(o),t.delete(r),s(!1),Promise.resolve(!0)},f=(e,t,r,n)=>(o,s,a)=>{const i=o+s-t.timeOrigin,u=i-t.now();return new Promise(t=>{e.set(a,[r(n,u,i,e,t,a),t])})},m=new Map,h=d(globalThis.clearTimeout,m),p=new Map,v=d(globalThis.clearTimeout,p),w=((e,t)=>{const r=(n,o,s,a)=>{const i=n-e.now();i>0?o.set(a,[t(r,i,n,o,s,a),s]):(o.delete(a),s(!0))};return r})(performance,globalThis.setTimeout),g=f(m,performance,globalThis.setTimeout,w),T=f(p,performance,globalThis.setTimeout,w);l(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?h(e):v(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?g:T)(e,t,r)})})})()})();`; // tslint:disable-line:max-line-length
+    const worker = `(()=>{var e={455(e,t){!function(e){"use strict";var t=function(e){return function(t){var r=e(t);return t.add(r),r}},r=function(e){return function(t,r){return e.set(t,r),r}},n=void 0===Number.MAX_SAFE_INTEGER?9007199254740991:Number.MAX_SAFE_INTEGER,o=536870912,s=2*o,a=function(e,t){return function(r){var a=t.get(r),i=void 0===a?r.size:a<s?a+1:0;if(!r.has(i))return e(r,i);if(r.size<o){for(;r.has(i);)i=Math.floor(Math.random()*s);return e(r,i)}if(r.size>n)throw new Error("Congratulations, you created a collection of unique numbers which uses all available integers!");for(;r.has(i);)i=Math.floor(Math.random()*n);return e(r,i)}},i=new WeakMap,u=r(i),c=a(u,i),l=t(c);e.addUniqueNumber=l,e.generateUniqueNumber=c}(t)}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n].call(s.exports,s,s.exports,r),s.exports}(()=>{"use strict";const e=-32603,t=-32602,n=-32601,o=(e,t)=>Object.assign(new Error(e),{status:t}),s=t=>o('The handler of the method called "'.concat(t,'" returned an unexpected result.'),e),a=(t,r)=>async({data:{id:a,method:i,params:u}})=>{const c=r[i];try{if(void 0===c)throw(e=>o('The requested method called "'.concat(e,'" is not supported.'),n))(i);const r=void 0===u?c():c(u);if(void 0===r)throw(t=>o('The handler of the method called "'.concat(t,'" returned no required result.'),e))(i);const l=r instanceof Promise?await r:r;if(null===a){if(void 0!==l.result)throw s(i)}else{if(void 0===l.result)throw s(i);const{result:e,transferables:r=[]}=l;t.postMessage({id:a,result:e},r)}}catch(e){const{message:r,status:n=-32603}=e;t.postMessage({error:{code:n,message:r},id:a})}};var i=r(455);const u=new Map,c=(e,r,n)=>({...r,connect:({port:t})=>{t.start();const n=e(t,r),o=(0,i.generateUniqueNumber)(u);return u.set(o,()=>{n(),t.close(),u.delete(o)}),{result:o}},disconnect:({portId:e})=>{const r=u.get(e);if(void 0===r)throw(e=>o('The specified parameter called "portId" with the given value "'.concat(e,'" does not identify a port connected to this worker.'),t))(e);return r(),{result:null}},isSupported:async()=>{if(await new Promise(e=>{const t=new ArrayBuffer(0),{port1:r,port2:n}=new MessageChannel;r.onmessage=({data:t})=>e(null!==t),n.postMessage(t,[t])})){const e=n();return{result:e instanceof Promise?await e:e}}return{result:!1}}}),l=(e,t,r=()=>!0)=>{const n=c(l,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},d=(e,t)=>r=>{const n=t.get(r);if(void 0===n)return Promise.resolve(!1);const[o,s]=n;return e(o),t.delete(r),s(!1),Promise.resolve(!0)},m=(e,t,r,n)=>(o,s,a)=>{const i=o+s-t.timeOrigin,u=i-t.now();return new Promise(t=>{e.set(a,[r(n,u,i,e,t,a),t])})},f=new Map,h=d(globalThis.clearTimeout,f),p=new Map,v=d(globalThis.clearTimeout,p),w=((e,t)=>{const r=(n,o,s,a)=>{const i=n-e.now();i>0?o.set(a,[t(r,i,n,o,s,a),s]):(o.delete(a),s(!0))};return r})(performance,globalThis.setTimeout),g=m(f,performance,globalThis.setTimeout,w),T=m(p,performance,globalThis.setTimeout,w);l(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?h(e):v(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?g:T)(e,t,r)})})})()})();`; // tslint:disable-line:max-line-length
 
     const loadOrReturnBroker = createLoadOrReturnBroker(load, worker);
     const clearInterval$1 = (timerId) => loadOrReturnBroker().clearInterval(timerId);
@@ -523,7 +517,7 @@ define((function () { 'use strict';
         },
     };
 
-    const version = "1.8.0";
+    const version = "1.8.2";
 
     class ElementSelector {
         windowApi;
@@ -2617,29 +2611,42 @@ define((function () { 'use strict';
             let timer = void 0;
             /** 是否是移动端点击 */
             let isMobileTouch = false;
-            const dblclick_handler = async (evt) => {
+            /** 检测是否是单击的延迟时间 */
+            const checkClickTime = 200;
+            const dblclick_handler = async (evt, option) => {
                 if (evt.type === "dblclick" && isMobileTouch) {
                     // 禁止在移动端触发dblclick事件
                     return;
                 }
-                await handler(evt);
+                await handler(evt, option);
             };
-            const dblClickListener = this.on($el, "dblclick", dblclick_handler, options);
-            const touchEndListener = this.on($el, "touchend", selector, (evt, selectorTarget) => {
-                isMobileTouch = true;
+            const dblClickListener = this.on($el, "dblclick", (evt) => {
+                dblclick_handler(evt, {
+                    isDoubleClick: true,
+                });
+            }, options);
+            const touchEndListener = this.on($el, "pointerup", selector, (evt, selectorTarget) => {
+                if (evt.pointerType === "touch") {
+                    isMobileTouch = true;
+                }
                 CommonUtils.clearTimeout(timer);
                 timer = void 0;
                 if (isDoubleClick && $click === selectorTarget) {
                     isDoubleClick = false;
                     $click = null;
                     /* 判定为双击 */
-                    dblclick_handler(evt);
+                    dblclick_handler(evt, {
+                        isDoubleClick: true,
+                    });
                 }
                 else {
                     timer = CommonUtils.setTimeout(() => {
                         isDoubleClick = false;
                         // 判断为单击
-                    }, 200);
+                        dblclick_handler(evt, {
+                            isDoubleClick: false,
+                        });
+                    }, checkClickTime);
                     isDoubleClick = true;
                     $click = selectorTarget;
                 }