@tarojs/taro-h5 3.6.24 → 3.6.26-alpha.1

package/dist/index.cjs.js

@@ -113,6 +113,10 @@ class CallbackManager {
                 }
             });
         };
+        /** 清空所有回调 */
+        this.clear = () => {
+            this.callbacks = [];
+        };
     }
 }
 
@@ -163,7 +167,7 @@ function findDOM(inst) {
     }
     const page = runtime.Current.page;
     const path = page === null || page === void 0 ? void 0 : page.path;
-    const msg = '没有找到已经加载了的页面，请在页面加载完成后时候此 API。';
+    const msg = '没有找到已经加载了的页面，请在页面加载完成后使用此 API。';
     if (path == null) {
         throw new Error(msg);
     }
@@ -2784,6 +2788,8 @@ const getApp = function () {
 // 自定义组件
 const getCurrentInstance = Taro.getCurrentInstance;
 
+const isGeolocationSupported = () => !!navigator.geolocation;
+
 const getLocationByW3CApi = (options) => {
     var _a;
     // 断言 options 必须是 Object
@@ -2809,8 +2815,7 @@ const getLocationByW3CApi = (options) => {
         });
     }
     // 判断当前浏览器是否支持位置API
-    const geolocationSupported = navigator.geolocation;
-    if (!geolocationSupported) {
+    if (!isGeolocationSupported()) {
         return handle.fail({
             errMsg: 'The current browser does not support this feature'
         });
@@ -2976,18 +2981,135 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
     });
 };
 
