react-native-ui-lib 7.37.2-snapshot.6131 → 7.37.2-snapshot.6132

package/package.json

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

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="tablist">{tabBarItems}</View>
         {itemsCount > 1 && <Reanimated.View style={[styles.selectedIndicator, indicatorStyle, _indicatorTransitionStyle]} />}
       </FadedScrollView>
     </View>;

package/src/components/tabController/TabBarContext.d.ts

@@ -13,6 +13,7 @@ interface TabControllerContext {
     /** transition page index (can be a fraction when transitioning between pages) */
     targetPage: Reanimated.SharedValue<number>;
     setCurrentIndex: (index: number) => void;
+    selectedIndex: number;
 }
 declare const TabBarContext: React.Context<TabControllerContext>;
 export default TabBarContext;

package/src/components/tabController/TabBarItem.js

@@ -44,7 +44,8 @@ export default function TabBarItem({
 }) {
   const {
     currentPage,
-    setCurrentIndex
+    setCurrentIndex,
+    selectedIndex
   } = useContext(TabBarContext);
   const itemRef = useRef();
   const itemWidth = useRef(props.width);
@@ -133,7 +134,9 @@ 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={{
+      selected: selectedIndex === index
+    }}>
         {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/tabController/index.js

@@ -38,6 +38,7 @@ const TabController = React.forwardRef((props, ref) => {
     children
   } = themeProps;
   const [screenWidth, setScreenWidth] = useState(getScreenWidth(useSafeArea));
+  const [selectedIndex, setSelectedIndex] = useState(initialIndex);
   if (items?.length < 2) {
     console.warn('TabController component expect a minimum of 2 items');
   }
@@ -61,6 +62,7 @@ const TabController = React.forwardRef((props, ref) => {
     'worklet';
 
     currentPage.value = index;
+    runOnJS(setSelectedIndex)(index);
   }, []);
   useEffect(() => {
     setCurrentIndex(initialIndex);
@@ -88,12 +90,13 @@ const TabController = React.forwardRef((props, ref) => {
       /* Animated Values */
       targetPage,
       currentPage,
+      selectedIndex,
       containerWidth: screenWidth,
       /* Callbacks */
       onChangeIndex,
       setCurrentIndex
     };
-  }, [initialIndex, asCarousel, items, onChangeIndex, screenWidth, nestedInScrollView]);
+  }, [initialIndex, asCarousel, items, onChangeIndex, screenWidth, nestedInScrollView, selectedIndex]);
   return <TabBarContext.Provider value={context}>{children}</TabBarContext.Provider>;
 });
 

package/src/incubator/expandableOverlay/index.js

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