Merge pull request #1 from kenhkelly/no-activity-loader-onerror

kenhkelly · web-flow · commit 6dca1e270889 · 2017-11-01T15:44:49.000-04:00
Add check on ActivityIndicator to remove the indicator if an error oc…
diff --git a/index.js b/index.js
@@ -52,7 +52,7 @@ class ImageLoad extends React.Component {
             style={[styles.viewImageStyles, { borderRadius: borderRadius }, backgroundColor ? { backgroundColor: backgroundColor } : {}]}
           >
             {
-              this.props.isShowActivity &&
+              (this.props.isShowActivity && !this.state.isError) &&
               <ActivityIndicator
                 style={styles.activityIndicator}
                 size={loadingStyle ? loadingStyle.size : 'small'}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class ImageLoad extends React.Component {`
`52`	`52`	`style={[styles.viewImageStyles, { borderRadius: borderRadius }, backgroundColor ? { backgroundColor: backgroundColor } : {}]}`
`53`	`53`	`>`
`54`	`54`	`{`
`55`		`- this.props.isShowActivity &&`
	`55`	`+ (this.props.isShowActivity && !this.state.isError) &&`
`56`	`56`	`<ActivityIndicator`
`57`	`57`	`style={styles.activityIndicator}`
`58`	`58`	`size={loadingStyle ? loadingStyle.size : 'small'}`