fix yarn lock file

flyingcircle · Mar 14, 2021 · d3341cc · d3341cc
2 parents df96b21 + c049e00
commit d3341cc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/src/buttons/Button.tsx b/src/buttons/Button.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useCallback, useEffect } from 'react';
 import {
   View,
   Text,
@@ -54,26 +54,18 @@ export type ButtonProps = TouchableOpacityProps &
   };
 
 const Button: React.FunctionComponent<ButtonProps> = (props: ButtonProps) => {
-  if (props.linearGradientProps && !props.ViewComponent) {
-    console.error(
-      "You need to pass a ViewComponent to use linearGradientProps !\nExample: ViewComponent={require('react-native-linear-gradient')}"
-    );
-  }
-
-  const handleOnPress = (evt) => {
-    const {
-      loading,
-      onPress = () => console.log('Please attach a method to this component'),
-    } = props;
-    if (!loading) {
-      onPress(evt);
+  useEffect(() => {
+    if (props.linearGradientProps && !props.ViewComponent) {
+      console.error(
+        "You need to pass a ViewComponent to use linearGradientProps !\nExample: ViewComponent={require('react-native-linear-gradient')}"
+      );
     }
-  };
+  });
 
   const {
     TouchableComponent,
     containerStyle,
-    onPress,
+    onPress = () => console.log('Please attach a method to this component'),
     buttonStyle,
     type = 'solid',
     loading = false,
@@ -95,6 +87,15 @@ const Button: React.FunctionComponent<ButtonProps> = (props: ButtonProps) => {
     ...attributes
   } = props;
 
+  const handleOnPress = useCallback(
+    (evt) => {
+      if (!loading) {
+        onPress(evt);
+      }
+    },
+    [loading, onPress]
+  );
+
   // Refactor to Pressable
   const TouchableComponentInternal =
     TouchableComponent ||

diff --git a/src/social/SocialIcon.tsx b/src/social/SocialIcon.tsx
@@ -134,6 +134,8 @@ const SocialIcon: React.FunctionComponent<SocialIconProps> = (props) => {
     ...attributes
   } = props;
 
+  const shouldShowExpandedButton = button && title;
+
   return (
     <Component
       {...attributes}
@@ -159,14 +161,18 @@ const SocialIcon: React.FunctionComponent<SocialIconProps> = (props) => {
       ])}
     >
       <View style={styles.wrapper}>
-        <Icon
+        {
+          (shouldShowExpandedButton || !loading) &&
+          <Icon
+          //@ts-ignore
           iconStyle={StyleSheet.flatten([iconStyle && iconStyle])}
           color={light ? colors[type] : iconColor}
           name={type}
           size={iconSize}
           type={iconType}
-        />
-        {button && title && (
+          />
+        }
+        {shouldShowExpandedButton && (
           <Text
             //@ts-ignore
             style={StyleSheet.flatten([
@@ -188,7 +194,7 @@ const SocialIcon: React.FunctionComponent<SocialIconProps> = (props) => {
               styles.activityIndicatorStyle,
               activityIndicatorStyle,
             ])}
-            color={light ? iconColor : 'white'}
+            color={light ? colors[type] : iconColor}
             size={(small && 'small') || 'large'}
           />
         )}