Merge branch 'master' of github.com:wix/react-native-ui-lib

Author: Inbal-Tish

src/components/card/CardSection.tsx

@@ -36,7 +36,7 @@ export type CardSectionProps = ViewProps & {
    * Will be used for the background when provided
    */
   imageSource?: ImageSourcePropType;
-  source?: ImageSourcePropType;
+  source?: ImageSourcePropType; // TODO: remove after deprecation
   /**
    * The style for the background image
    */
@@ -60,7 +60,7 @@ class CardSection extends PureComponent<Props> {
     super(props);
 
     if (props.imageSource) {
-      LogService.deprecationWarn({component: 'CardSection', oldProp: 'imageSource', newProp: 'source'});
+      LogService.deprecationWarn({component: 'CardSection', oldProp: 'source', newProp: 'imageSource'});
     }
   }
 
@@ -89,7 +89,7 @@ class CardSection extends PureComponent<Props> {
 
   renderImage = () => {
     const {source, imageSource, imageStyle, imageProps, testID} = this.props;
-    const finalSource = source || imageSource;
+    const finalSource = imageSource || source;
 
     // not actually needed, instead of adding ts-ignore
     if (finalSource) {
@@ -113,7 +113,7 @@ class CardSection extends PureComponent<Props> {
       style,
       ...others
     } = this.props;
-    const finalSource = source || imageSource;
+    const finalSource = imageSource || source;
 
     return (
       <View style={[styles.container, borderStyle, style]} {...others}>

src/components/radioButton/RadioButton.tsx

@@ -258,8 +258,8 @@ class RadioButton extends PureComponent<Props, RadioButtonState> {
         row
         centerV
         activeOpacity={1}
-        style={containerStyle}
         {...others}
+        style={containerStyle}
         onPress={this.onPress}
         {...this.getAccessibilityProps()}
       >

src/components/stateScreen/index.js

@@ -23,7 +23,7 @@ export default class StateScreen extends BaseComponent {
      * The image source that's showing at the top. use an image that was required locally
      */
     imageSource: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
-    source: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
+    source: PropTypes.oneOfType([PropTypes.object, PropTypes.number]), // TODO: remove after deprecation
     /**
      * To to show as the title
      */
@@ -54,13 +54,13 @@ export default class StateScreen extends BaseComponent {
 
     }
     if (props.imageSource) {
-      LogService.deprecationWarn({component: 'StateScreen', oldProp: 'imageSource', newProp: 'source'});
+      LogService.deprecationWarn({component: 'StateScreen', oldProp: 'source', newProp: 'imageSource'});
     }
   }
 
   generateStyles() {
     const {source, imageSource} = this.props;
-    const finalSource = source || imageSource;
+    const finalSource = imageSource || source;
 
     const isRemoteImage = _.isObject(finalSource) && Boolean(finalSource.uri);
     this.styles = createStyles(isRemoteImage);
@@ -69,7 +69,7 @@ export default class StateScreen extends BaseComponent {
   render() {
     // TODO: remove testId and imageSource after deprecation
     const {title, subtitle, source, imageSource, ctaLabel, onCtaPress, testId, testID} = this.props;
-    const finalSource = source || imageSource;
+    const finalSource = imageSource || source;
 
     return (
       <View style={this.styles.container} testID={testID || testId}>