@tarojs/taro-h5 3.3.11 → 3.3.15

package/dist/index.cjs.js

@@ -249,7 +249,8 @@ var ENV_TYPE = {
   ALIPAY: 'ALIPAY',
   TT: 'TT',
   QQ: 'QQ',
-  JD: 'JD'
+  JD: 'JD',
+  KWAI: 'KWAI'
 };
 var _env = null; // 一个taro项目肯定运行同样的环境
 
@@ -286,6 +287,11 @@ function getEnv() {
     return ENV_TYPE.ALIPAY;
   }
 
+  if (typeof ks !== 'undefined' && ks.getSystemInfo) {
+    _env = ENV_TYPE.KWAI;
+    return ENV_TYPE.KWAI;
+  }
+
   if (typeof global !== 'undefined' && global.__fbGenNativeModule) {
     _env = ENV_TYPE.RN;
     return ENV_TYPE.RN;
@@ -919,7 +925,11 @@ function createBrowserHistory(b) {
 
   function x(c, a) {
     void 0 === a && (a = null);
-    return C(_extends({}, q, "string" === typeof c ? J(c) : c, {
+    return C(_extends({
+      pathname: q.pathname,
+      hash: "",
+      search: ""
+    }, "string" === typeof c ? J(c) : c, {
       state: a,
       key: H()
     }));
@@ -1102,7 +1112,11 @@ function createHashHistory(b) {
 
   function z(a, e) {
     void 0 === e && (e = null);
-    return C(_extends({}, d, "string" === typeof a ? J(a) : a, {
+    return C(_extends({
+      pathname: d.pathname,
+      hash: "",
+      search: ""
+    }, "string" === typeof a ? J(a) : a, {
       state: e,
       key: H()
     }));
@@ -1244,12 +1258,92 @@ function setHistoryMode(mode) {
   }
 }
 
-function parsePath() {
+function prependBasename() {
   var url = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   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) {
@@ -1262,89 +1356,112 @@ function addLeadingSlash(path) {
   }
 
   return path.charAt(0) === '/' ? path : '/' + path;
-} // 解决navigateBack调用delta>1时,路由栈异常问题
-// 比如:A->B->C,navigateBack({delta: 2}),此时路由栈中还存在B页面
-// 原因:主要是由于一次性退出多层级页面时,此action只会执行一次,此处进行手动处理
+}
 
+var isTabBar = function isTabBar(config) {
+  var _a, _b;
+
+  var _config$router = config.router,
+      _config$router$custom = _config$router.customRoutes,
+      customRoutes = _config$router$custom === void 0 ? {} : _config$router$custom,
+      _config$router$basena = _config$router.basename,
+      basename = _config$router$basena === void 0 ? '' : _config$router$basena,
+      pathname = _config$router.pathname;
+  var routePath = stripBasename(pathname, basename);
+  var pagePath = ((_a = Object.entries(customRoutes).find(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+        target = _ref2[1];
+
+    return target === routePath;
+  })) === null || _a === void 0 ? void 0 : _a[0]) || routePath;
+  return !!pagePath && (((_b = config.tabBar) === null || _b === void 0 ? void 0 : _b.list) || []).some(function (t) {
+    return t.pagePath === pagePath;
+  });
+};
 
-var historyBackDelta = 1;
+function processNavigateUrl(option) {
+  var _a;
 
-function setHistoryBackDelta(delta) {
-  historyBackDelta = delta;
-} // eslint-disable-next-line @typescript-eslint/ban-types
+  var pathPieces = J(option.url); // 处理自定义路由
 
+  Object.keys(routesAlias).forEach(function (key) {
+    if (addLeadingSlash(key) === addLeadingSlash(pathPieces.pathname)) {
+      pathPieces.pathname = routesAlias[key];
+    }
+  }); // 处理相对路径
 
-var throttle = function throttle(fn, threshold) {
-  var lastTime = 0;
-  return function () {
-    var now = Date.now();
+  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;
+      }
 
-    if (now - lastTime > threshold) {
-      fn.apply(this, arguments);
-      lastTime = now;
-    }
-  };
-};
+      item === '..' ? parts.pop() : parts.push(item);
+    });
+    pathPieces.pathname = parts.join('/');
+  } // 处理 basename
 
-function processNavigateUrl(option) {
-  var url = option.url;
-  var matches = option.url.match(/[?&?].*/);
-  var parameters = '';
 
-  if (matches && matches.length) {
-    parameters = matches[0];
-    url = url.replace(parameters, '');
-  }
+  pathPieces.pathname = prependBasename(pathPieces.pathname); // hack fix history v5 bug: https://github.com/remix-run/history/issues/814
 
-  Object.keys(routesAlias).forEach(function (key) {
-    if (addLeadingSlash(key) === addLeadingSlash(url)) {
-      option.url = routesAlias[key] + parameters;
-    }
-  });
+  if (!pathPieces.search) pathPieces.search = '';
+  return pathPieces;
 }
 
-function navigate(option, method) {
-  var success = option.success,
-      complete = option.complete,
-      fail = option.fail;
-  var failReason;
-
-  if (option.url) {
-    processNavigateUrl(option);
-  }
+function navigate(_x, _x2) {
+  return _navigate.apply(this, arguments);
+}
 
-  try {
-    if (method === 'navigateTo') {
-      exports.history.push(parsePath(option.url), {
-        timestamp: Date.now()
-      });
-    } else if (method === 'redirectTo') {
-      exports.history.replace(parsePath(option.url), {
-        timestamp: Date.now()
-      });
-    } else if (method === 'navigateBack') {
-      setHistoryBackDelta(option.delta);
-      exports.history.go(-option.delta);
-    }
-  } catch (error) {
-    failReason = error;
-  }
+function _navigate() {
+  _navigate = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(option, method) {
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            return _context2.abrupt("return", new Promise(function (resolve, reject) {
+              var success = option.success,
+                  complete = option.complete,
+                  fail = option.fail;
+              var unListen = exports.history.listen(function () {
+                success === null || success === void 0 ? void 0 : success();
+                complete === null || complete === void 0 ? void 0 : complete();
+                resolve();
+                unListen();
+              });
 
-  return new Promise(function (resolve, reject) {
-    if (failReason) {
-      fail && fail(failReason);
-      complete && complete();
-      reject(failReason);
-      return;
-    }
+              try {
+                if ('url' in option) {
+                  var pathPieces = processNavigateUrl(option);
+                  var state = {
+                    timestamp: Date.now()
+                  };
+
+                  if (method === 'navigateTo') {
+                    exports.history.push(pathPieces, state);
+                  } else if (method === 'redirectTo') {
+                    exports.history.replace(pathPieces, state);
+                  }
+                } else if (method === 'navigateBack') {
+                  stacks.delta = option.delta;
+                  exports.history.go(-option.delta);
+                }
+              } catch (error) {
+                fail === null || fail === void 0 ? void 0 : fail(error);
+                complete === null || complete === void 0 ? void 0 : complete();
+                reject(error);
+              }
+            }));
 
-    var unlisten = exports.history.listen(function () {
-      success && success();
-      complete && complete();
-      resolve();
-      unlisten();
-    });
-  });
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _navigate.apply(this, arguments);
 }
 
 function navigateTo(option) {
@@ -1368,15 +1485,17 @@ function navigateBack() {
 }
 
 function switchTab(option) {
-  return navigateTo(option);
+  // TODO: 清除掉所有的栈去目标页面
+  return redirectTo(option);
 }
 
 function reLaunch(option) {
+  // TODO: 清除掉所有的栈去目标页面
   return redirectTo(option);
 }
 
 function getCurrentPages() {
-  return stacks;
+  return stacks.get();
 }
 /**
  * Expose `pathToRegexp`.
@@ -2021,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;
@@ -2033,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;
@@ -2043,9 +2163,14 @@ function initTabbar(config) {
     tabbar.conf.customRoutes = {};
   }
 
+  if (typeof routerConfig.basename !== 'undefined') {
+    tabbar.conf.basename = routerConfig.basename;
+  }
+
   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);
@@ -2071,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: {}
@@ -2640,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();
@@ -2651,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;
@@ -2811,15 +2958,16 @@ function createRouter(app, config, framework) {
     baseUrl: basename || ''
   });
   app.onLaunch();
-  var render = throttle( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
-      var location, action, _a, _b, _c, _d, _e, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, el, _config, pathname, routerIndex, isTabBar, page;
+
+  var render = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref3) {
+      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) {
           switch (_context.prev = _context.next) {
             case 0:
-              location = _ref.location, action = _ref.action;
+              location = _ref3.location, action = _ref3.action;
               routerConfig.router.pathname = location.pathname;
               _context.prev = 2;
               _context.next = 5;
@@ -2873,62 +3021,86 @@ function createRouter(app, config, framework) {
                 enablePullDownRefresh = pageConfig.enablePullDownRefresh;
               }
 
+              currentPage = runtime.Current.page;
+              pathname = location.pathname;
               shouldLoad = false;
 
-              if (action === 'POP') {
-                unloadPage(runtime.Current.page);
-                delta = historyBackDelta;
+              if (!(action === 'POP')) {
+                _context.next = 31;
+                break;
+              }
 
-                while (delta-- > 1) {
-                  unloadPage(stacks.slice(-1)[0]);
-                } // 最终必须重置为 1
+              // NOTE: 浏览器事件退后多次时，该事件只会被触发一次
+              prevIndex = stacks.getPrevIndex(pathname);
+              delta = stacks.getDelta(pathname);
+              unloadPage(currentPage, delta);
 
+              if (prevIndex > -1) {
+                showPage(stacks.getItem(prevIndex), pageConfig, prevIndex);
+              } else {
+                shouldLoad = true;
+              }
 
-                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];
+              _context.next = 46;
+              break;
 
-                if (prev) {
-                  showPage(prev, pageConfig, prevIndex);
-                } else {
-                  shouldLoad = true;
-                }
-              } else if (action === 'PUSH') {
-                hidePage(runtime.Current.page);
-                shouldLoad = true;
-              } else if (action === 'REPLACE') {
-                unloadPage(runtime.Current.page);
-                shouldLoad = true;
+            case 31:
+              if (!(action === 'PUSH')) {
+                _context.next = 36;
+                break;
+              }
+
+              hidePage(currentPage);
+              shouldLoad = true;
+              _context.next = 46;
+              break;
+
+            case 36:
+              if (!(action === 'REPLACE')) {
+                _context.next = 46;
+                break;
               }
 
-              if (shouldLoad) {
-                el = (_c = element["default"]) !== null && _c !== void 0 ? _c : element;
-                _config = Object.assign({}, pageConfig);
-                delete _config['path'];
-                delete _config['load'];
-                pathname = basename ? location.pathname.replace(basename, '') : location.pathname;
-                isTabBar = (_d = routerConfig.tabBar) === null || _d === void 0 ? void 0 : _d.list.some(function (TabBarItem) {
-                  var _a;
+              if (!isTabBar(config)) {
+                _context.next = 44;
+                break;
+              }
 
-                  return ((_a = TabBarItem.pagePath) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
-                });
+              hidePage(currentPage);
+              _prevIndex = stacks.getPrevIndex(pathname);
 
-                if ((stacks === null || stacks === void 0 ? void 0 : stacks.length) > 0 && isTabBar) {
-                  routerIndex = stacks.findIndex(function (r) {
-                    var _a;
+              if (!(_prevIndex > -1)) {
+                _context.next = 42;
+                break;
+              }
 
-                    return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
-                  });
-                }
+              return _context.abrupt("return", showPage(stacks.getItem(_prevIndex), pageConfig, _prevIndex));
+
+            case 42:
+              _context.next = 45;
+              break;
 
-                routerIndex = (routerIndex || routerIndex === 0) && routerIndex !== -1 ? routerIndex : stacks.length;
-                page = runtime.createPageConfig(enablePullDownRefresh ? (_e = runtimeHooks.createPullDownComponent) === null || _e === void 0 ? void 0 : _e.call(runtimeHooks, el, location.pathname, framework, routerConfig.PullDownRefresh) : el, pathname + runtime.stringify(qs(routerIndex)), {}, _config);
-                loadPage(page, pageConfig, routerIndex);
+            case 44:
+              unloadPage(currentPage);
+
+            case 45:
+              shouldLoad = true;
+
+            case 46:
+              if (!shouldLoad) {
+                _context.next = 54;
+                break;
               }
 
-            case 24:
+              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();
           }
@@ -2936,13 +3108,13 @@ function createRouter(app, config, framework) {
       }, _callee, null, [[2, 8]]);
     }));
 
-    return function (_x) {
-      return _ref2.apply(this, arguments);
+    return function render(_x3) {
+      return _ref4.apply(this, arguments);
     };
-  }(), 500);
+  }();
 
   if (exports.history.location.pathname === '/') {
-    exports.history.replace(parsePath(routes[0].path + exports.history.location.search));
+    exports.history.replace(prependBasename(routes[0].path + exports.history.location.search));
   }
 
   render({
@@ -2953,7 +3125,7 @@ function createRouter(app, config, framework) {
   return exports.history.listen(render);
 }
 
-function shouleBeObject(target) {
+function shouldBeObject(target) {
   if (target && _typeof$1(target) === 'object') return {
     res: true
   };
@@ -3291,7 +3463,7 @@ var initPxTransform = getInitPxTransform$1(taro);
 var requirePlugin = permanentlyNotSupport('requirePlugin');
 
 var getApp = function getApp() {
-  return taro._$app;
+  return getCurrentInstance().app;
 };
 
 var pxTransform = function pxTransform(size) {
@@ -4311,7 +4483,7 @@ var createCanvasContext = function createCanvasContext(canvasId, inst) {
 
 function setStorage(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -4380,7 +4552,7 @@ function setStorageSync(key) {
 
 function getStorage(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res2 = {
@@ -4488,7 +4660,7 @@ function getStorageInfoSync() {
 
 function removeStorage(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res3 = {
@@ -6055,7 +6227,7 @@ var uploadFile = function uploadFile(_ref2) {
 
 var chooseImage = function chooseImage(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -6306,11 +6478,14 @@ function _previewImage() {
 function loadImage(url, fail) {
   return new Promise(function (resolve) {
     var item = document.createElement('taro-swiper-item-core');
-    item.style.cssText = "\n      display: flex;\n      align-items: center;\n      justify-content: center;\n    ";
+    item.style.cssText = "\n      display: flex;\n      align-items: start;\n      justify-content: center;\n      overflow-y: scroll;\n    ";
     var image = new Image();
     image.style.maxWidth = '100%';
     image.src = url;
-    item.appendChild(image); // Note: 等待图片加载完后返回，会导致轮播被卡住
+    var div = document.createElement('div');
+    div.style.cssText = "\n      display: flex;\n      align-items: center;\n      justify-content: center;\n      max-width: 100%;\n      min-height: 100%;\n    ";
+    div.appendChild(image);
+    item.appendChild(div); // Note: 等待图片加载完后返回，会导致轮播被卡住
 
     resolve(item);
 
@@ -7494,7 +7669,7 @@ var openLocation = processOpenapi('openLocation', {
 
 function setNavigationBarTitle(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -7678,7 +7853,7 @@ function base64ToArrayBuffer(base64) {
 }
 function makePhoneCall(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -10251,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 某一项的右上角添加文本
@@ -10271,7 +10443,7 @@ function initTabBarApis() {
 function setTabBarBadge() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -10318,7 +10490,6 @@ function setTabBarBadge() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 移除 tabBar 某一项右上角的文本
@@ -10332,7 +10503,7 @@ function setTabBarBadge() {
 function removeTabBarBadge() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res2 = {
@@ -10366,7 +10537,6 @@ function removeTabBarBadge() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 显示 tabBar 某一项的右上角的红点
@@ -10380,7 +10550,7 @@ function removeTabBarBadge() {
 function showTabBarRedDot() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res3 = {
@@ -10414,7 +10584,6 @@ function showTabBarRedDot() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 隐藏 tabBar 某一项的右上角的红点
@@ -10428,7 +10597,7 @@ function showTabBarRedDot() {
 function hideTabBarRedDot() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res4 = {
@@ -10462,7 +10631,6 @@ function hideTabBarRedDot() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 显示 tabBar
@@ -10476,7 +10644,7 @@ function hideTabBarRedDot() {
 function showTabBar() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res5 = {
@@ -10510,7 +10678,6 @@ function showTabBar() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 隐藏 tabBar
@@ -10524,7 +10691,7 @@ function showTabBar() {
 function hideTabBar() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res6 = {
@@ -10558,7 +10725,6 @@ function hideTabBar() {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   });
-  return successHandler(success, complete)(res);
 }
 /**
  * 动态设置 tabBar 的整体样式
@@ -10575,7 +10741,7 @@ function hideTabBar() {
 function setTabBarStyle() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res7 = {
@@ -10616,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 某一项的内容
@@ -10643,7 +10806,7 @@ function setTabBarStyle() {
 function setTabBarItem() {
   var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res8 = {
@@ -10675,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) {
@@ -10769,7 +10925,7 @@ var vibrateLong = function vibrateLong() {
 
 function chooseVideo(options) {
   // options must be an Object
-  var isObject = shouleBeObject(options);
+  var isObject = shouldBeObject(options);
 
   if (!isObject.res) {
     var _res = {
@@ -10968,7 +11124,7 @@ function connectSocket(options) {
   var name = 'connectSocket';
   return new Promise(function (resolve, reject) {
     // options must be an Object
-    var isObject = shouleBeObject(options);
+    var isObject = shouldBeObject(options);
 
     if (!isObject.res) {
       var _res = {