@tarojs/taro-h5 3.3.7 → 3.3.11

package/dist/index.cjs.js

@@ -2813,7 +2813,7 @@ function createRouter(app, config, framework) {
   app.onLaunch();
   var render = throttle( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref) {
-      var location, action, _a, _b, _c, _d, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, el, _config, pathname, page;
+      var location, action, _a, _b, _c, _d, _e, element, pageConfig, enablePullDownRefresh, shouldLoad, delta, prevIndex, prev, el, _config, pathname, routerIndex, isTabBar, page;
 
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -2909,8 +2909,23 @@ function createRouter(app, config, framework) {
                 delete _config['path'];
                 delete _config['load'];
                 pathname = basename ? location.pathname.replace(basename, '') : location.pathname;
-                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(stacks.length)), {}, _config);
-                loadPage(page, pageConfig, stacks.length);
+                isTabBar = (_d = routerConfig.tabBar) === null || _d === void 0 ? void 0 : _d.list.some(function (TabBarItem) {
+                  var _a;
+
+                  return ((_a = TabBarItem.pagePath) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+                });
+
+                if ((stacks === null || stacks === void 0 ? void 0 : stacks.length) > 0 && isTabBar) {
+                  routerIndex = stacks.findIndex(function (r) {
+                    var _a;
+
+                    return ((_a = r.path) === null || _a === void 0 ? void 0 : _a.replace(/\?.*/g, '')) === pathname;
+                  });
+                }
+
+                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 24:
@@ -5168,7 +5183,9 @@ var Animation = /*#__PURE__*/function () {
           _arg$transformOrigin = arg.transformOrigin,
           transformOrigin = _arg$transformOrigin === void 0 ? DEFAULT.transformOrigin : _arg$transformOrigin; // 生成一条 transition 动画
 
-      this.steps.push([this.rules.join(';'), this.transform.join(' '), "".concat(TRANSFORM, "-origin: ").concat(transformOrigin), "transition: all ".concat(duration, "ms ").concat(timingFunction, " ").concat(delay, "ms")].filter(function (item) {
+      this.steps.push([this.rules.map(function (rule) {
+        return "".concat(rule, "!important");
+      }).join(';'), "".concat(this.transform.join(' '), "!important"), "".concat(TRANSFORM, "-origin: ").concat(transformOrigin), "transition: all ".concat(duration, "ms ").concat(timingFunction, " ").concat(delay, "ms")].filter(function (item) {
         return item !== '' && item !== "".concat(TRANSFORM, ":");
       }).join(';')); // 清空 rules 和 transform
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.7",
+  "version": "3.3.11",
   "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.7",
-    "@tarojs/router": "3.3.7",
-    "@tarojs/runtime": "3.3.7",
+    "@tarojs/api": "3.3.11",
+    "@tarojs/router": "3.3.11",
+    "@tarojs/runtime": "3.3.11",
     "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": "d55c613cece0a767e8e733188353b4e4e800f029"
+  "gitHead": "dad3664e58bb1fe7ab752365d9cc0d0dd444c40a"
 }

package/src/api/createAnimation/index.js

@@ -295,8 +295,8 @@ class Animation {
     // 生成一条 transition 动画
     this.steps.push(
       [
-        this.rules.join(';'),
-        this.transform.join(' '),
+        this.rules.map(rule => `${rule}!important`).join(';'),
+        `${this.transform.join(' ')}!important`,
         `${TRANSFORM}-origin: ${transformOrigin}`,
         `transition: all ${duration}ms ${timingFunction} ${delay}ms`
       ]