ColorSwatch - fix accessibility (#3510)

* ColorSwatch - fix accessibility
wix · Feb 19, 2025 · 3b8c072 · 3b8c072
1 parent f854b30
commit 3b8c072
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/demo/src/screens/componentScreens/ColorSwatchScreen.tsx b/demo/src/screens/componentScreens/ColorSwatchScreen.tsx
@@ -73,11 +73,11 @@ export default class ColorSwatchScreen extends Component {
               <Text text90R>Unavailable</Text>
             </View>
             <View>
-              <ColorSwatch transparent/>
+              <ColorSwatch color={'transparent'}/>
               <Text text90R>Transparent</Text>
             </View>
             <View center>
-              <ColorSwatch style={{borderRadius: 0}} transparent/>
+              <ColorSwatch style={{borderRadius: 0}} transparent selected/>
               <Text text90R>Square</Text>
             </View>
           </View>

diff --git a/src/components/colorSwatch/index.tsx b/src/components/colorSwatch/index.tsx
@@ -56,6 +56,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
@@ -124,9 +125,8 @@ class ColorSwatch extends PureComponent<Props & BaseComponentInjectedProps> {
 
   onPress = () => {
     const {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, index, hexString});
   };
@@ -141,11 +141,13 @@ class ColorSwatch extends PureComponent<Props & BaseComponentInjectedProps> {
   }
 
   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}
     };
   }
 
@@ -159,11 +161,9 @@ class ColorSwatch extends PureComponent<Props & BaseComponentInjectedProps> {
 
   renderContent() {
     const {style, onPress, unavailable, 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
@@ -175,9 +175,9 @@ class ColorSwatch extends PureComponent<Props & BaseComponentInjectedProps> {
         onPress={this.onPress}
         style={[this.styles.container, {width: size, height: size, borderRadius: size / 2}, style]}
         onLayout={this.onLayout}
-        {...accessibilityInfo}
+        {...this.getAccessibilityInfo()}
       >
-        {Colors.isTransparent(color) && (
+        {Colors.isTransparent(this.color) && (
           <Image source={transparentImage} style={this.styles.transparentImage} resizeMode={'cover'}/>
         )}
         {unavailable ? (
@@ -222,11 +222,11 @@ class ColorSwatch extends PureComponent<Props & BaseComponentInjectedProps> {
 
 export default asBaseComponent<ColorSwatchProps>(ColorSwatch);
 
-function createStyles({color = Colors.grey30}) {
+function createStyles({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'

diff --git a/src/style/colors.ts b/src/style/colors.ts
@@ -162,6 +162,9 @@ export class Colors {
   }
 
   getColorName(colorValue: string) {
+    if (this.isTransparent(colorValue)) {
+      return 'transparent';
+    }
     const color = colorStringValue(colorValue);
     return ColorName.name(color)[1];
   }