@tarojs/router-rn 3.4.0 → 3.4.3

package/src/view/TabBar.tsx

@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-use-before-define
 import * as React from 'react'
 import {
   Link
@@ -12,7 +11,8 @@ import {
   Platform,
   Dimensions,
   LayoutChangeEvent,
-  Keyboard
+  Keyboard,
+  EmitterSubscription
 } from 'react-native'
 import { getTabVisible, getTabConfig, getTabItemConfig, getDefalutTabItem, isUrl } from '../utils/index'
 import { getInitSafeAreaInsets } from './tabBarUtils'
@@ -22,7 +22,7 @@ interface TabBarProps extends TabBarOptions {
   state: Record<string, any>,
   navigation: any,
   descriptors: Record<string, any>,
-  userOptions: TabOptions
+  tabOptions: TabOptions
 }
 
 interface TabBarState {
@@ -71,11 +71,13 @@ const styles = StyleSheet.create({
 })
 
 export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
+  handleKeyboardShowEvent: EmitterSubscription
+  handleKeyboardHideEvent: EmitterSubscription
   constructor (props: TabBarProps) {
     super(props)
     const { height = 0, width = 0 } = Dimensions.get('window')
-    const { safeAreaInsets, userOptions = {} } = this.props
-    const { tabBarVisible = true } = userOptions
+    const { safeAreaInsets, tabOptions = {} } = this.props
+    const { tabBarVisible = true } = tabOptions
     const tabVisible = tabBarVisible === false ? false : getTabVisible()
     this.state = {
       visible: new Animated.Value(tabVisible ? 1 : 0),
@@ -93,11 +95,11 @@ export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
     const { keyboardHidesTabBar = false } = this.props
     if (keyboardHidesTabBar) {
       if (Platform.OS === 'ios') {
-        Keyboard.addListener('keyboardWillShow', () => this.handleKeyboardShow())
-        Keyboard.addListener('keyboardWillHide', () => this.handleKeyboardHide())
+        this.handleKeyboardShowEvent = Keyboard.addListener('keyboardWillShow', () => this.handleKeyboardShow())
+        this.handleKeyboardHideEvent = Keyboard.addListener('keyboardWillHide', () => this.handleKeyboardHide())
       } else {
-        Keyboard.addListener('keyboardDidShow', () => this.handleKeyboardShow())
-        Keyboard.addListener('keyboardDidHide', () => this.handleKeyboardHide())
+        this.handleKeyboardShowEvent = Keyboard.addListener('keyboardDidShow', () => this.handleKeyboardShow())
+        this.handleKeyboardHideEvent = Keyboard.addListener('keyboardDidHide', () => this.handleKeyboardHide())
       }
     }
   }
@@ -105,13 +107,8 @@ export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
   componentWillUnmount () {
     const { keyboardHidesTabBar = false } = this.props
     if (keyboardHidesTabBar) {
-      if (Platform.OS === 'ios') {
-        Keyboard.removeListener('keyboardWillShow', () => this.handleKeyboardShow())
-        Keyboard.removeListener('keyboardWillHide', () => this.handleKeyboardHide())
-      } else {
-        Keyboard.removeListener('keyboardDidShow', () => this.handleKeyboardShow())
-        Keyboard.removeListener('keyboardDidHide', () => this.handleKeyboardHide())
-      }
+      this.handleKeyboardShowEvent.remove()
+      this.handleKeyboardHideEvent.remove()
     }
   }
 
@@ -229,7 +226,6 @@ export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
     return isUrl(path) ? { uri: path } : { uri: path }
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   renderContent () {
     const { state, descriptors, navigation } = this.props
     const horizontal = true
@@ -336,7 +332,6 @@ export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
     </View>
   }
 
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   render () {
     const { insets, visible, layout, tabVisible, isKeyboardShown } = this.state
     const paddingBottom = Math.max(
@@ -349,7 +344,6 @@ export class TabBar extends React.PureComponent<TabBarProps, TabBarState> {
 
     const showTabBar = tabVisible !== false && !isKeyboardShown
     if (!needAnimate) {
-      // eslint-disable-next-line multiline-ternary
       return (!showTabBar ? null
         : (
           <View

package/src/view/TabBarItem.tsx

@@ -1,4 +1,3 @@
-// eslint-disable-next-line no-use-before-define
 import * as React from 'react'
 import {
   View,
@@ -38,7 +37,7 @@ interface TabBarItemProps extends TabBarOptions{
   labelColor: string,
   iconSource: ImageSourcePropType
   size?: number,
-  userOptions?: TabOptions
+  tabOptions?: TabOptions
 }
 
 const styles = StyleSheet.create({
@@ -97,7 +96,6 @@ const styles = StyleSheet.create({
 })
 
 export default class TabBarItem extends React.PureComponent<TabBarItemProps> {
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
   render () {
     const {
       label,
@@ -107,13 +105,13 @@ export default class TabBarItem extends React.PureComponent<TabBarItemProps> {
       size = 20,
       labelColor,
       iconSource,
-      userOptions,
+      tabOptions,
       tabStyle = {},
       labelStyle = {},
       allowFontScaling = true,
       showLabel = true
     } = this.props
-    const tabBarBadgeStyle = userOptions?.tabBarBadgeStyle || {}
+    const tabBarBadgeStyle = tabOptions?.tabBarBadgeStyle || {}
     return (
       <View style={[styles.tabItem, styles.itemHorizontal, tabStyle]}>
         <View style={styles.icon}>