@tarojs/taro-h5 4.0.0-alpha.2 → 4.0.0-alpha.21

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);
     }
@@ -508,7 +512,7 @@ const getSystemInfoSync = () => {
     return info;
 };
 /** 获取系统信息 */
-const getSystemInfoAsync = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getSystemInfoAsync = (...args_1) => tslib.__awaiter(void 0, [...args_1], void 0, function* (options = {}) {
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'getSystemInfoAsync', success, fail, complete });
     try {
@@ -522,7 +526,7 @@ const getSystemInfoAsync = (options = {}) => tslib.__awaiter(void 0, void 0, voi
     }
 });
 /** 获取系统信息 */
-const getSystemInfo = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getSystemInfo = (...args_2) => tslib.__awaiter(void 0, [...args_2], void 0, function* (options = {}) {
     const { success, fail, complete } = options;
     const handle = new MethodHandler({ name: 'getSystemInfo', success, fail, complete });
     try {
@@ -700,7 +704,7 @@ const env = {
     TARO_VERSION: process.env.TARO_VERSION,
 };
 // Note: 该方法由 taro-plugin-platform-h5 实现
-
+// export const canIUse = /* @__PURE__ */ temporarilyNotSupport('canIUse')
 function arrayBufferToBase64(arrayBuffer) {
     return base64Js.fromByteArray(arrayBuffer);
 }
@@ -1114,7 +1118,7 @@ const checkIsOpenAccessibility = /* @__PURE__ */ temporarilyNotSupport('checkIsO
 // 电量
 // Note: 浏览器标准下不支持，其他实现方案不准确，不建议开发者使用
 const getBatteryInfoSync = /* @__PURE__ */ permanentlyNotSupport('getBatteryInfoSync');
-const getBatteryInfo = ({ success, fail, complete } = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getBatteryInfo = (...args_1) => tslib.__awaiter(void 0, [...args_1], void 0, function* ({ success, fail, complete } = {}) {
     var _a;
     const handle = new MethodHandler({ name: 'getBatteryInfo', success, fail, complete });
     try {
@@ -2171,7 +2175,7 @@ const hideLoading = ({ noConflict = false, success, fail, complete } = {}) => {
     toast.hide(0, noConflict ? 'loading' : '');
     return handle.success();
 };
-const showModal = (options = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const showModal = (...args_1) => tslib.__awaiter(void 0, [...args_1], void 0, function* (options = {}) {
     init(document);
     options = Object.assign({
         title: '',
@@ -2265,7 +2269,7 @@ function hideModal() {
         return;
     modal.hide();
 }
-const showActionSheet = (options = { itemList: [] }, methodName = 'showActionSheet') => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const showActionSheet = (...args_2) => tslib.__awaiter(void 0, [...args_2], void 0, function* (options = { itemList: [] }, methodName = 'showActionSheet') {
     init(document);
     options = Object.assign({
         itemColor: '#000000',
@@ -2355,7 +2359,7 @@ document.addEventListener('copy', () => {
 /**
  * 设置系统剪贴板的内容
  */
-const setClipboardData = ({ data, success, fail, complete }) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const setClipboardData = (_a) => tslib.__awaiter(void 0, [_a], void 0, function* ({ data, success, fail, complete }) {
     const handle = new MethodHandler({ name: 'setClipboardData', success, fail, complete });
     try {
         setStorageSync(CLIPBOARD_STORAGE_NAME, data);
@@ -2394,7 +2398,7 @@ const setClipboardData = ({ data, success, fail, complete }) => tslib.__awaiter(
 /**
  * 获取系统剪贴板的内容
  */
-const getClipboardData = ({ success, fail, complete } = {}) => tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getClipboardData = (...args_1) => tslib.__awaiter(void 0, [...args_1], void 0, function* ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'getClipboardData', success, fail, complete });
     try {
         const data = getStorageSync(CLIPBOARD_STORAGE_NAME);
@@ -2784,6 +2788,8 @@ const getApp = function () {
 // 自定义组件
 const getCurrentInstance = Taro.getCurrentInstance;
 
+const isGeolocationSupported = () => !!navigator.geolocation;
+
 const getLocationByW3CApi = (options) => {
     var _a;
     // 断言 options 必须是 Object
@@ -2798,7 +2804,7 @@ const getLocationByW3CApi = (options) => {
     const handle = new MethodHandler({ name: 'getLocation', success, fail, complete });
     // const defaultMaximumAge = 5 * 1000
     const positionOptions = {
-        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null),
+        enableHighAccuracy: options.isHighAccuracy || (options.altitude != null), // 海拔定位需要高精度
         // maximumAge: defaultMaximumAge, // 允许取多久以内的缓存位置
         timeout: options.highAccuracyExpireTime // 高精度定位超时时间
     };
@@ -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');
 
 /**
@@ -4203,9 +4341,9 @@ const checkIsPictureInPictureActive = /* @__PURE__ */ temporarilyNotSupport('che
 /**
  * 拍摄或从手机相册中选择图片或视频。
  */
-const chooseMedia = function (options, methodName = 'chooseMedia') {
-    var _a;
-    return tslib.__awaiter(this, void 0, void 0, function* () {
+const chooseMedia = function (options_1) {
+    return tslib.__awaiter(this, arguments, void 0, function* (options, methodName = 'chooseMedia') {
+        var _a;
         // options must be an Object
         const isObject = shouldBeObject(options);
         if (!isObject.flag) {
@@ -4646,10 +4784,10 @@ const openBusinessView = /* @__PURE__ */ temporarilyNotSupport('openBusinessView
  */
 const NETWORK_TIMEOUT = 60000;
 const XHR_STATS = {
-    UNSENT: 0,
-    OPENED: 1,
-    HEADERS_RECEIVED: 2,
-    LOADING: 3,
+    UNSENT: 0, // Client has been created. open() not called yet.
+    OPENED: 1, // open() has been called.
+    HEADERS_RECEIVED: 2, // send() has been called, and headers and status are available.
+    LOADING: 3, // Downloading; responseText holds partial data.
     DONE: 4 // The operation is complete.
 };
 /**
@@ -5927,9 +6065,9 @@ const pxTransform = function (size = 0) {
     const config = getConfig.call(this);
     const baseFontSize = config.baseFontSize || defaultBaseFontSize;
     const deviceRatio = config.deviceRatio || defaultDesignRatio;
-    const designWidth = (((input = 0) => shared.isFunction(config.designWidth)
+    const designWidth = ((input = 0) => shared.isFunction(config.designWidth)
         ? config.designWidth(input)
-        : config.designWidth))(size);
+        : config.designWidth)(size);
     if (!(designWidth in config.deviceRatio)) {
         throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置！`);
     }