@tarojs/taro-h5 3.4.7 → 3.4.10

package/dist/api/device/accelerometer.js

@@ -1,3 +1,4 @@
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let devicemotionListener;
@@ -30,22 +31,6 @@ const INTERVAL_MAP = {
         frequency: 5
     }
 };
-const getDevicemotionListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            x: evt.acceleration.x || 0,
-            y: evt.acceleration.y || 0,
-            z: evt.acceleration.z || 0
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听加速度数据。
  */
@@ -57,7 +42,14 @@ export const startAccelerometer = ({ interval = 'normal', success, fail, complet
             if (devicemotionListener) {
                 stopAccelerometer();
             }
-            devicemotionListener = getDevicemotionListener(intervalObj.interval);
+            devicemotionListener = throttle((evt) => {
+                var _a, _b, _c;
+                callbackManager.trigger({
+                    x: ((_a = evt.acceleration) === null || _a === void 0 ? void 0 : _a.x) || 0,
+                    y: ((_b = evt.acceleration) === null || _b === void 0 ? void 0 : _b.y) || 0,
+                    z: ((_c = evt.acceleration) === null || _c === void 0 ? void 0 : _c.z) || 0
+                });
+            }, intervalObj.interval);
             window.addEventListener('devicemotion', devicemotionListener, true);
         }
         else {

package/dist/api/device/compass.js

@@ -1,45 +1,59 @@
+import { getDeviceInfo } from '../base/system';
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let compassListener;
+/**
+ * Note: 按系统类型获取对应绝对 orientation 事件名，因为安卓系统中直接监听 deviceorientation 事件得到的不是绝对 orientation
+ */
+const deviceorientationEventName = ['absolutedeviceorientation', 'deviceorientationabsolute', 'deviceorientation'].find(item => {
+    if ('on' + item in window) {
+        return item;
+    }
+}) || '';
 /**
  * 停止监听罗盘数据
  */
 export const stopCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'stopCompass', success, fail, complete });
     try {
-        window.removeEventListener('deviceorientation', compassListener, true);
+        window.removeEventListener(deviceorientationEventName, compassListener, true);
         return handle.success();
     }
     catch (e) {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            direction: 360 - evt.alpha
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
+let CompassChangeTrigger = false;
 /**
  * 开始监听罗盘数据
  */
 export const startCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'startCompass', success, fail, complete });
     try {
-        if (window.DeviceOrientationEvent) {
+        if (deviceorientationEventName !== '') {
             if (compassListener) {
                 stopCompass();
             }
-            compassListener = getDeviceOrientationListener(200);
-            window.addEventListener('deviceorientation', compassListener, true);
+            compassListener = throttle((evt) => {
+                const isAndroid = getDeviceInfo().system === 'AndroidOS';
+                if (isAndroid && !evt.absolute && !CompassChangeTrigger) {
+                    CompassChangeTrigger = true;
+                    console.warn('Warning: In \'onCompassChange\', your browser is not supported to get the orientation relative to the earth, the orientation data will be related to the initial orientation of the device .');
+                }
+                const alpha = evt.alpha || 0;
+                /**
+                 * 由于平台差异，accuracy 在 iOS/Android 的值不同。
+                 * - iOS：accuracy 是一个 number 类型的值，表示相对于磁北极的偏差。0 表示设备指向磁北，90 表示指向东，180 表示指向南，依此类推。
+                 * - Android：accuracy 是一个 string 类型的枚举值。
+                 */
+                const accuracy = isAndroid ? evt.absolute ? 'high' : 'medium' : alpha;
+                callbackManager.trigger({
+                    direction: 360 - alpha,
+                    accuracy: accuracy
+                });
+            }, 5000);
+            window.addEventListener(deviceorientationEventName, compassListener, true);
         }
         else {
             throw new Error('compass is not supported');

package/dist/api/device/motion.js

@@ -1,3 +1,4 @@
+import { throttle } from '../utils';
 import { CallbackManager, MethodHandler } from '../utils/handler';
 const callbackManager = new CallbackManager();
 let deviceMotionListener;
@@ -28,22 +29,6 @@ export const stopDeviceMotionListening = ({ success, fail, complete } = {}) => {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager.trigger({
-            alpha: evt.alpha,
-            beta: evt.beta,
-            gamma: evt.gamma
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听设备方向的变化。
  */
@@ -55,7 +40,13 @@ export const startDeviceMotionListening = ({ interval = 'normal', success, fail,
             if (deviceMotionListener) {
                 stopDeviceMotionListening();
             }
-            deviceMotionListener = getDeviceOrientationListener(intervalObj.interval);
+            deviceMotionListener = throttle((evt) => {
+                callbackManager.trigger({
+                    alpha: evt.alpha,
+                    beta: evt.beta,
+                    gamma: evt.gamma
+                });
+            }, intervalObj.interval);
             window.addEventListener('deviceorientation', deviceMotionListener, true);
         }
         else {

package/dist/api/utils/animation.js

@@ -0,0 +1,14 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export const easeInOut = (t) => (t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1);
+export const getTimingFunc = (easeFunc, frameCnt) => {
+    return x => {
+        if (frameCnt <= 1) {
+            return easeFunc(1);
+        }
+        const t = x / (frameCnt - 1);
+        return easeFunc(t);
+    };
+};

package/dist/api/utils/index.js

@@ -122,13 +122,6 @@ export function permanentlyNotSupport(apiName) {
         }
     };
 }
-export function isFunction(obj) {
-    return typeof obj === 'function';
-}
-const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
-export const isValidColor = (color) => {
-    return VALID_COLOR_REG.test(color);
-};
 export function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
     const notSupported = weixinCorpSupport(name);
     return (options = {}) => {
@@ -161,17 +154,6 @@ export function processOpenApi({ name, defaultOptions, standardMethod, formatOpt
         }
     };
 }
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export const easeInOut = (t) => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
-export const getTimingFunc = (easeFunc, frameCnt) => {
-    return x => {
-        if (frameCnt <= 1) {
-            return easeFunc(1);
-        }
-        const t = x / (frameCnt - 1);
-        return easeFunc(t);
-    };
-};
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/api/utils/lodash.js

@@ -0,0 +1,29 @@
+export function throttle(fn, threshold = 250, scope) {
+    let lastTime = 0;
+    let deferTimer;
+    return function (...args) {
+        const context = scope || this;
+        const now = Date.now();
+        if (now - lastTime > threshold) {
+            fn.apply(this, args);
+            lastTime = now;
+        }
+        else {
+            clearTimeout(deferTimer);
+            deferTimer = setTimeout(() => {
+                lastTime = now;
+                fn.apply(context, args);
+            }, threshold);
+        }
+    };
+}
+export function debounce(fn, ms = 250, scope) {
+    let timer;
+    return function (...args) {
+        const context = scope || this;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, ms);
+    };
+}

package/dist/api/utils/valid.js

@@ -0,0 +1,7 @@
+export function isFunction(obj) {
+    return typeof obj === 'function';
+}
+const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
+export const isValidColor = (color) => {
+    return VALID_COLOR_REG.test(color);
+};

package/dist/dist/api/utils/animation.d.ts

@@ -0,0 +1,6 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export declare const easeInOut: (t: number) => number;
+export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;

package/dist/dist/api/utils/index.d.ts

@@ -26,8 +26,6 @@ export declare function weixinCorpSupport(apiName: any): () => Promise<{
 export declare function permanentlyNotSupport(apiName: any): () => Promise<{
     errMsg: string;
 }>;
-export declare function isFunction(obj: any): boolean;
-export declare const isValidColor: (color: any) => boolean;
 interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> {
     name: string;
     defaultOptions?: TOptions;
@@ -36,10 +34,6 @@ interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends Ta
     formatResult?: (res: TResult) => TResult;
 }
 export declare function processOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any>({ name, defaultOptions, standardMethod, formatOptions, formatResult }: IProcessOpenApi<TOptions, TResult>): (options?: Partial<TOptions>) => Promise<TResult>;
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export declare const easeInOut: (t: number) => number;
-export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;
-export {};
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/dist/api/utils/lodash.d.ts

@@ -0,0 +1,2 @@
+export declare function throttle(fn: any, threshold?: number, scope?: any): (...args: any[]) => void;
+export declare function debounce(fn: any, ms?: number, scope?: any): (...args: any[]) => void;

package/dist/dist/api/utils/valid.d.ts

@@ -0,0 +1,2 @@
+export declare function isFunction(obj: any): boolean;
+export declare const isValidColor: (color: any) => boolean;

package/dist/index.cjs.js

@@ -17,6 +17,59 @@ var Taro__default = /*#__PURE__*/_interopDefaultLegacy(Taro);
 var MobileDetect__default = /*#__PURE__*/_interopDefaultLegacy(MobileDetect);
 var jsonpRetry__default = /*#__PURE__*/_interopDefaultLegacy(jsonpRetry);
 
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+const easeInOut = (t) => (t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1);
+const getTimingFunc = (easeFunc, frameCnt) => {
+    return x => {
+        if (frameCnt <= 1) {
+            return easeFunc(1);
+        }
+        const t = x / (frameCnt - 1);
+        return easeFunc(t);
+    };
+};
+
+function throttle(fn, threshold = 250, scope) {
+    let lastTime = 0;
+    let deferTimer;
+    return function (...args) {
+        const context = scope || this;
+        const now = Date.now();
+        if (now - lastTime > threshold) {
+            fn.apply(this, args);
+            lastTime = now;
+        }
+        else {
+            clearTimeout(deferTimer);
+            deferTimer = setTimeout(() => {
+                lastTime = now;
+                fn.apply(context, args);
+            }, threshold);
+        }
+    };
+}
+function debounce(fn, ms = 250, scope) {
+    let timer;
+    return function (...args) {
+        const context = scope || this;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, ms);
+    };
+}
+
+function isFunction(obj) {
+    return typeof obj === 'function';
+}
+const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
+const isValidColor = (color) => {
+    return VALID_COLOR_REG.test(color);
+};
+
 /* eslint-disable prefer-promise-reject-errors */
 function shouldBeObject(target) {
     if (target && typeof target === 'object')
@@ -140,13 +193,6 @@ function permanentlyNotSupport(apiName) {
         }
     };
 }
-function isFunction(obj) {
-    return typeof obj === 'function';
-}
-const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
-const isValidColor = (color) => {
-    return VALID_COLOR_REG.test(color);
-};
 function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
     const notSupported = weixinCorpSupport(name);
     return (options = {}) => {
@@ -179,20 +225,6 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
         }
     };
 }
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-const easeInOut = (t) => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
-const getTimingFunc = (easeFunc, frameCnt) => {
-    return x => {
-        if (frameCnt <= 1) {
-            return easeFunc(1);
-        }
-        const t = x / (frameCnt - 1);
-        return easeFunc(t);
-    };
-};
 
 // 广告
 const createRewardedVideoAd = temporarilyNotSupport('createRewardedVideoAd');
@@ -854,22 +886,6 @@ const INTERVAL_MAP$1 = {
         frequency: 5
     }
 };
-const getDevicemotionListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager$3.trigger({
-            x: evt.acceleration.x || 0,
-            y: evt.acceleration.y || 0,
-            z: evt.acceleration.z || 0
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听加速度数据。
  */
@@ -881,7 +897,14 @@ const startAccelerometer = ({ interval = 'normal', success, fail, complete } = {
             if (devicemotionListener) {
                 stopAccelerometer();
             }
-            devicemotionListener = getDevicemotionListener(intervalObj.interval);
+            devicemotionListener = throttle((evt) => {
+                var _a, _b, _c;
+                callbackManager$3.trigger({
+                    x: ((_a = evt.acceleration) === null || _a === void 0 ? void 0 : _a.x) || 0,
+                    y: ((_b = evt.acceleration) === null || _b === void 0 ? void 0 : _b.y) || 0,
+                    z: ((_c = evt.acceleration) === null || _c === void 0 ? void 0 : _c.z) || 0
+                });
+            }, intervalObj.interval);
             window.addEventListener('devicemotion', devicemotionListener, true);
         }
         else {
@@ -1198,45 +1221,57 @@ const getClipboardData = async ({ success, fail, complete } = {}) => {
 
 const callbackManager$2 = new CallbackManager();
 let compassListener;
+/**
+ * Note: 按系统类型获取对应绝对 orientation 事件名，因为安卓系统中直接监听 deviceorientation 事件得到的不是绝对 orientation
+ */
+const deviceorientationEventName = ['absolutedeviceorientation', 'deviceorientationabsolute', 'deviceorientation'].find(item => {
+    if ('on' + item in window) {
+        return item;
+    }
+}) || '';
 /**
  * 停止监听罗盘数据
  */
 const stopCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'stopCompass', success, fail, complete });
     try {
-        window.removeEventListener('deviceorientation', compassListener, true);
+        window.removeEventListener(deviceorientationEventName, compassListener, true);
         return handle.success();
     }
     catch (e) {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener$1 = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager$2.trigger({
-            direction: 360 - evt.alpha
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
+let CompassChangeTrigger = false;
 /**
  * 开始监听罗盘数据
  */
 const startCompass = ({ success, fail, complete } = {}) => {
     const handle = new MethodHandler({ name: 'startCompass', success, fail, complete });
     try {
-        if (window.DeviceOrientationEvent) {
+        if (deviceorientationEventName !== '') {
             if (compassListener) {
                 stopCompass();
             }
-            compassListener = getDeviceOrientationListener$1(200);
-            window.addEventListener('deviceorientation', compassListener, true);
+            compassListener = throttle((evt) => {
+                const isAndroid = getDeviceInfo().system === 'AndroidOS';
+                if (isAndroid && !evt.absolute && !CompassChangeTrigger) {
+                    CompassChangeTrigger = true;
+                    console.warn('Warning: In \'onCompassChange\', your browser is not supported to get the orientation relative to the earth, the orientation data will be related to the initial orientation of the device .');
+                }
+                const alpha = evt.alpha || 0;
+                /**
+                 * 由于平台差异，accuracy 在 iOS/Android 的值不同。
+                 * - iOS：accuracy 是一个 number 类型的值，表示相对于磁北极的偏差。0 表示设备指向磁北，90 表示指向东，180 表示指向南，依此类推。
+                 * - Android：accuracy 是一个 string 类型的枚举值。
+                 */
+                const accuracy = isAndroid ? evt.absolute ? 'high' : 'medium' : alpha;
+                callbackManager$2.trigger({
+                    direction: 360 - alpha,
+                    accuracy: accuracy
+                });
+            }, 5000);
+            window.addEventListener(deviceorientationEventName, compassListener, true);
         }
         else {
             throw new Error('compass is not supported');
@@ -1321,22 +1356,6 @@ const stopDeviceMotionListening = ({ success, fail, complete } = {}) => {
         return handle.fail({ errMsg: e.message });
     }
 };
-const getDeviceOrientationListener = interval => {
-    let lock;
-    let timer;
-    return evt => {
-        if (lock)
-            return;
-        lock = true;
-        timer && clearTimeout(timer);
-        callbackManager$1.trigger({
-            alpha: evt.alpha,
-            beta: evt.beta,
-            gamma: evt.gamma
-        });
-        timer = setTimeout(() => { lock = false; }, interval);
-    };
-};
 /**
  * 开始监听设备方向的变化。
  */
@@ -1348,7 +1367,13 @@ const startDeviceMotionListening = ({ interval = 'normal', success, fail, comple
             if (deviceMotionListener) {
                 stopDeviceMotionListening();
             }
-            deviceMotionListener = getDeviceOrientationListener(intervalObj.interval);
+            deviceMotionListener = throttle((evt) => {
+                callbackManager$1.trigger({
+                    alpha: evt.alpha,
+                    beta: evt.beta,
+                    gamma: evt.gamma
+                });
+            }, intervalObj.interval);
             window.addEventListener('deviceorientation', deviceMotionListener, true);
         }
         else {