@tarojs/taro-h5 3.3.12 → 3.3.13

package/dist/index.cjs.js

@@ -919,7 +919,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 +1106,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()
     }));
@@ -1326,47 +1334,58 @@ function processNavigateUrl(option) {
   return pathPieces;
 }
 
-function navigate(option, method) {
-  var success = option.success,
-      complete = option.complete,
-      fail = option.fail;
-  var failReason;
-
-  try {
-    if ('url' in option) {
-      var pathPieces = processNavigateUrl(option);
-      var state = {
-        timestamp: Date.now()
-      };
+function navigate(_x, _x2) {
+  return _navigate.apply(this, arguments);
+}
 
-      if (method === 'navigateTo') {
-        exports.history.push(pathPieces, state);
-      } else if (method === 'redirectTo') {
-        exports.history.replace(pathPieces, state);
-      }
-    } 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') {
+                  setHistoryBackDelta(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) {
@@ -3000,7 +3019,7 @@ function createRouter(app, config, framework) {
       }, _callee, null, [[2, 8]]);
     }));
 
-    return function (_x) {
+    return function (_x3) {
       return _ref4.apply(this, arguments);
     };
   }(), 500);
@@ -3355,7 +3374,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) {
@@ -6370,11 +6389,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);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.12",
+  "version": "3.3.13",
   "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.12",
-    "@tarojs/router": "3.3.12",
-    "@tarojs/runtime": "3.3.12",
+    "@tarojs/api": "3.3.13",
+    "@tarojs/router": "3.3.13",
+    "@tarojs/runtime": "3.3.13",
     "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": "0d7650ee4263efafacd87b9c8b69bb29b2a852c0"
+  "gitHead": "d84177a97cc27c01ca63c9dd07e5ab5bbaa91d8a"
 }

package/src/api/image/previewImage.js

@@ -1,4 +1,3 @@
-
 /**
  * 在新页面中全屏预览图片。预览的过程中用户可以进行保存图片、发送给朋友等操作。
  * @param {Object} options
@@ -67,13 +66,23 @@ function loadImage (url, fail) {
     const item = document.createElement('taro-swiper-item-core')
     item.style.cssText = `
       display: flex;
-      align-items: center;
+      align-items: start;
       justify-content: center;
+      overflow-y: scroll;
     `
     const image = new Image()
     image.style.maxWidth = '100%'
     image.src = url
-    item.appendChild(image)
+    const div = document.createElement('div')
+    div.style.cssText = `
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      max-width: 100%;
+      min-height: 100%;
+    `
+    div.appendChild(image)
+    item.appendChild(div)
     // Note: 等待图片加载完后返回，会导致轮播被卡住
     resolve(item)
     if (typeof fail === 'function') {

package/src/taro/index.js

@@ -85,7 +85,7 @@ const initPxTransform = getInitPxTransform(taro)
 
 const requirePlugin = permanentlyNotSupport('requirePlugin')
 const getApp = function () {
-  return taro._$app
+  return getCurrentInstance().app
 }
 
 const pxTransform = function (size) {