@tarojs/taro-h5 3.3.12 → 3.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.12",
+  "version": "3.3.16",
   "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.16",
+    "@tarojs/router": "3.3.16",
+    "@tarojs/runtime": "3.3.16",
     "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": "75d3de695c98fab79998612ef87567a68ea981a7"
 }

package/src/api/image/chooseImage.js

@@ -1,4 +1,4 @@
-import { shouleBeObject, getParameterError } from '../utils'
+import { shouldBeObject, getParameterError } from '../utils'
 
 /**
  * 从本地相册选择图片或使用相机拍照。
@@ -13,7 +13,7 @@ import { shouleBeObject, getParameterError } from '../utils'
  */
 const chooseImage = function (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `chooseImage${isObject.msg}` }
     console.error(res.errMsg)

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/api/navigationBar/index.js

@@ -1,8 +1,8 @@
-import { shouleBeObject, getParameterError } from '../utils'
+import { shouldBeObject, getParameterError } from '../utils'
 
 export function setNavigationBarTitle (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `setNavigationBarTitle${isObject.msg}` }
     console.error(res.errMsg)

package/src/api/others/index.js

@@ -1,5 +1,5 @@
 import { fromByteArray, toByteArray } from 'base64-js'
-import { shouleBeObject, getParameterError } from '../utils'
+import { shouldBeObject, getParameterError } from '../utils'
 
 export function arrayBufferToBase64 (arrayBuffer) {
   return fromByteArray(arrayBuffer)
@@ -11,7 +11,7 @@ export function base64ToArrayBuffer (base64) {
 
 export function makePhoneCall (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `makePhoneCall${isObject.msg}` }
     console.error(res.errMsg)

package/src/api/storage/index.js

@@ -1,8 +1,8 @@
-import { shouleBeObject, getParameterError } from '../utils'
+import { shouldBeObject, getParameterError } from '../utils'
 
 function setStorage (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `setStorage${isObject.msg}` }
     console.error(res.errMsg)
@@ -56,7 +56,7 @@ function setStorageSync (key, data = '') {
 
 function getStorage (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `getStorage${isObject.msg}` }
     console.error(res.errMsg)
@@ -149,7 +149,7 @@ function getStorageInfoSync () {
 
 function removeStorage (options) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `removeStorage${isObject.msg}` }
     console.error(res.errMsg)

package/src/api/tabBar/index.js

@@ -1,12 +1,10 @@
 import Taro from '@tarojs/api'
-import { shouleBeObject, getParameterError, isValidColor, successHandler, errorHandler } from '../utils'
+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
 }
 
 /**
@@ -20,7 +18,7 @@ export function initTabBarApis (_App = {}) {
  */
 export function setTabBarBadge (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `setTabBarBadge${isObject.msg}` }
     console.error(res.errMsg)
@@ -64,8 +62,6 @@ export function setTabBarBadge (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -78,7 +74,7 @@ export function setTabBarBadge (options = {}) {
  */
 export function removeTabBarBadge (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `removeTabBarBadge${isObject.msg}` }
     console.error(res.errMsg)
@@ -109,8 +105,6 @@ export function removeTabBarBadge (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -123,7 +117,7 @@ export function removeTabBarBadge (options = {}) {
  */
 export function showTabBarRedDot (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `showTabBarRedDot${isObject.msg}` }
     console.error(res.errMsg)
@@ -154,8 +148,6 @@ export function showTabBarRedDot (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -168,7 +160,7 @@ export function showTabBarRedDot (options = {}) {
  */
 export function hideTabBarRedDot (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `hideTabBarRedDot${isObject.msg}` }
     console.error(res.errMsg)
@@ -199,8 +191,6 @@ export function hideTabBarRedDot (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(fail, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -213,7 +203,7 @@ export function hideTabBarRedDot (options = {}) {
  */
 export function showTabBar (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `showTabBar${isObject.msg}` }
     console.error(res.errMsg)
@@ -245,8 +235,6 @@ export function showTabBar (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -259,7 +247,7 @@ export function showTabBar (options = {}) {
  */
 export function hideTabBar (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `hideTabBar${isObject.msg}` }
     console.error(res.errMsg)
@@ -291,8 +279,6 @@ export function hideTabBar (options = {}) {
     successHandler: successHandler(success, complete),
     errorHandler: errorHandler(success, complete)
   })
-
-  return successHandler(success, complete)(res)
 }
 
 /**
@@ -308,7 +294,7 @@ export function hideTabBar (options = {}) {
  */
 export function setTabBarStyle (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `setTabBarStyle${isObject.msg}` }
     console.error(res.errMsg)
@@ -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)
+  })
 }
 
 /**
@@ -372,7 +362,7 @@ export function setTabBarStyle (options = {}) {
  */
 export function setTabBarItem (options = {}) {
   // options must be an Object
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `setTabBarItem${isObject.msg}` }
     console.error(res.errMsg)
@@ -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)
+  })
 }

package/src/api/utils/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable prefer-promise-reject-errors */
 import { Current, container, SERVICE_IDENTIFIER } from '@tarojs/runtime'
 
-function shouleBeObject (target) {
+function shouldBeObject (target) {
   if (target && typeof target === 'object') return { res: true }
   return {
     res: false,
@@ -229,7 +229,7 @@ const getTimingFunc = (easeFunc, frameCnt) => {
 }
 
 export {
-  shouleBeObject,
+  shouldBeObject,
   getParameterError,
   inlineStyle,
   setTransform,

package/src/api/video/index.js

@@ -1,4 +1,4 @@
-import { shouleBeObject, getParameterError, findDOM } from '../utils'
+import { shouldBeObject, getParameterError, findDOM } from '../utils'
 
 /**
  * @typedef {Object} ChooseVideoParam
@@ -18,7 +18,7 @@ import { shouleBeObject, getParameterError, findDOM } from '../utils'
 export function chooseVideo (options) {
   // options must be an Object
 
-  const isObject = shouleBeObject(options)
+  const isObject = shouldBeObject(options)
   if (!isObject.res) {
     const res = { errMsg: `chooseVideo${isObject.msg}` }
     console.error(res.errMsg)

package/src/api/webSocket/index.js

@@ -1,5 +1,5 @@
 import SocketTask from './socketTask'
-import { shouleBeObject, getParameterError } from '../utils'
+import { shouldBeObject, getParameterError } from '../utils'
 
 let socketTasks = []
 let socketsCounter = 1
@@ -9,7 +9,7 @@ function connectSocket (options) {
 
   return new Promise((resolve, reject) => {
     // options must be an Object
-    const isObject = shouleBeObject(options)
+    const isObject = shouldBeObject(options)
     if (!isObject.res) {
       const res = { errMsg: `${name}${isObject.msg}` }
       console.error(res.errMsg)

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) {