fix: android crash when rendering a ScrollView component

react95-io · Dec 22, 2020 · c6b7e87 · c6b7e87
1 parent b08115d
commit c6b7e87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/Button/Button.tsx b/src/Button/Button.tsx
@@ -98,9 +98,13 @@ const Button = ({
         accessibilityLabel={accessibilityLabel}
       >
         <View pointerEvents='none'>
-          <Text disabled={!isFlat && disabled} secondary={isFlat && disabled}>
-            {children}
-          </Text>
+          {typeof children === 'string' ? (
+            <Text disabled={!isFlat && disabled} secondary={isFlat && disabled}>
+              {children}
+            </Text>
+          ) : (
+            children
+          )}
         </View>
       </TouchableHighlight>
     </View>
@@ -174,11 +178,11 @@ const Borders = ({
         style,
       ]}
     >
-      {outer && (
+      {Array.isArray(outer) && (
         <View style={[borderStyles.position, ...outer]}>
-          {inner && inner.length > 0 && (
+          {Array.isArray(inner) && inner.length > 0 && (
             <View style={[borderStyles.position, ...inner]}>
-              {focus && !active && (
+              {Array.isArray(focus) && !active && (
                 <View
                   style={[
                     borderStyles.position,

diff --git a/src/ScrollView/ScrollView.tsx b/src/ScrollView/ScrollView.tsx
@@ -177,8 +177,6 @@ const ScrollView = ({
   );
 };
 
-export default ScrollView;
-
 const styles = StyleSheet.create({
   wrapper: {
     display: 'flex',
@@ -214,3 +212,5 @@ const styles = StyleSheet.create({
     width: '100%',
   },
 });
+
+export default ScrollView;