react-native-ui-lib 7.37.2-snapshot.6134 → 7.37.2-snapshot.6147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ui-lib",
-  "version": "7.37.2-snapshot.6134",
+  "version": "7.37.2-snapshot.6147",
   "main": "src/index.js",
   "types": "src/index.d.ts",
   "author": "Ethan Sharabi <ethan.shar@gmail.com>",

package/src/components/colorSwatch/index.js

@@ -10,6 +10,7 @@ const transparentImage = require("./assets/transparentSwatch/TransparentSwatch.p
 const DEFAULT_SIZE = Constants.isTablet ? 44 : 36;
 export const SWATCH_MARGIN = 12;
 export const SWATCH_SIZE = DEFAULT_SIZE;
+const DEFAULT_COLOR = Colors.grey30;
 
 /**
  * @description: A color swatch component
@@ -83,9 +84,8 @@ class ColorSwatch extends PureComponent {
       value,
       index
     } = this.props;
-    const color = this.color ?? '';
     const tintColor = this.getTintColor(value);
-    const result = value || color;
+    const result = value || this.color || '';
     const hexString = Colors.getHexString(result);
     this.props.onPress?.(result, {
       tintColor,
@@ -102,10 +102,14 @@ class ColorSwatch extends PureComponent {
     }
   }
   getAccessibilityInfo() {
-    const color = this.color;
+    const color = this.color || DEFAULT_COLOR;
+    const defaultText = !this.color ? 'default' : '';
     return {
-      accessibilityLabel: color && Colors.getColorName(color),
-      accessibilityStates: this.props.selected ? ['selected'] : []
+      accessible: true,
+      accessibilityLabel: `${defaultText} color ${Colors.getColorName(color)}`,
+      accessibilityState: {
+        selected: this.props.selected
+      }
     };
   }
   getLayout() {
@@ -122,13 +126,11 @@ class ColorSwatch extends PureComponent {
       size = DEFAULT_SIZE,
       ...others
     } = this.props;
-    const color = this.color;
     const {
       isSelected
     } = this.state;
     const Container = onPress ? TouchableOpacity : View;
-    const tintColor = this.getTintColor(color);
-    const accessibilityInfo = Constants.accessibility.isScreenReaderEnabled && this.getAccessibilityInfo();
+    const tintColor = this.getTintColor(this.color);
     return <Container {...others} center activeOpacity={1} throttleTime={0} hitSlop={{
       top: 10,
       bottom: 10,
@@ -138,8 +140,8 @@ class ColorSwatch extends PureComponent {
       width: size,
       height: size,
       borderRadius: size / 2
-    }, style]} onLayout={this.onLayout} {...accessibilityInfo}>
-        {Colors.isTransparent(color) && <Image source={transparentImage} style={this.styles.transparentImage} resizeMode={'cover'} />}
+    }, style]} onLayout={this.onLayout} {...this.getAccessibilityInfo()}>
+        {Colors.isTransparent(this.color) && <Image source={transparentImage} style={this.styles.transparentImage} resizeMode={'cover'} />}
         {unavailable ? <View style={[this.styles.unavailable, {
         backgroundColor: tintColor
       }]} /> : <Animated.Image source={Assets.icons.check} style={{
@@ -181,12 +183,12 @@ class ColorSwatch extends PureComponent {
 }
 export default asBaseComponent(ColorSwatch);
 function createStyles({
-  color = Colors.grey30
+  color = DEFAULT_COLOR
 }) {
   return StyleSheet.create({
     container: {
       backgroundColor: color,
-      borderWidth: color === 'transparent' ? undefined : 1,
+      borderWidth: Colors.isTransparent(color) ? undefined : 1,
       borderColor: Colors.rgba(Colors.$outlineDisabledHeavy, 0.2),
       margin: SWATCH_MARGIN,
       overflow: 'hidden'

package/src/style/colors.js

@@ -145,6 +145,9 @@ export class Colors {
     return Scheme.getScheme(schemeType)[colorKey];
   }
   getColorName(colorValue) {
+    if (this.isTransparent(colorValue)) {
+      return 'transparent';
+    }
     const color = colorStringValue(colorValue);
     return ColorName.name(color)[1];
   }