@tarojs/taro-h5 3.5.10 → 3.6.0-beta.0

package/dist/index.esm.d.ts

@@ -551,7 +551,7 @@ declare function onSocketOpen(): void;
 declare function onSocketMessage(): void;
 declare function onSocketError(): void;
 declare function onSocketClose(): void;
-declare function connectSocket(options: any): Promise<unknown>;
+declare function connectSocket(options?: Taro.connectSocket.Option): Promise<unknown>;
 declare function closeSocket(): void;
 // 帐号信息
 declare const getAccountInfoSync: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
@@ -686,7 +686,7 @@ declare const disableAlertBeforeUnload: (option?: {}, ...args: any[]) => Promise
 declare const getMenuButtonBoundingClientRect: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 // 导航栏
 declare const showNavigationBarLoading: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
-declare function setNavigationBarTitle(options: any): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
+declare function setNavigationBarTitle(options?: Taro.setNavigationBarTitle.Option): Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
 /**
  * 设置页面导航条颜色
  */

package/dist/index.esm.js

@@ -1,6 +1,8 @@
 import Taro from '@tarojs/api';
 import { history, navigateBack, navigateTo, reLaunch, redirectTo, getCurrentPages, switchTab } from '@tarojs/router';
 export { getCurrentPages, history, navigateBack, navigateTo, reLaunch, redirectTo, switchTab } from '@tarojs/router';
+import { isFunction } from '@tarojs/shared';
+import { addLeadingSlash, stripBasename, getHomePage } from '@tarojs/router/dist/utils';
 import { hooks, Current as Current$1 } from '@tarojs/runtime';
 import { fromByteArray, toByteArray } from 'base64-js';
 import { getMobileDetect, setTitle } from '@tarojs/router/dist/utils/navigate';