-// 位置
-const stopLocationUpdate = /* @__PURE__ */ temporarilyNotSupport('stopLocationUpdate');
+const _successCbManager = new CallbackManager();
+const _errorCbManager = new CallbackManager();
+let _watchID = -1;
+function onLocationChange(callback) {
+    _successCbManager.add(callback);
+}
+function offLocationChange(callback) {
+    if (callback && typeof callback === 'function') {
+        _successCbManager.remove(callback);
+    }
+    else if (callback === undefined) {
+        _successCbManager.clear();
+    }
+    else {
+        console.warn('offLocationChange failed');
+    }
+}
+function onLocationChangeError(callback) {
+    _errorCbManager.add(callback);
+}
+function offLocationChangeError(callback) {
+    if (callback && typeof callback === 'function') {
+        _errorCbManager.remove(callback);
+    }
+    else if (callback === undefined) {
+        _errorCbManager.clear();
+    }
+    else {
+        console.warn('offLocationChangeError failed');
+    }
+}
+/**
+ * 开始监听位置信息
+ * @param opts
+ * @returns
+ */
+function startLocationUpdateByW3CApi(opts) {
+    // 断言 options 必须是 Object
+    const isObject = shouldBeObject(opts);
+    if (!isObject.flag) {
+        const res = { errMsg: `startLocationUpdate:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    const { success, fail, complete } = opts;
+    const handle = new MethodHandler({ name: 'startLocationUpdate', success, fail, complete });
+    // 判断当前浏览器是否支持位置API
+    if (!isGeolocationSupported()) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    try {
+        if (_watchID > -1) {
+            console.error('startLocationUpdate:fail');
+            return handle.fail();
+        }
+        else {
+            _watchID = navigator.geolocation.watchPosition(({ coords }) => {
+                const { latitude, longitude, altitude, accuracy, speed } = coords;
+                _successCbManager.trigger({
+                    accuracy,
+                    altitude,
+                    horizontalAccuracy: 0,
+                    verticalAccuracy: 0,
+                    latitude,
+                    longitude,
+                    speed,
+                });
+            }, err => {
+                _errorCbManager.trigger({
+                    errMsg: 'Watch Position error',
+                    err
+                });
+            }, {
+                timeout: 10,
+                maximumAge: 0,
+                enableHighAccuracy: true,
+            });
+            return handle.success();
+        }
+    }
+    catch (error) {
+        return handle.fail();
+    }
+}
+/**
+ * 停止监听位置信息
+ * @param opts
+ * @returns
+ */
+function stopLocationUpdateByW3CApi(opts) {
+    const isObject = shouldBeObject(opts);
+    if (!isObject.flag) {
+        const res = { errMsg: `stopLocationUpdate:fail ${isObject.msg}` };
+        console.error(res.errMsg);
+        return Promise.reject(res);
+    }
+    const { success, fail, complete } = opts;
+    const handle = new MethodHandler({ name: 'stopLocationUpdate', success, fail, complete });
+    // 判断当前浏览器是否支持位置API
+    if (!isGeolocationSupported()) {
+        return handle.fail({
+            errMsg: 'The current browser does not support this feature'
+        });
+    }
+    try {
+        navigator.geolocation.clearWatch(_watchID);
+        _watchID = -1;
+        return handle.success();
+    }
+    catch (error) {
+        return handle.fail();
+    }
+}
+const stopLocationUpdate = /* @__PURE__ */ processOpenApi({
+    name: 'stopLocationUpdate',
+    standardMethod: stopLocationUpdateByW3CApi
+});
+const startLocationUpdate = /* @__PURE__ */ processOpenApi({
+    name: 'startLocationUpdate',
+    standardMethod: startLocationUpdateByW3CApi
+});
+
 const startLocationUpdateBackground = /* @__PURE__ */ temporarilyNotSupport('startLocationUpdateBackground');
-const startLocationUpdate = /* @__PURE__ */ temporarilyNotSupport('startLocationUpdate');
 const openLocation = /* @__PURE__ */ processOpenApi({
     name: 'openLocation',
     defaultOptions: { scale: 18 }
 });
-const onLocationChangeError = /* @__PURE__ */ temporarilyNotSupport('onLocationChangeError');
-const onLocationChange = /* @__PURE__ */ temporarilyNotSupport('onLocationChange');
-const offLocationChangeError = /* @__PURE__ */ temporarilyNotSupport('offLocationChangeError');
-const offLocationChange = /* @__PURE__ */ temporarilyNotSupport('offLocationChange');
 const choosePoi = /* @__PURE__ */ temporarilyNotSupport('choosePoi');
 const getFuzzyLocation = /* @__PURE__ */ temporarilyNotSupport('getFuzzyLocation');
 
@@ -3740,7 +3862,15 @@ const loadFontFace = (options) => tslib.__awaiter(void 0, void 0, void 0, functi
 const getMenuButtonBoundingClientRect = /* @__PURE__ */ temporarilyNotSupport('getMenuButtonBoundingClientRect');
 
 // 导航栏
-const showNavigationBarLoading = /* @__PURE__ */ temporarilyNotSupport('showNavigationBarLoading');
+/**
+ * 展示导航栏 loading 状态
+*/
+function showNavigationBarLoading(options = {}) {
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'showNavigationBarLoading', success, fail, complete });
+    router.setNavigationBarLoading(true);
+    return handle.success();
+}
 function setNavigationBarTitle(options) {
     // options must be an Object
     const isObject = shouldBeObject(options);
@@ -3776,7 +3906,15 @@ const setNavigationBarColor = (options) => {
     router.setNavigationBarStyle({ frontColor, backgroundColor });
     return handle.success();
 };
-const hideNavigationBarLoading = /* @__PURE__ */ temporarilyNotSupport('hideNavigationBarLoading');
+/**
+ * 隐藏导航栏 loading 状态
+*/
+function hideNavigationBarLoading(options = {}) {
+    const { success, fail, complete } = options;
+    const handle = new MethodHandler({ name: 'hideNavigationBarLoading', success, fail, complete });
+    router.setNavigationBarLoading(false);
+    return handle.success();
+}
 const hideHomeButton = /* @__PURE__ */ temporarilyNotSupport('hideHomeButton');
 
 /**