@applicaster/zapp-react-native-ui-components 13.0.8-alpha.1940580104 → 13.0.8-alpha.1965510704

package/Components/Cell/Cell.tsx

@@ -15,7 +15,6 @@ import { AccessibilityManager } from "@applicaster/zapp-react-native-utils/appUt
 import { styles } from "./styles";
 
 type Props = {
-  dataLength: number;
   item: ZappEntry;
   index: number;
   shouldScrollHorizontally: (arg1: [any]) => boolean | null | undefined;
@@ -71,8 +70,6 @@ type State = {
 };
 
 export class CellComponent extends React.Component<Props, State> {
-  accessibilityManager: AccessibilityManager;
-
   constructor(props) {
     super(props);
     this.onPress = this.onPress.bind(this);
@@ -82,13 +79,10 @@ export class CellComponent extends React.Component<Props, State> {
     this.hasReceivedFocus = this.hasReceivedFocus.bind(this);
     this.scrollVertically = this.scrollVertically.bind(this);
     this.scrollToIndex = this.scrollToIndex.bind(this);
-    this.handleAccessibilityFocus = this.handleAccessibilityFocus.bind(this);
 
     this.state = {
       hasFocusableInside: props.CellRenderer.hasFocusableInside?.(props.item),
     };
-
-    this.accessibilityManager = AccessibilityManager.getInstance();
   }
 
   setScreenLayout(componentAnchorPointY, screenLayout) {
@@ -189,30 +183,6 @@ export class CellComponent extends React.Component<Props, State> {
     return !isFocusable ? false : focused || focusableFocused;
   }
 
-  handleAccessibilityFocus(item, index, dataLength) {
-    const accessibilityTitle =
-      item?.extensions?.accessibility?.label || item?.title;
-
-    const accessibilityHint = item?.extensions?.accessibility?.hint;
-
-    // For loop scrolling, calculate the correct logical index
-    const logicalIndex = dataLength ? index % dataLength : index;
-
-    const positionLabel = dataLength
-      ? `item ${logicalIndex + 1} of ${dataLength}`
-      : "";
-
-    accessibilityTitle &&
-      this.accessibilityManager.addHeading(accessibilityTitle);
-
-    accessibilityHint &&
-      this.accessibilityManager.addHeading(accessibilityHint);
-
-    this.accessibilityManager.readText({
-      text: `${positionLabel}`,
-    });
-  }
-
   componentDidUpdate(prevProps: Readonly<Props>) {
     if (prevProps.item !== this.props.item) {
       this.setState({
@@ -227,7 +197,6 @@ export class CellComponent extends React.Component<Props, State> {
     const {
       item,
       index,
-      dataLength,
       component,
       offsetUpdater,
       preferredFocus,
@@ -288,15 +257,22 @@ export class CellComponent extends React.Component<Props, State> {
           style={styles.baseCell}
           isFocusable={isFocusable}
           skipFocusManagerRegistration={skipFocusManagerRegistration}
-          {...this.accessibilityManager.getButtonAccessibilityProps(
-            item?.extensions?.accessibility?.label || item?.title
-          )}
         >
           {(focused, event) => {
             const isFocused = this.isCellFocused(focused);
 
             if (isFocused) {
-              this.handleAccessibilityFocus(item, index, dataLength);
+              const accessibilityManager = AccessibilityManager.getInstance();
+
+              const accessibilityTitle =
+                item?.extensions?.accessibility?.label || item?.title || "";
+
+              const accessibilityHint =
+                item?.extensions?.accessibility?.hint || "";
+
+              accessibilityManager.readText({
+                text: `${accessibilityTitle} ${accessibilityHint}`,
+              });
             }
 
             return (

package/Components/Focusable/Focusable.tsx

@@ -5,7 +5,6 @@ import { BaseFocusable } from "../BaseFocusable";
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
 import { LONG_KEY_PRESS_TIMEOUT } from "@applicaster/quick-brick-core/const";
 import { withFocusableContext } from "../../Contexts/FocusableGroupContext/withFocusableContext";
-import { AccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager";
 
 type Props = {
   initialFocus?: boolean;
@@ -29,7 +28,6 @@ class Focusable extends BaseFocusable<Props> {
   isGroup: boolean;
   mouse: boolean;
   longPressTimeout = null;
-  accessibilityManager: AccessibilityManager;
 
   constructor(props) {
     super(props);
@@ -44,8 +42,6 @@ class Focusable extends BaseFocusable<Props> {
     this.resetLongPressTimeout = this.resetLongPressTimeout.bind(this);
     this.longPress = this.longPress.bind(this);
     this.press = this.press.bind(this);
-
-    this.accessibilityManager = AccessibilityManager.getInstance();
   }
 
   /**
@@ -132,9 +128,6 @@ class Focusable extends BaseFocusable<Props> {
     const id = this.getId();
     const focusableId = `focusable-${id}`;
 
-    const accessibilityProps =
-      this.accessibilityManager.getWebAccessibilityProps(this.props);
-
     return (
       <div
         id={focusableId}
@@ -147,7 +140,6 @@ class Focusable extends BaseFocusable<Props> {
         data-testid={focusableId}
         focused-teststate={focused ? "focused" : "default"}
         style={style}
-        {...accessibilityProps}
       >
         {children(focused, { mouse: this.mouse })}
       </div>

package/Components/MasterCell/DefaultComponents/FocusableView/index.tsx

@@ -47,7 +47,7 @@ export function FocusableView({ style, children, item, ...otherProps }: Props) {
 
   const accessibilityManager = useAccessibilityManager({});
 
-  const { heading = "", ttsLabel = "" } =
+  const { ttsLabel = "" } =
     actionContext?.initialEntryState(item)?.getAccessibility?.(item) || {};
 
   const onPress = (event) => {
@@ -95,12 +95,10 @@ export function FocusableView({ style, children, item, ...otherProps }: Props) {
       });
     });
 
-    if (heading && ttsLabel) {
-      accessibilityManager.addHeading(heading);
-    }
-
     if (ttsLabel) {
-      accessibilityManager.readText({ text: `${ttsLabel} button` });
+      accessibilityManager.readText({
+        text: ttsLabel,
+      });
     }
   };
 

package/Components/TextInputTv/__tests__/__snapshots__/TextInputTv.test.js.snap

@@ -2,19 +2,6 @@
 
 exports[`<TextInputTv /> renders 1`] = `
 <input
-  accessibilityProps={
-    {
-      "accessibilityHint": "Enter text into Search",
-      "accessibilityLabel": "Search",
-      "accessibilityRole": "text",
-      "accessible": true,
-      "aria-description": "Enter text into Search",
-      "aria-label": "Search",
-      "aria-role": "text",
-      "role": "text",
-      "tabindex": 0,
-    }
-  }
   testID="TextInput-tv"
 />
 `;

package/Components/TextInputTv/index.tsx

@@ -4,7 +4,6 @@ import { Appearance, Platform, StyleSheet, TextInput } from "react-native";
 import { isFunction } from "@applicaster/zapp-react-native-utils/functionUtils";
 import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useIsRTL } from "@applicaster/zapp-react-native-utils/localizationUtils";
-import { useAccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager/hooks";
 
 type Props = Partial<{
   style: any;
@@ -43,8 +42,6 @@ function TextInputTV(props: Props, ref) {
   const [colorScheme, setColorScheme] = useState(getInitialColorScheme());
   const isRTL = useIsRTL();
 
-  const accessibilityManager = useAccessibilityManager({});
-
   const onColorChange = useCallback(
     ({ colorScheme: color }) => {
       if (color !== colorScheme) {
@@ -156,13 +153,6 @@ function TextInputTV(props: Props, ref) {
       ])
     )(props);
 
-  const getAccessibilityProps = () => {
-    return {
-      accessibilityProps:
-        accessibilityManager.getInputAccessibilityProps("Search"),
-    };
-  };
-
   const inputProps = {
     ...getProps(),
     ...getStyle(),
@@ -171,7 +161,6 @@ function TextInputTV(props: Props, ref) {
     ...getSecureTextEntry(),
     ...getOnEndEditing(),
     ...getOnPress(),
-    ...getAccessibilityProps(),
   };
 
   if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.8-alpha.1940580104",
+  "version": "13.0.8-alpha.1965510704",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,10 +31,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.8-alpha.1940580104",
-    "@applicaster/zapp-react-native-bridge": "13.0.8-alpha.1940580104",
-    "@applicaster/zapp-react-native-redux": "13.0.8-alpha.1940580104",
-    "@applicaster/zapp-react-native-utils": "13.0.8-alpha.1940580104",
+    "@applicaster/applicaster-types": "13.0.8-alpha.1965510704",
+    "@applicaster/zapp-react-native-bridge": "13.0.8-alpha.1965510704",
+    "@applicaster/zapp-react-native-redux": "13.0.8-alpha.1965510704",
+    "@applicaster/zapp-react-native-utils": "13.0.8-alpha.1965510704",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",