react-native-ui-lib 7.37.2 → 7.38.0-snapshot.6232

package/package.json

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

package/src/components/avatar/index.js

@@ -58,6 +58,7 @@ const Avatar = forwardRef((props, ref) => {
     onPress,
     children
   } = themeProps;
+  const hitTargetPadding = Math.max(0, (48 - size) / 2);
   const {
     size: _badgeSize,
     borderWidth: badgeBorderWidth = 0
@@ -174,7 +175,7 @@ const Avatar = forwardRef((props, ref) => {
     }
   };
   const Container = onPress ? TouchableOpacity : View;
-  return <Container style={_containerStyle} ref={ref} testID={testID} onPress={onPress} accessible={!_isUndefined(onPress)} accessibilityLabel={'Avatar'} accessibilityRole={onPress ? 'button' : 'image'} {...accessibilityProps}>
+  return <Container style={_containerStyle} ref={ref} testID={testID} onPress={onPress} accessible={!_isUndefined(onPress)} accessibilityLabel={'Avatar'} accessibilityRole={onPress ? 'button' : 'image'} hitSlop={onPress ? hitTargetPadding : undefined} {...accessibilityProps}>
       <View testID={`${testID}.container`} style={textContainerStyle}>
         {!_isUndefined(text) && <Text numberOfLines={1} style={textStyle} testID={`${testID}.label`}>
             {text}

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/components/switch/index.js

@@ -36,10 +36,7 @@ class Switch extends Component {
       accessibilityRole: 'switch',
       accessibilityState: {
         disabled,
-        checked: value ? 'checked' : 'unchecked'
-      },
-      accessibilityValue: {
-        text: value ? '1' : '0'
+        checked: value
       }
     };
   }
@@ -114,13 +111,27 @@ class Switch extends Component {
     };
     return <Animated.View style={[this.styles.thumb, thumbPositionStyle, thumbStyle]} />;
   }
+  getAccessibleHitSlop() {
+    const {
+      width = DEFAULT_WIDTH,
+      height = DEFAULT_HEIGHT
+    } = this.props;
+    const verticalPadding = Math.max(0, (48 - height) / 2);
+    const horizontalPadding = Math.max(0, (48 - width) / 2);
+    return {
+      top: verticalPadding,
+      bottom: verticalPadding,
+      left: horizontalPadding,
+      right: horizontalPadding
+    };
+  }
   render() {
     const {
       ...others
     } = this.props;
     return (
       // @ts-ignore
-      <TouchableOpacity {...this.getAccessibilityProps()} activeOpacity={1} {...others} style={this.getSwitchStyle()} onPress={this.onPress}>
+      <TouchableOpacity {...this.getAccessibilityProps()} activeOpacity={1} hitSlop={this.getAccessibleHitSlop()} {...others} style={this.getSwitchStyle()} onPress={this.onPress}>
         {this.renderThumb()}
       </TouchableOpacity>
     );

package/src/components/switch/switch.driver.d.ts

@@ -2,9 +2,8 @@ import { ViewStyle } from 'react-native';
 import { ComponentProps } from '../../testkit/new/Component.driver';
 export declare const SwitchDriver: (props: ComponentProps) => {
     getStyle: () => ViewStyle;
-    getAccessibilityValue: () => boolean;
     isDisabled: () => boolean;
-    isChecked: () => boolean;
+    isChecked: () => any;
     press: () => void;
     hasOnPress: () => boolean;
     onPressIn: () => void;

package/src/components/switch/switch.driver.js

@@ -3,13 +3,11 @@ import { usePressableDriver } from "../../testkit/new/usePressable.driver";
 export const SwitchDriver = props => {
   const driver = usePressableDriver(useComponentDriver(props));
   const getStyle = () => driver.getElement().props.style;
-  const getAccessibilityValue = () => driver.getElement().props.accessibilityValue?.text === '1';
   const isDisabled = () => driver.getElement().props.accessibilityState?.disabled === true;
-  const isChecked = () => driver.getElement().props.accessibilityValue?.text === '1';
+  const isChecked = () => driver.getElement().props.accessibilityState?.checked;
   return {
     ...driver,
     getStyle,
-    getAccessibilityValue,
     isDisabled,
     isChecked
   };

package/src/components/tabController/TabBar.js

@@ -149,7 +149,7 @@ const TabBar = props => {
   }, [labelColor, selectedLabelColor]);
   return <View style={_containerStyle} key={key} bg-$backgroundElevated>
       <FadedScrollView ref={tabBar} horizontal showsHorizontalScrollIndicator={false} showStartFader startFaderProps={faderProps} showEndFader endFaderProps={faderProps} contentContainerStyle={scrollViewContainerStyle} testID={testID} onContentSizeChange={onContentSizeChange} onLayout={onLayout}>
-        <View style={tabBarContainerStyle}>{tabBarItems}</View>
+        <View style={tabBarContainerStyle} accessibilityRole={Constants.isIOS ? 'tabbar' : 'tablist'}>{tabBarItems}</View>
         {itemsCount > 1 && <Reanimated.View style={[styles.selectedIndicator, indicatorStyle, _indicatorTransitionStyle]} />}
       </FadedScrollView>
     </View>;

package/src/components/tabController/TabBarItem.js

@@ -3,9 +3,9 @@ import _isEmpty from "lodash/isEmpty";
 import _isUndefined from "lodash/isUndefined";
 import _cloneDeep from "lodash/cloneDeep";
 // TODO: support commented props
-import React, { useCallback, useContext, useEffect, useRef, useMemo } from 'react';
+import React, { useCallback, useContext, useEffect, useRef, useMemo, useState } from 'react';
 import { StyleSheet } from 'react-native';
-import Reanimated, { runOnJS, useAnimatedStyle, useSharedValue } from 'react-native-reanimated';
+import Reanimated, { runOnJS, useAnimatedReaction, useAnimatedStyle, useSharedValue } from 'react-native-reanimated';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import { Colors, Typography, Spacings } from "../../style";
 import Badge from "../badge";
@@ -52,6 +52,7 @@ export default function TabBarItem({
   // JSON.parse(JSON.stringify is due to an issue with reanimated
   const sharedLabelStyle = useSharedValue(JSON.parse(JSON.stringify(StyleSheet.flatten(labelStyle))));
   const sharedSelectedLabelStyle = useSharedValue(JSON.parse(JSON.stringify(StyleSheet.flatten(selectedLabelStyle))));
+  const [isSelected, setIsSelected] = useState(currentPage.value === index);
 
   // NOTE: We clone these color values in refs because they might contain a PlatformColor value
   //       which throws an error (see https://github.com/software-mansion/react-native-reanimated/issues/3164)
@@ -71,6 +72,11 @@ export default function TabBarItem({
       }, index);
     }
   }, []);
+  useAnimatedReaction(() => currentPage.value === index, (isSelected, prevIsSelected) => {
+    if (isSelected !== prevIsSelected) {
+      runOnJS(setIsSelected)(isSelected);
+    }
+  });
   const onLayout = useCallback(event => {
     const {
       width
@@ -120,6 +126,9 @@ export default function TabBarItem({
       flex
     }, style, constantWidthStyle, pressStyle];
   }, [style, spreadItems]);
+  const accessibilityState = useMemo(() => ({
+    selected: isSelected
+  }), [isSelected]);
   const gesture = Gesture.Tap().maxDuration(60000).onEnd(() => {
     if (!ignore) {
       setCurrentIndex(index);
@@ -133,7 +142,7 @@ export default function TabBarItem({
   return <GestureDetector gesture={gesture}>
       <View reanimated
     // @ts-expect-error
-    ref={itemRef} style={_style} onLayout={onLayout} testID={testID}>
+    ref={itemRef} style={_style} onLayout={onLayout} testID={testID} accessible accessibilityRole="tab" accessibilityState={accessibilityState}>
         {leadingAccessory}
         {icon && <Reanimated.Image source={icon} style={[!_isUndefined(label) && styles.tabItemIconWithLabel, animatedIconStyle]} />}
         {!_isEmpty(label) && <Reanimated.Text {...labelProps} fsTagName={'unmask'} style={[styles.tabItemLabel, labelStyle, animatedLabelStyle, animatedLabelColorStyle]}>

package/src/components/textField/index.js

@@ -159,7 +159,10 @@ const TextField = props => {
                   {placeholder}
                 </Text>}
               {floatingPlaceholder && <FloatingPlaceholder defaultValue={others.defaultValue} placeholder={placeholder} floatingPlaceholderStyle={_floatingPlaceholderStyle} floatingPlaceholderColor={floatingPlaceholderColor} floatOnFocus={floatOnFocus} validationMessagePosition={validationMessagePosition} extraOffset={leadingAccessoryMeasurements?.width} testID={`${props.testID}.floatingPlaceholder`} showMandatoryIndication={showMandatoryIndication} />}
-              <Input placeholderTextColor={hidePlaceholder ? 'transparent' : placeholderTextColor} value={fieldState.value} {...others} readonly={readonly} style={inputStyle} onFocus={onFocus} onBlur={onBlur} onChangeText={onChangeText} placeholder={placeholder} hint={hint} showMandatoryIndication={showMandatoryIndication && !label} />
+              <Input hitSlop={{
+            top: 20,
+            bottom: 20
+          }} placeholderTextColor={hidePlaceholder ? 'transparent' : placeholderTextColor} value={fieldState.value} {...others} readonly={readonly} style={inputStyle} onFocus={onFocus} onBlur={onBlur} onChangeText={onChangeText} placeholder={placeholder} hint={hint} showMandatoryIndication={showMandatoryIndication && !label} />
             </View>}
           {showClearButton && <ClearButton onClear={onClear} testID={`${props.testID}.clearButton`} onChangeText={onChangeText} clearButtonStyle={clearButtonStyle} />}
           {trailingAccessory}

package/src/incubator/expandableOverlay/index.js

@@ -1,4 +1,5 @@
-import React, { useCallback, useState, forwardRef, useImperativeHandle } from 'react';
+import React, { useCallback, useState, forwardRef, useImperativeHandle, useRef } from 'react';
+import { AccessibilityInfo, findNodeHandle } from 'react-native';
 import TouchableOpacity from "../../components/touchableOpacity";
 import View from "../../components/view";
 import Modal from "../../components/modal";
@@ -23,14 +24,22 @@ const ExpandableOverlay = (props, ref) => {
     ...others
   } = props;
   const [visible, setExpandableVisible] = useState(false);
+  const containerRef = useRef(null);
+  const focusAccessibility = useCallback(() => {
+    const reactTag = findNodeHandle(containerRef.current);
+    if (reactTag) {
+      AccessibilityInfo.setAccessibilityFocus(reactTag);
+    }
+  }, []);
   const openExpandable = useCallback(() => {
     setExpandableVisible(true);
     onPress?.(props);
   }, [onPress, customValue]);
   const closeExpandable = useCallback(() => {
     setExpandableVisible(false);
+    focusAccessibility();
     useDialog ? dialogProps?.onDismiss?.() : modalProps?.onDismiss?.();
-  }, [useDialog, dialogProps?.onDismiss, modalProps?.onDismiss]);
+  }, [useDialog, dialogProps?.onDismiss, modalProps?.onDismiss, focusAccessibility]);
   const toggleExpandable = useCallback(() => visible ? closeExpandable() : openExpandable(), [visible, openExpandable, closeExpandable]);
   useImperativeHandle(ref, () => ({
     openExpandable,
@@ -61,7 +70,7 @@ const ExpandableOverlay = (props, ref) => {
       return useDialog ? renderDialog() : renderModal();
     }
   };
-  return <TouchableOpacity {...others} onPress={openExpandable} disabled={disabled} testID={testID}>
+  return <TouchableOpacity ref={containerRef} {...others} onPress={openExpandable} disabled={disabled} testID={testID}>
       <View pointerEvents="none">{children}</View>
       {renderOverlay()}
     </TouchableOpacity>;

package/src/incubator/toast/index.js

@@ -57,11 +57,9 @@ const Toast = props => {
   });
   const playAccessibilityFeatures = () => {
     if (visible) {
-      if (viewRef.current && action) {
+      if (viewRef.current && (action || message)) {
         const reactTag = findNodeHandle(viewRef.current);
         AccessibilityInfo.setAccessibilityFocus(reactTag);
-      } else if (message) {
-        AccessibilityInfo.announceForAccessibility?.(toastPreset.accessibilityMessage);
       }
     }
   };

package/src/index.d.ts

@@ -68,7 +68,7 @@ export { default as PanningProvider, PanningDirections, PanLocationProps, PanAmo
 export { default as PanResponderView, PanResponderViewProps } from './components/panningViews/panResponderView';
 export { default as asPanViewConsumer } from './components/panningViews/asPanViewConsumer';
 export { default as Picker, PickerProps, PickerItemProps, PickerValue, PickerModes, PickerFieldTypes, PickerSearchStyle, RenderCustomModalProps, PickerItemsListProps, PickerMethods } from './components/picker';
-export { default as PieChart, PieChartSegmentProps } from './components/pieChart';
+export { default as PieChart, type PieChartProps, PieChartSegmentProps } from './components/pieChart';
 export { default as ProgressBar, ProgressBarProps } from './components/progressBar';
 export { default as ProgressiveImage, ProgressiveImageProps } from './components/progressiveImage';
 export { default as RadioButton, RadioButtonProps } from './components/radioButton';

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];
   }