@tarojs/taro-h5 3.3.14 → 3.5.0-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "3.3.14",
+  "version": "3.5.0-canary.0",
   "description": "Taro h5 framework",
   "main:h5": "src/index.js",
   "main": "dist/index.cjs.js",
@@ -33,17 +33,13 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/api": "3.3.14",
-    "@tarojs/router": "3.3.14",
-    "@tarojs/runtime": "3.3.14",
+    "@tarojs/api": "3.5.0-canary.0",
+    "@tarojs/router": "3.5.0-canary.0",
+    "@tarojs/runtime": "3.5.0-canary.0",
     "base64-js": "^1.3.0",
     "jsonp-retry": "^1.0.3",
     "mobile-detect": "^1.4.2",
-    "raf": "^3.4.1",
     "whatwg-fetch": "^3.4.0"
   },
-  "devDependencies": {
-    "jest-fetch-mock": "^3.0.3"
-  },
-  "gitHead": "ffd2b33c2a760094372a9ec69735ab9c4d1877e5"
+  "gitHead": "a0222bc41bc05b0e34413d6db3de963d777a5015"
 }

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)
+  })
 }

package/src/taro/index.js

@@ -25,22 +25,7 @@ const {
   nextTick,
   eventCenter,
   Events,
-  preload,
-  useDidShow,
-  useDidHide,
-  usePullDownRefresh,
-  useReachBottom,
-  usePageScroll,
-  useResize,
-  useShareAppMessage,
-  useTabItemTap,
-  useTitleClick,
-  useOptionMenuClick,
-  usePullIntercept,
-  useShareTimeline,
-  useAddToFavorites,
-  useReady,
-  useRouter
+  preload
 } = Taro
 
 const taro = {
@@ -63,22 +48,7 @@ const taro = {
   reLaunch,
   redirectTo,
   getCurrentPages,
-  switchTab,
-  useDidShow,
-  useDidHide,
-  usePullDownRefresh,
-  useReachBottom,
-  usePageScroll,
-  useResize,
-  useShareAppMessage,
-  useTabItemTap,
-  useTitleClick,
-  useOptionMenuClick,
-  usePullIntercept,
-  useShareTimeline,
-  useAddToFavorites,
-  useReady,
-  useRouter
+  switchTab
 }
 
 const initPxTransform = getInitPxTransform(taro)
@@ -130,20 +100,5 @@ export {
   reLaunch,
   redirectTo,
   getCurrentPages,
-  switchTab,
-  useDidShow,
-  useDidHide,
-  usePullDownRefresh,
-  useReachBottom,
-  usePageScroll,
-  useResize,
-  useShareAppMessage,
-  useTabItemTap,
-  useTitleClick,
-  useOptionMenuClick,
-  usePullIntercept,
-  useShareTimeline,
-  useAddToFavorites,
-  useReady,
-  useRouter
+  switchTab
 }