@tarojs/taro-h5 3.3.14 → 3.3.15

package/dist/index.cjs.js

@@ -1263,7 +1263,87 @@ function prependBasename() {
   return basename.replace(/\/$/, '') + '/' + url.replace(/^\//, '');
 }
 
-var stacks = [];
+var hasBasename = function hasBasename(path, prefix) {
+  return new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path);
+};
+
+var stripBasename = function stripBasename(path, prefix) {
+  return hasBasename(path, prefix) ? path.substr(prefix.length) : path;
+};
+
+var Stacks = /*#__PURE__*/function () {
+  function Stacks() {
+    _classCallCheck$1(this, Stacks);
+
+    this.stacks = [];
+    this.backDelta = 0;
+  }
+
+  _createClass$1(Stacks, [{
+    key: "delta",
+    set: function set(delta) {
+      if (delta > 0) {
+        this.backDelta = delta;
+      } else {
+        --this.backDelta;
+      }
+    }
+  }, {
+    key: "length",
+    get: function get() {
+      return this.stacks.length;
+    }
+  }, {
+    key: "last",
+    get: function get() {
+      return this.stacks[this.length - 1];
+    }
+  }, {
+    key: "get",
+    value: function get() {
+      return this.stacks;
+    }
+  }, {
+    key: "getItem",
+    value: function getItem(index) {
+      return this.stacks[index];
+    }
+  }, {
+    key: "getDelta",
+    value: function getDelta(pathname) {
+      if (this.backDelta >= 1) {
+        return this.backDelta;
+      } // NOTE: 此处为了修复浏览器后退多级页面，在大量重复路由状况下可能出现判断错误的情况 （增强判断能力只能考虑在 query 中新增参数来判断，暂时搁置）
+
+
+      var prevIndex = this.stacks.findIndex(function (r) {
+        var _a;
+
+        return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+      });
+      return this.length - 1 - prevIndex;
+    }
+  }, {
+    key: "getPrevIndex",
+    value: function getPrevIndex(pathname) {
+      return this.length - 1 - this.getDelta(pathname);
+    }
+  }, {
+    key: "pop",
+    value: function pop() {
+      return this.stacks.pop();
+    }
+  }, {
+    key: "push",
+    value: function push(page) {
+      return this.stacks.push(page);
+    }
+  }]);
+
+  return Stacks;
+}();
+
+var stacks = new Stacks();
 var routesAlias = {};
 
 function setRoutesAlias(alias) {
@@ -1276,33 +1356,7 @@ function addLeadingSlash(path) {
   }
 
   return path.charAt(0) === '/' ? path : '/' + path;
-} // 解决navigateBack调用delta>1时,路由栈异常问题
-// 比如:A->B->C,navigateBack({delta: 2}),此时路由栈中还存在B页面
-// 原因:主要是由于一次性退出多层级页面时,此action只会执行一次,此处进行手动处理
-
-
-var historyBackDelta = 1;
-
-function setHistoryBackDelta(delta) {
-  historyBackDelta = delta;
-} // eslint-disable-next-line @typescript-eslint/ban-types
-
-
-var throttle = function throttle(fn, threshold) {
-  var lastTime = 0;
-  return function () {
-    var now = Date.now();
-
-    if (now - lastTime > threshold) {
-      fn.apply(this, arguments);
-      lastTime = now;
-    }
-  };
-};
-
-var stripBasename = function stripBasename(path, basename) {
-  return path.startsWith(basename) ? path.replace(basename, '') : path;
-};
+}
 
 var isTabBar = function isTabBar(config) {
   var _a, _b;
@@ -1326,13 +1380,29 @@ var isTabBar = function isTabBar(config) {
 };
 
 function processNavigateUrl(option) {
+  var _a;
+
   var pathPieces = J(option.url); // 处理自定义路由
 
   Object.keys(routesAlias).forEach(function (key) {
     if (addLeadingSlash(key) === addLeadingSlash(pathPieces.pathname)) {
       pathPieces.pathname = routesAlias[key];
     }
-  }); // 处理 basename
+  }); // 处理相对路径
+
+  if ((_a = pathPieces === null || pathPieces === void 0 ? void 0 : pathPieces.pathname) === null || _a === void 0 ? void 0 : _a.includes('./')) {
+    var parts = exports.history.location.pathname.split('/');
+    parts.pop();
+    pathPieces.pathname.split('/').forEach(function (item) {
+      if (item === '.') {
+        return;
+      }
+
+      item === '..' ? parts.pop() : parts.push(item);
+    });
+    pathPieces.pathname = parts.join('/');
+  } // 处理 basename
+
 
   pathPieces.pathname = prependBasename(pathPieces.pathname); // hack fix history v5 bug: https://github.com/remix-run/history/issues/814
 
