diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index d7a4ec6..23a51ba 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/example/package.json b/example/package.json index cccf876..e7f0f25 100644 --- a/example/package.json +++ b/example/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@expo/metro-runtime": "~4.0.0", - "@expo/vector-icons": "^13.0.0", + "@expo/vector-icons": "^14.0.4", "expo": "~52.0.23", "expo-build-properties": "~0.13.1", "expo-status-bar": "~2.0.0", diff --git a/src/MaterialCommunityIcon.tsx b/src/MaterialCommunityIcon.tsx index 2fedfe2..6e74884 100644 --- a/src/MaterialCommunityIcon.tsx +++ b/src/MaterialCommunityIcon.tsx @@ -1,4 +1,4 @@ -import { StyleSheet, Animated } from 'react-native'; +import { Animated } from 'react-native'; let MaterialCommunityIcons: any; @@ -39,27 +39,4 @@ try { }; } -const defaultIcon = ({ name, color, size, style, ...rest }: any) => ( - -); - -const styles = StyleSheet.create({ - icon: { - backgroundColor: 'transparent', - }, -}); - -export default defaultIcon; +export default MaterialCommunityIcons; diff --git a/src/TabsHeaderItem.tsx b/src/TabsHeaderItem.tsx index 0e5fb17..eaf89c8 100644 --- a/src/TabsHeaderItem.tsx +++ b/src/TabsHeaderItem.tsx @@ -115,14 +115,30 @@ export default function TabsHeaderItem({ iconPosition !== 'top' && styles.marginRight, ]} > - + {/*BB*/} + {tab.props.icon ? ( + Platform.OS === 'android' ? ( + + + + ) : ( + + ) + ) : null} ) : null} {badgeIsFilled ? ( diff --git a/src/internal.native.ts b/src/internal.native.ts index 490060b..d03b860 100644 --- a/src/internal.native.ts +++ b/src/internal.native.ts @@ -25,7 +25,7 @@ export function useAnimatedText({ color: childrenA.length <= 1 ? activeColor - : positionWithOffset.interpolate({ + : positionWithOffset!.interpolate({ inputRange: inputRange, outputRange: childrenA.map((_, i) => i === tabIndex ? activeColor : textColor diff --git a/yarn.lock b/yarn.lock index f62bd4c..d398ccd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2272,7 +2272,7 @@ __metadata: languageName: node linkType: hard -"@expo/vector-icons@npm:^14.0.0": +"@expo/vector-icons@npm:^14.0.0, @expo/vector-icons@npm:^14.0.4": version: 14.0.4 resolution: "@expo/vector-icons@npm:14.0.4" dependencies: @@ -11914,7 +11914,7 @@ __metadata: dependencies: "@babel/core": ^7.20.0 "@expo/metro-runtime": ~4.0.0 - "@expo/vector-icons": ^13.0.0 + "@expo/vector-icons": ^14.0.4 expo: ~52.0.23 expo-build-properties: ~0.13.1 expo-status-bar: ~2.0.0