@@ -10,30 +12,38 @@ import jsonpRetry from 'jsonp-retry';
 
 class MethodHandler {
     constructor({ name, success, fail, complete }) {
+        this.isHandlerError = false;
         this.methodName = name;
         this.__success = success;
         this.__fail = fail;
         this.__complete = complete;
+        this.isHandlerError = isFunction(this.__complete) || isFunction(this.__fail);
     }
-    success(res = {}, resolve = Promise.resolve.bind(Promise)) {
+    success(res = {}, promise = {}) {
         if (!res.errMsg) {
             res.errMsg = `${this.methodName}:ok`;
         }
-        typeof this.__success === 'function' && this.__success(res);
-        typeof this.__complete === 'function' && this.__complete(res);
+        isFunction(this.__success) && this.__success(res);
+        isFunction(this.__complete) && this.__complete(res);
+        const { resolve = Promise.resolve.bind(Promise) } = promise;
         return resolve(res);
     }
-    fail(res = {}, reject = Promise.reject.bind(Promise)) {
+    fail(res = {}, promise = {}) {
         if (!res.errMsg) {
             res.errMsg = `${this.methodName}:fail`;
         }
         else {
             res.errMsg = `${this.methodName}:fail ${res.errMsg}`;
         }
-        console.error(res.errMsg);
-        typeof this.__fail === 'function' && this.__fail(res);
-        typeof this.__complete === 'function' && this.__complete(res);
-        return reject(res);
+        if (!isProd) {
+            console.error(res.errMsg);
+        }
+        isFunction(this.__fail) && this.__fail(res);
+        isFunction(this.__complete) && this.__complete(res);
+        const { resolve = Promise.resolve.bind(Promise), reject = Promise.reject.bind(Promise) } = promise;
+        return this.isHandlerError
+            ? resolve(res)
+            : reject(res);
     }
 }
 class CallbackManager {
@@ -77,12 +87,12 @@ class CallbackManager {
          */
         this.trigger = (...args) => {
             this.callbacks.forEach(opt => {
-                if (typeof opt === 'function') {
+                if (isFunction(opt)) {
                     opt(...args);
                 }
                 else {
                     const { callback, ctx } = opt;
-                    typeof callback === 'function' && callback.call(ctx, ...args);
+                    isFunction(callback) && callback.call(ctx, ...args);
                 }
             });
         };
@@ -134,9 +144,6 @@ function debounce(fn, ms = 250, scope) {
     };
 }
 
-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);
@@ -278,7 +285,7 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
         // @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') {
+        if (isFunction(targetApi)) {
             return new Promise((resolve, reject) => {
                 ['fail', 'success', 'complete'].forEach(k => {
                     opts[k] = preRef => {
@@ -295,7 +302,7 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
                 });
             });
         }
-        else if (typeof standardMethod === 'function') {
+        else if (isFunction(standardMethod)) {
             return standardMethod(opts);
         }
         else {
@@ -303,6 +310,30 @@ function processOpenApi({ name, defaultOptions, standardMethod, formatOptions =
         }
     };
 }
+/**
+ * 根据url获取应用的启动页面
+ * @returns
+ */
+function getLaunchPage() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const appConfig = window.__taroAppConfig || {};
+    // createPageConfig时根据stack的长度来设置stamp以保证页面path的唯一，此函数是在createPageConfig之前调用，预先设置stamp=1
+    const stamp = '?stamp=1';
+    let entryPath = '';
+    if (((_a = appConfig.router) === null || _a === void 0 ? void 0 : _a.mode) === 'browser' || ((_b = appConfig.router) === null || _b === void 0 ? void 0 : _b.mode) === 'multi') {
+        entryPath = location.pathname;
+    }
+    else {
+        entryPath = location.hash.slice(1).split('?')[0];
+    }
+    const routePath = addLeadingSlash(stripBasename(entryPath, (_c = appConfig.router) === null || _c === void 0 ? void 0 : _c.basename));
+    const homePath = addLeadingSlash(getHomePage((_e = (_d = appConfig.routes) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.path, (_f = appConfig.router) === null || _f === void 0 ? void 0 : _f.basename, (_g = appConfig.router) === null || _g === void 0 ? void 0 : _g.customRoutes, appConfig.entryPagePath));
+    // url上没有指定应用的启动页面时使用homePath
+    if (routePath === '/') {
+        return homePath + stamp;
+    }
+    return routePath + stamp;
+}
 
 // 广告
 const createRewardedVideoAd = temporarilyNotSupport('createRewardedVideoAd');
@@ -1458,7 +1489,7 @@ const setClipboardData = ({ data, success, fail, complete }) => __awaiter(void 0
          * iOS < 10 的系统可能无法使用编程方式访问剪贴板，参考：
          * https://stackoverflow.com/questions/34045777/copy-to-clipboard-using-javascript-in-ios/34046084
          */
-        if (typeof document.execCommand === 'function') {
+        if (isFunction(document.execCommand)) {
             const textarea = document.createElement('textarea');
             textarea.readOnly = true;
             textarea.value = data;
@@ -1918,9 +1949,9 @@ const getLocationByW3CApi = (options) => {
                 /** 调用结果,自动补充 */
                 errMsg: ''
             };
-            handle.success(result, resolve);
+            handle.success(result, { resolve, reject });
         }, (error) => {
-            handle.fail({ errMsg: error.message }, reject);
+            handle.fail({ errMsg: error.message }, { resolve, reject });
         }, positionOptions);
     });
 };
@@ -2018,7 +2049,7 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
             console.warn('chooseLocation api 依赖腾讯地图定位api，需要在 defineConstants 中配置 LOCATION_APIKEY');
             return handle.fail({
                 errMsg: 'LOCATION_APIKEY needed'
-            }, reject);
+            }, { resolve, reject });
         }
         const onMessage = event => {
             // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
@@ -2037,14 +2068,14 @@ const chooseLocation = ({ success, fail, complete, mapOpts } = {}) => {
                 chooser.remove();
             }, 300);
             if (res) {
-                return handle.fail(res, reject);
+                return handle.fail(res, { resolve, reject });
             }
             else {
                 if (chooseLocation.latitude && chooseLocation.longitude) {
-                    return handle.success(chooseLocation, resolve);
+                    return handle.success(chooseLocation, { resolve, reject });
                 }
                 else {
-                    return handle.fail({}, reject);
+                    return handle.fail({}, { resolve, reject });
                 }
             }
         }, key, mapOpts);
@@ -2301,12 +2332,12 @@ const getImageInfo = (options) => {
                 width: image.naturalWidth,
                 height: image.naturalHeight,
                 path: getBase64Image(image) || src
-            }, resolve);
+            }, { resolve, reject });
         };
         image.onerror = (e) => {
             handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         };
         image.src = src;
     });