@@ -1374,7 +1444,7 @@ function _navigate() {
                     exports.history.replace(pathPieces, state);
                   }
                 } else if (method === 'navigateBack') {
-                  setHistoryBackDelta(option.delta);
+                  stacks.delta = option.delta;
                   exports.history.go(-option.delta);
                 }
               } catch (error) {
@@ -1425,7 +1495,7 @@ function reLaunch(option) {
 }
 
 function getCurrentPages() {
-  return stacks;
+  return stacks.get();
 }
 /**
  * Expose `pathToRegexp`.
@@ -2070,6 +2140,8 @@ var UniversalRouter = function () {
 
 UniversalRouter.pathToRegexp = pathToRegexp_1;
 
+var Taro$1 = require('@tarojs/taro-h5');
+
 function initTabbar(config) {
   if (config.tabBar == null) {
     return;
@@ -2082,7 +2154,6 @@ function initTabbar(config) {
   tabbar.conf.homePage = exports.history.location.pathname === '/' ? homePage : exports.history.location.pathname;
   var routerConfig = config.router;
   tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash';
-  tabbar.conf.custom = !!routerConfig.customRoutes;
 
   if (routerConfig.customRoutes) {
     tabbar.conf.custom = true;
@@ -2099,6 +2170,7 @@ function initTabbar(config) {
   var container = document.getElementById('container'); // eslint-disable-next-line no-unused-expressions
 
   container === null || container === void 0 ? void 0 : container.appendChild(tabbar);
+  Taro$1.initTabBarApis(config);
 }
 
 var routerConfig = Object.create(null);
@@ -2124,6 +2196,64 @@ function init(config) {
   initTabbar(config);
 }
 
+var pageScrollFn;
+var pageDOM = window;
+
+function bindPageScroll(page, config) {
+  pageDOM.removeEventListener('scroll', pageScrollFn);
+  pageDOM = getScrollContainer();
+  var distance = config.onReachBottomDistance || 50;
+  var isReachBottom = false;
+
+  pageScrollFn = function pageScrollFn() {
+    page.onPageScroll && page.onPageScroll({
+      scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
+    });
+
+    if (isReachBottom && getOffset() > distance) {
+      isReachBottom = false;
+    }
+
+    if (page.onReachBottom && !isReachBottom && getOffset() < distance) {
+      isReachBottom = true;
+      page.onReachBottom();
+    }
+  };
+
+  pageDOM.addEventListener('scroll', pageScrollFn, false);
+}
+
+window.addEventListener('DOMSubtreeModified', function (e) {
+  var _a; // @ts-ignore
+
+
+  var className = (_a = e.target) === null || _a === void 0 ? void 0 : _a.className;
+
+  if (className && /taro-tabbar__/.test(className)) {
+    pageDOM.removeEventListener('scroll', pageScrollFn);
+    pageDOM = getScrollContainer();
+    pageDOM.addEventListener('scroll', pageScrollFn, false);
+  }
+}, false);
+
+function getScrollContainer() {
+  if (document.querySelector('.taro-tabbar__tabbar') === null) {
+    // 没设置tabbar
+    return window;
+  } else {
+    // 有设置tabbar
+    return document.querySelector('.taro-tabbar__panel') || window;
+  }
+}
+
+function getOffset() {
+  if (pageDOM instanceof Window) {
+    return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
+  } else {
+    return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
+  }
+}
+
 function createCommonjsModule$1(fn, module) {
   return module = {
     exports: {}
@@ -2693,10 +2823,26 @@ var queryString_5 = queryString.stringifyUrl;
 var queryString_6 = queryString.pick;
 var queryString_7 = queryString.exclude;
 
+function getSearch() {
+  var search = '?';
+
+  if (routerConfig.router.mode === 'hash') {
+    var idx = location.hash.indexOf('?');
+
+    if (idx > -1) {
+      search = location.hash.slice(idx);
+    }
+  } else {
+    search = location.search;
+  }
+
+  return search.substr(1);
+}
+
 var qs = function qs() {
   var stamp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-  var search = routerConfig.router.mode === 'hash' ? location.hash.slice(routerConfig.router.pathname.length + 1) : location.search;
-  var query = search ? queryString.parse(search.substr(1)) : {};
+  var search = getSearch();
+  var query = search ? queryString.parse(search) : {};
 
   if (stamp) {
     query.stamp = stamp.toString();
@@ -2704,142 +2850,90 @@ var qs = function qs() {
 
   return query;
 };
+/* eslint-disable dot-notation */
 
-var pageScrollFn;
-var pageDOM = window;
-
-function bindPageScroll(page, config) {
-  pageDOM.removeEventListener('scroll', pageScrollFn);
-  pageDOM = getScrollContainer();
-  var distance = config.onReachBottomDistance || 50;
-  var isReachBottom = false;
 
-  pageScrollFn = function pageScrollFn() {
-    page.onPageScroll && page.onPageScroll({
-      scrollTop: pageDOM instanceof Window ? window.scrollY : pageDOM.scrollTop
-    });
+function pageOnReady(page) {
+  var onLoad = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
 
-    if (isReachBottom && getOffset() > distance) {
-      isReachBottom = false;
-    }
+  var _a;
 
-    if (page.onReachBottom && !isReachBottom && getOffset() < distance) {
-      isReachBottom = true;
-      page.onReachBottom();
-    }
-  };
+  var pageEl = document.getElementById(page.path);
 
-  pageDOM.addEventListener('scroll', pageScrollFn, false);
+  if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
+    var el = pageEl.firstElementChild;
+    (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el).then(function () {
+      runtime.requestAnimationFrame(function () {
+        page.onReady();
+        pageEl['__isReady'] = true;
+      });
+    });
+    onLoad && (pageEl['__page'] = page);
+  }
 }
 
-window.addEventListener('DOMSubtreeModified', function (e) {
-  var _a; // @ts-ignore
-
-
-  var className = (_a = e.target) === null || _a === void 0 ? void 0 : _a.className;
-
-  if (className && /taro-tabbar__/.test(className)) {
-    pageDOM.removeEventListener('scroll', pageScrollFn);
-    pageDOM = getScrollContainer();
-    pageDOM.addEventListener('scroll', pageScrollFn, false);
-  }
-}, false);
+function loadPage(page) {
+  var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  if (!page) return;
+  var pageEl = document.getElementById(page.path);
 
-function getScrollContainer() {
-  if (document.querySelector('.taro-tabbar__tabbar') === null) {
-    // 没设置tabbar
-    return window;
+  if (pageEl) {
+    pageEl.style.display = 'block';
   } else {
-    // 有设置tabbar
-    return document.querySelector('.taro-tabbar__panel') || window;
+    page.onLoad(qs(stacksIndex), function () {
+      return pageOnReady(page, true);
+    });
   }
-}
 
-function getOffset() {
-  if (pageDOM instanceof Window) {
-    return document.documentElement.scrollHeight - window.scrollY - window.innerHeight;
-  } else {
-    return pageDOM.scrollHeight - pageDOM.scrollTop - pageDOM.clientHeight;
-  }
+  stacks.push(page);
+  page.onShow();
+  bindPageScroll(page, pageConfig);
 }
-/* eslint-disable dot-notation */
-
-
-function hidePage(page) {
-  if (page != null) {
-    page.onHide();
-    var pageEl = document.getElementById(page.path);
 
-    if (pageEl) {
-      pageEl.style.display = 'none';
-    }
-  }
+function unloadPage(page) {
+  var delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  if (!page) return;
+  stacks.delta = --delta;
+  stacks.pop();
+  page.onUnload();
+  if (delta >= 1) unloadPage(stacks.last, delta);
 }
 
-function showPage(page, pageConfig) {
+function showPage(page) {
+  var pageConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  if (!page) return;
+  page.onShow();
+  var pageEl = document.getElementById(page.path);
 
-  if (page != null) {
-    page.onShow();
-    var pageEl = document.getElementById(page.path);
-
-    if (pageEl) {
-      pageEl.style.display = 'block';
-    } else {
-      page.onLoad(qs(stacksIndex));
-      pageEl = document.getElementById(page.path);
-      pageOnReady(pageEl, page, false);
-    }
-
-    bindPageScroll(page, pageConfig || {});
+  if (pageEl) {
+    pageEl.style.display = 'block';
+  } else {
+    page.onLoad(qs(stacksIndex), function () {
+      return pageOnReady(page, false);
+    });
   }
-}
 
-function unloadPage(page) {
-  if (page != null) {
-    stacks.pop();
-    page.onUnload();
-  }
+  bindPageScroll(page, pageConfig);
 }
 
-function pageOnReady(pageEl, page) {
-  var onLoad = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-
-  var _a;
+function hidePage(page) {
+  if (!page) return; // NOTE: 修复多页并发问题，此处可能因为路由跳转过快，执行时页面可能还没有创建成功
 
-  if (pageEl && !(pageEl === null || pageEl === void 0 ? void 0 : pageEl['__isReady'])) {
-    var el = pageEl.firstElementChild; // eslint-disable-next-line no-unused-expressions
+  var pageEl = document.getElementById(page.path);
 
-    (_a = el === null || el === void 0 ? void 0 : el['componentOnReady']) === null || _a === void 0 ? void 0 : _a.call(el).then(function () {
-      runtime.requestAnimationFrame(function () {
-        page.onReady();
-        pageEl['__isReady'] = true;
-      });
-    });
-    onLoad && (pageEl['__page'] = page);
+  if (pageEl) {
+    pageEl.style.display = 'none';
+    page.onHide();
+  } else {
+    setTimeout(function () {
+      return hidePage(page);
+    }, 0);
   }
 }
+/* eslint-disable dot-notation */
 
-function loadPage(page, pageConfig) {
-  var stacksIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-
-  if (page !== null) {
-    var pageEl = document.getElementById(page.path);
-
-    if (pageEl) {
-      pageEl.style.display = 'block';
-    } else {
-      page.onLoad(qs(stacksIndex), function () {
-        pageEl = document.getElementById(page.path);
-        pageOnReady(pageEl, page);
-      });
-    }
-
-    stacks.push(page);
-    page.onShow();
-    bindPageScroll(page, pageConfig || {});
-  }
-}
 
 function createRouter(app, config, framework) {
   var _a;
@@ -2864,9 +2958,10 @@ function createRouter(app, config, framework) {
     baseUrl: basename || ''
   });
   app.onLaunch();
-  var render = throttle( /*#__PURE__*/function () {
+
+  var render = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref3) {
-      var location, action, _a, _b, _c, _d, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, pathname, _prevIndex, _prev, el, loadConfig, _pathname, routerIndex, page;
+      var location, action, _a, _b, _c, _d, element, pageConfig, enablePullDownRefresh, currentPage, pathname, shouldLoad, prevIndex, delta, _prevIndex, el, loadConfig, stacksIndex, page;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -2926,98 +3021,86 @@ function createRouter(app, config, framework) {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
               }
 
+              currentPage = runtime.Current.page;
+              pathname = location.pathname;
               shouldLoad = false;
 
               if (!(action === 'POP')) {
-                _context.next = 32;
+                _context.next = 31;
                 break;
               }
 
-              unloadPage(runtime.Current.page);
-              delta = historyBackDelta;
+              // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
+              prevIndex = stacks.getPrevIndex(pathname);
+              delta = stacks.getDelta(pathname);
+              unloadPage(currentPage, delta);
 
-              while (delta-- > 1) {
-                unloadPage(stacks.slice(-1)[0]);
-              } // 最终必须重置为 1
-
-
-              setHistoryBackDelta(1);
-              prevIndex = stacks.reduceRight(function (p, s, i) {
-                if (p !== 0) return p;else if (s.path === location.pathname + runtime.stringify(qs(i))) return i;else return 0;
-              }, 0);
-              prev = stacks[prevIndex];
-
-              if (prev) {
-                showPage(prev, pageConfig, prevIndex);
+              if (prevIndex > -1) {
+                showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
               } else {
                 shouldLoad = true;
               }
 
-              _context.next = 49;
+              _context.next = 46;
               break;
 
-            case 32:
+            case 31:
               if (!(action === 'PUSH')) {
-                _context.next = 37;
+                _context.next = 36;
                 break;
               }
 
-              hidePage(runtime.Current.page);
+              hidePage(currentPage);
               shouldLoad = true;
-              _context.next = 49;
+              _context.next = 46;
               break;
 
-            case 37:
+            case 36:
               if (!(action === 'REPLACE')) {
-                _context.next = 49;
+                _context.next = 46;
                 break;
               }
 
               if (!isTabBar(config)) {
-                _context.next = 47;
+                _context.next = 44;
                 break;
               }
 
-              hidePage(runtime.Current.page);
-              pathname = stripBasename(config.router.pathname, basename);
-              _prevIndex = stacks.findIndex(function (r) {
-                var _a;
-
-                return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
-              });
+              hidePage(currentPage);
+              _prevIndex = stacks.getPrevIndex(pathname);
 
               if (!(_prevIndex > -1)) {
-                _context.next = 45;
+                _context.next = 42;
                 break;
               }
 
-              // tabbar 页且之前出现过，直接复用
-              _prev = stacks[_prevIndex];
-              return _context.abrupt("return", showPage(_prev, pageConfig, _prevIndex));
+              return _context.abrupt("return", showPage(stacks.getItem(_prevIndex), pageConfig, _prevIndex));
 
-            case 45:
-              _context.next = 48;
+            case 42:
+              _context.next = 45;
               break;
 
-            case 47:
-              unloadPage(runtime.Current.page);
+            case 44:
+              unloadPage(currentPage);
 
-            case 48:
+            case 45:
               shouldLoad = true;
 
-            case 49:
-              if (shouldLoad) {
-                el = (_c = element["default"]) !== null && _c !== void 0 ? _c : element;
-                loadConfig = Object.assign({}, pageConfig);
-                delete loadConfig['path'];
-                delete loadConfig['load'];
-                _pathname = stripBasename(config.router.pathname, basename);
-                routerIndex = stacks.length;
-                page = runtime.createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, _pathname + runtime.stringify(qs(routerIndex)), {}, loadConfig);
-                loadPage(page, pageConfig, routerIndex);
+            case 46:
+              if (!shouldLoad) {
+                _context.next = 54;
+                break;
               }
 
-            case 50:
+              el = (_c = element["default"]) !== null && _c !== void 0 ? _c : element;
+              loadConfig = Object.assign({}, pageConfig);
+              stacksIndex = stacks.length;
+              delete loadConfig['path'];
+              delete loadConfig['load'];
+              page = runtime.createPageConfig(enablePullDownRefresh ? (_d = runtimeHooks.createPullDownComponent) === null || _d === void 0 ? void 0 : _d.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + runtime.stringify(qs(stacksIndex)), {}, loadConfig);
+              return _context.abrupt("return", loadPage(page, pageConfig, stacksIndex));
+
+            case 54:
             case "end":
               return _context.stop();
           }
@@ -3025,10 +3108,10 @@ function createRouter(app, config, framework) {
       }, _callee, null, [[2, 8]]);
     }));
 
-    return function (_x3) {
+    return function render(_x3) {
       return _ref4.apply(this, arguments);
     };
-  }(), 500);
+  }();
 
   if (exports.history.location.pathname === '/') {
     exports.history.replace(prependBasename(routes[0].path + exports.history.location.search));
@@ -10343,12 +10426,9 @@ var scanCode = processOpenapi('scanQRCode', {
 });
 
 var tabConf;
-var App;
 function initTabBarApis() {
-  var _App = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
-  tabConf = _App.state.__tabs;
-  App = _App;
+  var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  tabConf = config.tabBar;
 }
 /**
  * 为 tabBar 某一项的右上角添加文本
@@ -10410,7 +10490,6 @@ function setTabBarBadge() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 移除 tabBar 某一项右上角的文本
@@ -10458,7 +10537,6 @@ function removeTabBarBadge() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 显示 tabBar 某一项的右上角的红点
@@ -10506,7 +10584,6 @@ function showTabBarRedDot() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 隐藏 tabBar 某一项的右上角的红点
@@ -10554,7 +10631,6 @@ function hideTabBarRedDot() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 显示 tabBar
@@ -10602,7 +10678,6 @@ function showTabBar() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 隐藏 tabBar
@@ -10650,7 +10725,6 @@ function hideTabBar() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 动态设置 tabBar 的整体样式
@@ -10708,17 +10782,14 @@ function setTabBarStyle() {
     res.errMsg = 'setTabBarStyle:fail';
     return Promise.reject(res);
   }
-
-  var obj = {};
-  if (color) obj.color = color;
-  if (selectedColor) obj.selectedColor = selectedColor;
-  if (backgroundColor) obj.backgroundColor = backgroundColor;
-  if (borderStyle) obj.borderStyle = borderStyle;
-  var temp = Object.assign({}, tabConf, obj);
-  App.setState && App.setState({
-    __tabs: temp
+  Taro.eventCenter.trigger('__taroSetTabBarStyle', {
+    color: color,
+    selectedColor: selectedColor,
+    backgroundColor: backgroundColor,
+    borderStyle: borderStyle,
+    successHandler: successHandler(success, complete),
+    errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 动态设置 tabBar 某一项的内容
@@ -10767,21 +10838,14 @@ function setTabBarItem() {
     return errorHandler(fail, complete)(res);
   }
 
-  if (!tabConf || !tabConf.list || !tabConf.list[index]) {
-    res.errMsg = 'setTabBarItem:fail tabbar item not found';
-    return errorHandler(fail, complete)(res);
-  }
-
-  var obj = {};
-  if (text) obj.text = text;
-  if (iconPath) obj.iconPath = iconPath;
-  if (selectedIconPath) obj.selectedIconPath = selectedIconPath;
-  var temp = Object.assign({}, tabConf);
-  temp.list[index] = Object.assign({}, temp.list[index], obj);
-  App.setState && App.setState({
-    __tabs: temp
+  Taro.eventCenter.trigger('__taroSetTabBarItem', {
+    index: index,
+    text: text,
+    iconPath: iconPath,
+    selectedIconPath: selectedIconPath,
+    successHandler: successHandler(success, complete),
+    errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 
 var vibrator = function vibrator(mm) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.14",
+  "version": "3.3.15",
   "description": "Taro h5 framework",
   "main:h5": "src/index.js",
   "main": "dist/index.cjs.js",
@@ -33,9 +33,9 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.3.14",
-    "@tarojs/router": "3.3.14",
-    "@tarojs/runtime": "3.3.14",
+    "@tarojs/api": "3.3.15",
+    "@tarojs/router": "3.3.15",
+    "@tarojs/runtime": "3.3.15",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "jest-fetch-mock": "^3.0.3"
   },
-  "gitHead": "ffd2b33c2a760094372a9ec69735ab9c4d1877e5"
+  "gitHead": "4a11ab9a8950f6a580e1278c160f6b4aaa8ac4f2"
 }

package/src/api/tabBar/index.js

@@ -2,11 +2,9 @@ import Taro from '@tarojs/api'
 import { shouldBeObject, getParameterError, isValidColor, successHandler, errorHandler } from '../utils'
 
 let tabConf
-let App
 
-export function initTabBarApis (_App = {}) {
-  tabConf = _App.state.__tabs
-  App = _App
+export function initTabBarApis (config = {}) {
+  tabConf = config.tabBar
 }
 
 /**
@@ -64,8 +62,6 @@ export function setTabBarBadge (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -109,8 +105,6 @@ export function removeTabBarBadge (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -154,8 +148,6 @@ export function showTabBarRedDot (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -199,8 +191,6 @@ export function hideTabBarRedDot (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -245,8 +235,6 @@ export function showTabBar (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -291,8 +279,6 @@ export function hideTabBar (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -353,10 +339,14 @@ export function setTabBarStyle (options = {}) {
   if (backgroundColor) obj.backgroundColor = backgroundColor
   if (borderStyle) obj.borderStyle = borderStyle
 
-  const temp = Object.assign({}, tabConf, obj)
-  App.setState && App.setState({ __tabs: temp })
-
-  return successHandler(success, complete)(res)
+  Taro.eventCenter.trigger('__taroSetTabBarStyle', {
+    color,
+    selectedColor,
+    backgroundColor,
+    borderStyle,
+    successHandler: successHandler(success, complete),
+    errorHandler: errorHandler(success, complete)
+  })
 }
 
 /**
@@ -401,24 +391,12 @@ export function setTabBarItem (options = {}) {
     return errorHandler(fail, complete)(res)
   }
 
-  if (
-    !tabConf ||
-    !tabConf.list ||
-    !tabConf.list[index]
-  ) {
-    res.errMsg = 'setTabBarItem:fail tabbar item not found'
-    return errorHandler(fail, complete)(res)
-  }
-
-  const obj = {}
-  if (text) obj.text = text
-  if (iconPath) obj.iconPath = iconPath
-  if (selectedIconPath) obj.selectedIconPath = selectedIconPath
-
-  const temp = Object.assign({}, tabConf)
-  temp.list[index] = Object.assign({}, temp.list[index], obj)
-
-  App.setState && App.setState({ __tabs: temp })
-
-  return successHandler(success, complete)(res)
+  Taro.eventCenter.trigger('__taroSetTabBarItem', {
+    index,
+    text,
+    iconPath,
+    selectedIconPath,
+    successHandler: successHandler(success, complete),
+    errorHandler: errorHandler(success, complete)
+  })
 }