@tarojs/taro-h5 3.4.5 → 3.4.8

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')
@@ -108,7 +161,7 @@ function temporarilyNotSupport(apiName) {
 }
 function weixinCorpSupport(apiName) {
     return () => {
-        const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`;
+        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
         if (process.env.NODE_ENV !== 'production') {
             console.error(errMsg);
             return Promise.reject({
@@ -140,54 +193,38 @@ 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(apiName, defaultOptions, formatResult = res => res, formatParams = options => options) {
-    // @ts-ignore
-    if (!window.wx) {
-        return weixinCorpSupport(apiName);
-    }
-    return options => {
-        options = options || {};
-        const obj = Object.assign({}, defaultOptions, options);
-        const p = new Promise((resolve, reject) => {
-            ['fail', 'success', 'complete'].forEach(k => {
-                obj[k] = oriRes => {
-                    const res = formatResult(oriRes);
-                    options[k] && options[k](res);
-                    if (k === 'success') {
-                        resolve(res);
-                    }
-                    else if (k === 'fail') {
-                        reject(res);
-                    }
-                };
+function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
+    const notSupported = weixinCorpSupport(name);
+    return (options = {}) => {
+        var _a;
+        // @ts-ignore
+        const targetApi = (_a = window === null || window === void 0 ? void 0 : window.wx) === null || _a === void 0 ? void 0 : _a[name];
+        const opts = formatOptions(Object.assign({}, defaultOptions, options));
+        if (typeof targetApi === 'function') {
+            return new Promise((resolve, reject) => {
+                ['fail', 'success', 'complete'].forEach(k => {
+                    opts[k] = preRef => {
+                        const res = formatResult(preRef);
+                        options[k] && options[k](res);
+                        if (k === 'success') {
+                            resolve(res);
+                        }
+                        else if (k === 'fail') {
+                            reject(res);
+                        }
+                    };
+                    return targetApi(opts);
+                });
             });
-            // @ts-ignore
-            wx[apiName](formatParams(obj));
-        });
-        return p;
-    };
-}
-/**
- * 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);
+        else if (typeof standardMethod === 'function') {
+            return standardMethod(opts);
+        }
+        else {
+            return notSupported();
+        }
     };
-};
+}
 
 // 广告
 const createRewardedVideoAd = temporarilyNotSupport('createRewardedVideoAd');
@@ -849,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);
-    };
-};
 /**
  * 开始监听加速度数据。
  */
@@ -876,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 {
@@ -1193,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');
@@ -1316,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);
-    };
-};
 /**
  * 开始监听设备方向的变化。
  */
@@ -1343,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 {
@@ -1478,10 +1508,14 @@ const makePhoneCall = (options) => {
 };
 
 // 扫码
-const scanCode = processOpenApi('scanQRCode', { needResult: 1 }, res => ({
-    errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
-    result: res.resultStr
-}));
+const scanCode = processOpenApi({
+    name: 'scanQRCode',
+    defaultOptions: { needResult: 1 },
+    formatResult: res => ({
+        errMsg: res.errMsg === 'scanQRCode:ok' ? 'scanCode:ok' : res.errMsg,
+        result: res.resultStr
+    })
+});
 
 // 屏幕
 const setVisualEffectOnCapture = temporarilyNotSupport('setVisualEffectOnCapture');
@@ -1559,6 +1593,69 @@ const getApp = function () {
 // 自定义组件
 const getCurrentInstance = Taro__default["default"].getCurrentInstance;
 
+const getLocationByW3CApi = (options) => {
+    var _a;
+    // 断言 options 必须是 Object
+    const isObject = shouldBeObject(options);
+    if (!isObject.flag) {
+        const res = { errMsg: `getLocation:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    // 解构回调函数
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'getLocation', success, fail, complete });
+    // const defaultMaximumAge = 5 * 1000
+    const positionOptions = {
+        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null),
+        // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
+        timeout: options.highAccuracyExpireTime // 高精度定位超时时间
+    };
+    // Web端API实现暂时仅支持GPS坐标系
+    if (((_a = options.type) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== 'WGS84') {
+        return handle.fail({
+            errMsg: 'This coordinate system type is not temporarily supported'
+        });
+    }
+    // 判断当前浏览器是否支持位置API
+    const geolocationSupported = navigator.geolocation;
+    if (!geolocationSupported) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    // 开始获取位置
+    return new Promise((resolve, reject) => {
+        navigator.geolocation.getCurrentPosition((position) => {
+            const result = {
+                /** 位置的精确度 */
+                accuracy: position.coords.accuracy,
+                /** 高度，单位 m */
+                altitude: position.coords.altitude,
+                /** 水平精度，单位 m */
+                horizontalAccuracy: position.coords.accuracy,
+                /** 纬度，范围为 -90~90，负数表示南纬 */
+                latitude: position.coords.latitude,
+                /** 经度，范围为 -180~180，负数表示西经 */
+                longitude: position.coords.longitude,
+                /** 速度，单位 m/s */
+                speed: position.coords.speed,
+                /** 垂直精度，单位 m（Android 无法获取，返回 0） */
+                verticalAccuracy: position.coords.altitudeAccuracy || 0,
+                /** 调用结果,自动补充 */
+                errMsg: ''
+            };
+            handle.success(result, resolve);
+        }, (error) => {
+            handle.fail({ errMsg: error.message }, reject);
+        }, positionOptions);
+    });
+};
+const getLocation = processOpenApi({
+    name: 'getLocation',
+    standardMethod: getLocationByW3CApi
+});
+
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -1694,12 +1791,14 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
 const stopLocationUpdate = temporarilyNotSupport('stopLocationUpdate');
 const startLocationUpdateBackground = temporarilyNotSupport('startLocationUpdateBackground');
 const startLocationUpdate = temporarilyNotSupport('startLocationUpdate');
-const openLocation = processOpenApi('openLocation', { scale: 18 });
+const openLocation = processOpenApi({
+    name: 'openLocation',
+    defaultOptions: { scale: 18 }
+});
 const onLocationChangeError = temporarilyNotSupport('onLocationChangeError');
 const onLocationChange = temporarilyNotSupport('onLocationChange');
 const offLocationChangeError = temporarilyNotSupport('offLocationChangeError');
 const offLocationChange = temporarilyNotSupport('offLocationChange');
-const getLocation = processOpenApi('getLocation');
 const choosePoi = temporarilyNotSupport('choosePoi');
 
 class InnerAudioContext {