@@ -2333,7 +2364,7 @@ const previewImage = (options) => __awaiter(void 0, void 0, void 0, function* ()
             item.appendChild(div);
             // Note: 等待图片加载完后返回，会导致轮播被卡住
             resolve(item);
-            if (typeof loadFail === 'function') {
+            if (isFunction(loadFail)) {
                 image.addEventListener('error', (err) => {
                     loadFail({ errMsg: err.message });
                 });
@@ -2438,7 +2469,7 @@ const chooseImage = function (options) {
             el.removeAttribute('capture');
         }
     }
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         if (el) {
@@ -2457,7 +2488,7 @@ const chooseImage = function (options) {
                         (_a = res.tempFilePaths) === null || _a === void 0 ? void 0 : _a.push(url);
                         (_b = res.tempFiles) === null || _b === void 0 ? void 0 : _b.push({ path: url, size: item.size, type: item.type, originalFileObj: item });
                     });
-                    handle.success(res, resolve);
+                    handle.success(res, { resolve, reject });
                     target.value = '';
                 }
             };
@@ -2525,7 +2556,7 @@ const chooseVideo = (options) => {
     inputEl.setAttribute('accept', 'video/*');
     inputEl.setAttribute('style', 'position: fixed; top: -4000px; left: -3000px; z-index: -300;');
     document.body.appendChild(inputEl);
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         const TaroMouseEvents = document.createEvent('MouseEvents');
         TaroMouseEvents.initEvent('click', true, true);
         inputEl.dispatchEvent(TaroMouseEvents);
@@ -2546,7 +2577,7 @@ const chooseVideo = (options) => {
                     res.size = event.total;
                     res.height = videoEl.videoHeight;
                     res.width = videoEl.videoHeight;
-                    return handle.success(res, resolve);
+                    return handle.success(res, { resolve, reject });
                 };
             };
             if (file) {
@@ -2827,13 +2858,13 @@ function _request(options) {
             .then(data => {
             res.statusCode = 200;
             res.data = data;
-            typeof success === 'function' && success(res);
-            typeof complete === 'function' && complete(res);
+            isFunction(success) && success(res);
+            isFunction(complete) && complete(res);
             return res;
         })
             .catch(err => {
-            typeof fail === 'function' && fail(err);
-            typeof complete === 'function' && complete(res);
+            isFunction(fail) && fail(err);
+            isFunction(complete) && complete(res);
             return Promise.reject(err);
         });
     }
@@ -2901,13 +2932,13 @@ function _request(options) {
     })
         .then(data => {
         res.data = data;
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return res;
     })
         .catch(err => {
-        typeof fail === 'function' && fail(err);
-        typeof complete === 'function' && complete(res);
+        isFunction(fail) && fail(err);
+        isFunction(complete) && complete(res);
         err.statusCode = res.statusCode;
         err.errMsg = err.message;
         return Promise.reject(err);
@@ -3096,14 +3127,14 @@ class SocketTask {
         if (this.readyState !== 1) {
             const res = { errMsg: 'SocketTask.send:fail SocketTask.readState is not OPEN' };
             console.error(res.errMsg);
-            typeof fail === 'function' && fail(res);
-            typeof complete === 'function' && complete(res);
+            isFunction(fail) && fail(res);
+            isFunction(complete) && complete(res);
             return Promise.reject(res);
         }
         this.ws.send(data);
         const res = { errMsg: 'sendSocketMessage:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     close(opts = {}) {
@@ -3115,8 +3146,8 @@ class SocketTask {
         this._destroyWhenClose && this._destroyWhenClose();
         this.ws.close();
         const res = { errMsg: 'closeSocket:ok' };
-        typeof success === 'function' && success(res);
-        typeof complete === 'function' && complete(res);
+        isFunction(success) && success(res);
+        isFunction(complete) && complete(res);
         return Promise.resolve(res);
     }
     onOpen(func) {
@@ -3174,13 +3205,13 @@ function connectSocket(options) {
                     correct: 'String',
                     wrong: url
                 })
-            }, reject);
+            }, { resolve, reject });
         }
         // options.url must be invalid
         if (!url.startsWith('ws://') && !url.startsWith('wss://')) {
             return handle.fail({
                 errMsg: `request:fail invalid url "${url}"`
-            }, reject);
+            }, { resolve, reject });
         }
         // protocols must be array
         const _protocols = Array.isArray(protocols) ? protocols : null;
