fix: icon rendering and touchable on android issue

enesozturk · Jul 19, 2022 · f9b98fa · f9b98fa
1 parent 8bc071e
commit f9b98fa
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/components/menu/MenuItem.tsx b/src/components/menu/MenuItem.tsx
@@ -1,22 +1,20 @@
 import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
-import { TouchableOpacity as GHTouchableOpacity } from 'react-native-gesture-handler';
 import Animated, { useAnimatedStyle } from 'react-native-reanimated';
 
 import Separator from './Separator';
 import styles from './styles';
 
 import { MenuItemProps } from './types';
 import { useInternal } from '../../hooks';
-import { CONTEXT_MENU_STATE, IS_IOS } from '../../constants';
+import { CONTEXT_MENU_STATE } from '../../constants';
 import { BORDER_LIGHT_COLOR, BORDER_DARK_COLOR } from './constants';
 import isEqual from 'lodash.isequal';
 import { getColor } from './calculations';
 import { AnimatedIcon } from '../provider/Provider';
 
-const ItemComponent = IS_IOS ? TouchableOpacity : GHTouchableOpacity;
 // @ts-ignore
-const AnimatedTouchable = Animated.createAnimatedComponent(ItemComponent);
+const AnimatedTouchable = Animated.createAnimatedComponent(TouchableOpacity);
 
 type MenuItemComponentProps = {
   item: MenuItemProps;
@@ -64,9 +62,14 @@ const MenuItemComponent = ({ item, isLast }: MenuItemComponentProps) => {
         >
           {item.text}
         </Animated.Text>
-        {!item.isTitle && item.icon && (
-          <AnimatedIcon name={item.icon} size={18} style={textColor} />
-        )}
+        {!item.isTitle &&
+          item.icon &&
+          AnimatedIcon &&
+          (typeof item.icon === 'string' ? (
+            <AnimatedIcon name={item.icon} size={18} style={textColor} />
+          ) : (
+            item.icon()
+          ))}
       </AnimatedTouchable>
       {item.withSeparator && <Separator />}
     </>