@@ -3188,7 +3219,7 @@ function connectSocket(options) {
         if (socketTasks.length > 1) {
             return handle.fail({
                 errMsg: '同时最多发起 2 个 socket 请求，更多请参考文档。'
-            }, reject);
+            }, { resolve, reject });
         }
         const task = new SocketTask(url, _protocols);
         task._destroyWhenClose = function () {
@@ -3918,6 +3949,7 @@ class Modal {
     }
     create(options = {}) {
         return new Promise((resolve) => {
+            var _a, _b;
             // style
             const { maskStyle, modalStyle, titleStyle, textStyle, footStyle, btnStyle } = this.style;
             // configuration
@@ -3982,10 +4014,13 @@ class Modal {
             // show immediately
             document.body.appendChild(this.el);
             setTimeout(() => { this.el.style.opacity = '1'; }, 0);
+            // Current.page不存在时说明路由还未挂载，此时需根据url来分配将要渲染的页面path
+            this.currentPath = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : getLaunchPage();
         });
     }
     show(options = {}) {
         return new Promise((resolve) => {
+            var _a, _b;
             const config = Object.assign(Object.assign({}, this.options), options);
             if (this.hideOpacityTimer)
                 clearTimeout(this.hideOpacityTimer);
@@ -4029,6 +4064,8 @@ class Modal {
             // show
             this.el.style.display = 'block';
             setTimeout(() => { this.el.style.opacity = '1'; }, 0);
+            // Current.page不存在时说明路由还未挂载，此时需根据url来分配将要渲染的页面path
+            this.currentPath = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : getLaunchPage();
         });
     }
     hide() {
@@ -4036,6 +4073,7 @@ class Modal {
             clearTimeout(this.hideOpacityTimer);
         if (this.hideDisplayTimer)
             clearTimeout(this.hideDisplayTimer);
+        this.currentPath = null;
         this.hideOpacityTimer = setTimeout(() => {
             this.el.style.opacity = '0';
             this.hideDisplayTimer = setTimeout(() => { this.el.style.display = 'none'; }, 200);
@@ -4119,6 +4157,7 @@ class Toast {
         };
     }
     create(options = {}, _type = 'toast') {
+        var _a, _b;
         // style
         const { maskStyle, toastStyle, successStyle, errrorStyle, loadingStyle, imageStyle, textStyle } = this.style;
         // configuration
@@ -4162,9 +4201,12 @@ class Toast {
         this.type = config._type;
         // disappear after duration
         config.duration >= 0 && this.hide(config.duration, this.type);
+        // Current.page不存在时说明路由还未挂载，此时需根据url来分配将要渲染的页面path
+        this.currentPath = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : getLaunchPage();
         return '';
     }
     show(options = {}, _type = 'toast') {
+        var _a, _b;
         const config = Object.assign(Object.assign(Object.assign({}, this.options), options), { _type });
         if (this.hideOpacityTimer)
             clearTimeout(this.hideOpacityTimer);
@@ -4196,6 +4238,8 @@ class Toast {
         this.type = config._type;
         // disappear after duration
         config.duration >= 0 && this.hide(config.duration, this.type);
+        // Current.page不存在时说明路由还未挂载，此时需根据url来分配将要渲染的页面path
+        this.currentPath = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) !== null && _b !== void 0 ? _b : getLaunchPage();
         return '';
     }
     hide(duration = 0, type) {
@@ -4205,6 +4249,7 @@ class Toast {
             clearTimeout(this.hideOpacityTimer);
         if (this.hideDisplayTimer)
             clearTimeout(this.hideDisplayTimer);
+        this.currentPath = null;
         this.hideOpacityTimer = setTimeout(() => {
             this.el.style.opacity = '0';
             this.hideDisplayTimer = setTimeout(() => { this.el.style.display = 'none'; }, 100);
@@ -4466,10 +4511,15 @@ const showActionSheet = (options = { itemList: [] }) => __awaiter(void 0, void 0
         return handle.success(({ tapIndex: result }));
     }
 });
-Taro.eventCenter.on('__taroRouterChange', () => {
-    hideToast();
-    hideLoading();
-    hideModal();
+Taro.eventCenter.on('__afterTaroRouterChange', () => {
+    var _a, _b;
+    if (toast.currentPath && toast.currentPath !== ((_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path)) {
+        hideToast();
+        hideLoading();
+    }
+    if (modal.currentPath && modal.currentPath !== ((_b = Current$1.page) === null || _b === void 0 ? void 0 : _b.path)) {
+        hideModal();
+    }
 });
 const enableAlertBeforeUnload = temporarilyNotSupport('enableAlertBeforeUnload');
 const disableAlertBeforeUnload = temporarilyNotSupport('disableAlertBeforeUnload');
@@ -4523,8 +4573,8 @@ const startPullDownRefresh = function ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'startPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroStartPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4535,8 +4585,8 @@ const stopPullDownRefresh = function ({ success, fail, complete } = {}) {
     const handle = new MethodHandler({ name: 'stopPullDownRefresh', success, fail, complete });
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroStopPullDownRefresh', {
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4555,7 +4605,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
             if (scrollTop === undefined && !selector) {
                 return handle.fail({
                     errMsg: 'scrollTop" 或 "selector" 需要其之一'
-                }, reject);
+                }, { resolve, reject });
             }
             const id = (_b = (_a = Current$1.page) === null || _a === void 0 ? void 0 : _a.path) === null || _b === void 0 ? void 0 : _b.replace(/([^a-z0-9\u00a0-\uffff_-])/ig, '\\$1');
             const el = (id
@@ -4609,7 +4659,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
                     }, FRAME_DURATION);
                 }
                 else {
-                    return handle.success({}, resolve);
+                    return handle.success({}, { resolve, reject });
                 }
             };
             scroll();
@@ -4617,7 +4667,7 @@ const pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300,
         catch (e) {
             return handle.fail({
                 errMsg: e.message
-            }, reject);
+            }, { resolve, reject });
         }
     });
 };
@@ -4654,8 +4704,8 @@ const showTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroShowTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4684,8 +4734,8 @@ const showTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroShowTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4736,8 +4786,8 @@ const setTabBarStyle = (options = {}) => {
             selectedColor,
             backgroundColor,
             borderStyle,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4769,8 +4819,8 @@ const setTabBarItem = (options) => {
             text,
             iconPath,
             selectedIconPath,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4809,8 +4859,8 @@ const setTabBarBadge = (options) => {
         Taro.eventCenter.trigger('__taroSetTabBarBadge', {
             index,
             text,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4839,8 +4889,8 @@ const removeTabBarBadge = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroRemoveTabBarBadge', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4869,8 +4919,8 @@ const hideTabBarRedDot = (options) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroHideTabBarRedDotHandler', {
             index,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -4899,8 +4949,8 @@ const hideTabBar = (options = {}) => {
     return new Promise((resolve, reject) => {
         Taro.eventCenter.trigger('__taroHideTabBar', {
             animation,
-            successHandler: (res = {}) => handle.success(res, resolve),
-            errorHandler: (res = {}) => handle.fail(res, reject)
+            successHandler: (res = {}) => handle.success(res, { resolve, reject }),
+            errorHandler: (res = {}) => handle.fail(res, { resolve, reject })
         });
     });
 };
@@ -5163,9 +5213,9 @@ class SelectorQuery {
             const _queueCb = this._queueCb;
             res.forEach((item, index) => {
                 const cb = _queueCb[index];
-                typeof cb === 'function' && cb.call(this, item);
+                isFunction(cb) && cb.call(this, item);
             });
-            typeof cb === 'function' && cb.call(this, res);
+            isFunction(cb) && cb.call(this, res);
         });
         return this;
     }
@@ -5213,7 +5263,7 @@ const requirePlugin = permanentlyNotSupport('requirePlugin');
 const pxTransform = function (size) {
     const options = taro.config;
     const baseFontSize = options.baseFontSize || 20;
-    const designWidth = ((input = 0) => typeof options.designWidth === 'function'
+    const designWidth = ((input = 0) => isFunction(options.designWidth)
         ? options.designWidth(input)
         : options.designWidth);
     const rootValue = (input = 0) => baseFontSize / options.deviceRatio[designWidth(input)] * 2;