@applicaster/zapp-react-native-ui-components 13.0.9-alpha.1121932485 → 13.0.9-alpha.8722424302

package/Components/Cell/Cell.tsx

@@ -8,7 +8,6 @@ import { getItemType } from "@applicaster/zapp-react-native-utils/navigationUtil
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";
 import { sendSelectCellEvent } from "@applicaster/zapp-react-native-utils/analyticsUtils";
 import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
-import { CellStateContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/CellStateContext";
 
 import { CellWithFocusable } from "./CellWithFocusable";
 import { BaseFocusable } from "../BaseFocusable";
@@ -16,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;
@@ -69,12 +67,9 @@ type Props = {
 
 type State = {
   hasFocusableInside: boolean;
-  cellFocused: boolean;
 };
 
 export class CellComponent extends React.Component<Props, State> {
-  accessibilityManager: AccessibilityManager;
-
   constructor(props) {
     super(props);
     this.onPress = this.onPress.bind(this);
@@ -84,14 +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),
-      cellFocused: false,
     };
-
-    this.accessibilityManager = AccessibilityManager.getInstance();
   }
 
   setScreenLayout(componentAnchorPointY, screenLayout) {
@@ -139,8 +130,6 @@ export class CellComponent extends React.Component<Props, State> {
     } = this.props;
 
     if (isFocusable) {
-      this.setState({ cellFocused: true });
-
       if (
         shouldUpdate &&
         shouldScrollVertically?.(mouse, focusable, id, title)
@@ -150,9 +139,7 @@ export class CellComponent extends React.Component<Props, State> {
     }
   }
 
-  onBlur() {
-    this.setState({ cellFocused: false });
-  }
+  onBlur() {}
 
   willReceiveFocus() {}
 
@@ -196,25 +183,6 @@ export class CellComponent extends React.Component<Props, State> {
     return !isFocusable ? false : focused || focusableFocused;
   }
 
-  handleAccessibilityFocus(index, dataLength) {
-    // For loop scrolling, calculate the correct logical index
-    const logicalIndex = dataLength ? index % dataLength : index;
-
-    const positionLabel = dataLength
-      ? `item ${logicalIndex + 1} of ${dataLength}`
-      : "";
-
-    if (this.state.hasFocusableInside) {
-      this.accessibilityManager.readText({
-        text: " ",
-      });
-    } else {
-      this.accessibilityManager.readText({
-        text: `${positionLabel}`,
-      });
-    }
-  }
-
   componentDidUpdate(prevProps: Readonly<Props>) {
     if (prevProps.item !== this.props.item) {
       this.setState({
@@ -223,8 +191,6 @@ export class CellComponent extends React.Component<Props, State> {
         ),
       });
     }
-
-    this.handleAccessibilityFocus(this.props.index, this.props.dataLength);
   }
 
   render() {
@@ -246,6 +212,7 @@ export class CellComponent extends React.Component<Props, State> {
     } = this.props;
 
     const { id } = item;
+
     const focusableId = join("-", [component?.id, id, index]);
 
     const handleFocus = (focusable, mouse) => {
@@ -256,67 +223,73 @@ export class CellComponent extends React.Component<Props, State> {
 
     if (this.state.hasFocusableInside) {
       return (
-        <CellStateContextProvider cellFocused={this.state.cellFocused}>
-          <CellWithFocusable
-            CellRenderer={CellRenderer}
-            item={item}
-            id={focusableId}
-            groupId={groupId || component?.id}
-            onFocus={handleFocus}
-            onBlur={onBlur || this.onBlur}
-            index={index}
-            scrollTo={this.scrollToIndex()}
-            isFocusable={isFocusable}
-            skipFocusManagerRegistration={skipFocusManagerRegistration}
-            behavior={behavior}
-          />
-        </CellStateContextProvider>
+        <CellWithFocusable
+          CellRenderer={CellRenderer}
+          item={item}
+          id={focusableId}
+          groupId={groupId || component?.id}
+          onFocus={handleFocus}
+          index={index}
+          scrollTo={this.scrollToIndex()}
+          isFocusable={isFocusable}
+          skipFocusManagerRegistration={skipFocusManagerRegistration}
+          behavior={behavior}
+        />
       );
     }
 
     return (
-      <CellStateContextProvider cellFocused={this.state.cellFocused}>
-        <View
-          testID={`${component?.id}-${id}`}
-          accessible={false}
-          style={styles.touchableCell}
+      <View
+        testID={`${component?.id}-${id}`}
+        accessible={false}
+        style={styles.touchableCell}
+      >
+        <Focusable
+          id={focusableId}
+          groupId={groupId || component?.id}
+          onFocus={handleFocus}
+          onBlur={onBlur || this.onBlur}
+          onPress={this.onPress}
+          willReceiveFocus={willReceiveFocus || this.willReceiveFocus}
+          hasReceivedFocus={hasReceivedFocus || this.hasReceivedFocus}
+          preferredFocus={preferredFocus}
+          offsetUpdater={offsetUpdater}
+          style={styles.baseCell}
+          isFocusable={isFocusable}
+          skipFocusManagerRegistration={skipFocusManagerRegistration}
         >
-          <Focusable
-            id={focusableId}
-            groupId={groupId || component?.id}
-            onFocus={handleFocus}
-            onBlur={onBlur || this.onBlur}
-            onPress={this.onPress}
-            willReceiveFocus={willReceiveFocus || this.willReceiveFocus}
-            hasReceivedFocus={hasReceivedFocus || this.hasReceivedFocus}
-            preferredFocus={preferredFocus}
-            offsetUpdater={offsetUpdater}
-            style={styles.baseCell}
-            isFocusable={isFocusable}
-            skipFocusManagerRegistration={skipFocusManagerRegistration}
-            {...this.accessibilityManager.getButtonAccessibilityProps(
-              item?.extensions?.accessibility?.label || item?.title
-            )}
-          >
-            {(focused, event) => {
-              const isFocused = this.isCellFocused(focused);
-
-              return (
-                <FocusableCell
-                  {...{
-                    index,
-                    CellRenderer,
-                    item,
-                    focused: isFocused,
-                    scrollTo: this.scrollToIndex(event),
-                    behavior,
-                  }}
-                />
-              );
-            }}
-          </Focusable>
-        </View>
-      </CellStateContextProvider>
+          {(focused, event) => {
+            const isFocused = this.isCellFocused(focused);
+
+            if (isFocused) {
+              const accessibilityManager = AccessibilityManager.getInstance();
+
+              const accessibilityTitle =
+                item?.extensions?.accessibility?.label || item?.title || "";
+
+              const accessibilityHint =
+                item?.extensions?.accessibility?.hint || "";
+
+              accessibilityManager.readText({
+                text: `${accessibilityTitle} ${accessibilityHint}`,
+              });
+            }
+
+            return (
+              <FocusableCell
+                {...{
+                  index,
+                  CellRenderer,
+                  item,
+                  focused: isFocused,
+                  scrollTo: this.scrollToIndex(event),
+                  behavior,
+                }}
+              />
+            );
+          }}
+        </Focusable>
+      </View>
     );
   }
 }

package/Components/Cell/CellWithFocusable.tsx

@@ -14,7 +14,6 @@ type Props = {
   id: string;
   groupId: string;
   onFocus: Function;
-  onBlur?: Function;
   index: number;
   scrollTo: Function;
   preferredFocus?: boolean;
@@ -34,7 +33,6 @@ export function CellWithFocusable(props: Props) {
     id,
     groupId,
     onFocus,
-    onBlur = noop,
     scrollTo = noop,
     preferredFocus,
     skipFocusManagerRegistration,
@@ -80,7 +78,6 @@ export function CellWithFocusable(props: Props) {
   const onGroupBlur = React.useCallback(() => {
     if (!skipFocusManagerRegistration) {
       setIsFocused(false);
-      onBlur?.();
     }
   }, [skipFocusManagerRegistration]);
 

package/Components/Cell/__tests__/CellWIthFocusable.test.js

@@ -1,12 +1,13 @@
 import { View } from "react-native";
 import React from "react";
-import { act, render } from "@testing-library/react-native";
+import { act } from "@testing-library/react-native";
 import { CellWithFocusable } from "../CellWithFocusable.tsx";
 
 import { focusManager } from "@applicaster/zapp-react-native-utils/appUtils/focusManager";
+import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils/index.tsx";
 
 const renderWith = (props) => {
-  return render(<CellWithFocusable {...props} />);
+  return renderWithProviders(<CellWithFocusable {...props} />);
 };
 
 describe("CellWithFocusable", () => {

package/Components/FeedLoader/FeedLoader.tsx

@@ -3,23 +3,13 @@ import * as R from "ramda";
 
 type Props = {
   zappPipes: ZappPipesData;
-  loadPipesData: (
-    feed: string,
-    options?: Partial<{
-      clearCache: boolean;
-      meta: any;
-      loadLocalFavorites: boolean;
-      silentRefresh: boolean;
-      parentFeed: ZappFeed;
-      callback: () => void;
-      bodyParams: any;
-      riverId: string;
-    }>
-  ) => void;
+  loadPipesData: ReturnType<
+    typeof import("@applicaster/zapp-react-native-utils/reactHooks/feed").useLoadPipesDataDispatch
+  >;
   feedUrl: string;
   children: (feed: ZappFeed) => React.ComponentType<any>;
   onFeedLoaded: (feed: ZappFeed) => {};
-  onError: (feed: ZappFeed) => {};
+  onError: (error: ZappPipesData["error"]) => {};
   refreshing: boolean;
   refreshCallback: () => void;
 };

package/Components/FeedLoader/FeedLoaderHOC.tsx

@@ -0,0 +1,19 @@
+import React from "react";
+
+import { useLoadPipesDataDispatch } from "@applicaster/zapp-react-native-utils/reactHooks/feed";
+import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+
+export const FeedLoaderHOC = (_Component: any) => {
+  return function FeedLoaderHOC(props: any) {
+    const { zappPipes } = usePickFromState(["zappPipes"]);
+    const loadPipesData = useLoadPipesDataDispatch();
+
+    return (
+      <_Component
+        {...props}
+        zappPipes={zappPipes}
+        loadPipesData={loadPipesData}
+      />
+    );
+  };
+};

package/Components/FeedLoader/index.js

@@ -1,10 +1,4 @@
-import * as R from "ramda";
-
-import { connectToStore } from "@applicaster/zapp-react-native-redux";
-import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
-
 import { FeedLoaderComponent } from "./FeedLoader";
+import { FeedLoaderHOC } from "./FeedLoaderHOC";
 
-export const FeedLoader = connectToStore(R.pick(["zappPipes"]), {
-  loadPipesData,
-})(FeedLoaderComponent);
+export const FeedLoader = FeedLoaderHOC(FeedLoaderComponent);

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/GeneralContentScreen/utils/useCurationAPI.ts

@@ -1,13 +1,11 @@
 import { all, equals, path, prop, isEmpty, pluck, values } from "ramda";
 
 import { useEffect, useMemo } from "react";
-import { useDispatch } from "react-redux";
 
 import {
   useLayoutPresets,
   useZappPipesFeeds,
 } from "@applicaster/zapp-react-native-redux/hooks";
-import { loadPipesData } from "@applicaster/zapp-react-native-redux/ZappPipes";
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { Categories } from "./logger";
 import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
@@ -24,6 +22,7 @@ import {
 } from "@applicaster/zapp-react-native-utils/reactHooks/feed/useInflatedUrl";
 
 import { produce } from "immer";
+import { useLoadPipesDataDispatch } from "@applicaster/zapp-react-native-utils/reactHooks";
 // types reference
 
 declare type CurationEntry = { preset_name: string; feed_url: string };
@@ -122,8 +121,6 @@ export const getFinalComponents = (
 export const useCurationAPI = (
   components: Array<ZappUIComponent>
 ): ZappUIComponent[] => {
-  const dispatch = useDispatch();
-
   const smartComponents = useMemo(
     () => components?.filter?.(isSmartComponent) ?? [],
     [components]
@@ -159,17 +156,19 @@ export const useCurationAPI = (
 
   const urls = useMemo<string[]>(() => Object.values(urlsMap), [urlsMap]);
 
+  const loadPipesDataDispatcher = useLoadPipesDataDispatch();
+
   useEffect(() => {
     urls.forEach((url, index) => {
       if (url) {
-        dispatch(loadPipesData(url, { clearCache: false }));
+        loadPipesDataDispatcher(url, { clearCache: false });
       } else {
         logger.log_error("Curation url is empty", {
           componentId: smartComponents?.[index]?.id,
         });
       }
     });
-  }, [urls]);
+  }, [urls, loadPipesDataDispatcher]);
 
   const feeds = useZappPipesFeeds(urls);
   const layoutPresets = useLayoutPresets();

package/Components/MasterCell/DefaultComponents/ActionButton.tsx

@@ -49,7 +49,9 @@ function getAssetValue(asset, flavour, fallbackAsset = null) {
   return asset.src || fallbackAsset;
 }
 
-export function ActionButton(props: Props) {
+export const ActionButton = React.memo(function ActionButtonComponent(
+  props: Props
+) {
   const { item, action, asset, flavour = "flavour_1", cellUUID } = props;
   const actionContext = useActions(action?.identifier);
 
@@ -120,4 +122,4 @@ export function ActionButton(props: Props) {
       )}
     </TouchableOpacity>
   );
-}
+});

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

@@ -5,6 +5,7 @@ import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/acti
 import * as R from "ramda";
 import { getXray } from "@applicaster/zapp-react-native-utils/logger";
 import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
+import { useAccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager/hooks";
 
 const { Logger } = getXray();
 
@@ -44,6 +45,11 @@ export function FocusableView({ style, children, item, ...otherProps }: Props) {
 
   const actionContext = useActions(pluginIdentifier);
 
+  const accessibilityManager = useAccessibilityManager({});
+
+  const { ttsLabel = "" } =
+    actionContext?.initialEntryState(item)?.getAccessibility?.(item) || {};
+
   const onPress = (event) => {
     event?.preventDefault?.();
 
@@ -88,6 +94,12 @@ export function FocusableView({ style, children, item, ...otherProps }: Props) {
         mouse: focusable.mouse,
       });
     });
+
+    if (ttsLabel) {
+      accessibilityManager.readText({
+        text: ttsLabel,
+      });
+    }
   };
 
   const handleBlur = (_focusable, _direction) => {

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

@@ -11,8 +11,6 @@ import { withScaledLineHeight } from "./utils";
 import { toNumber } from "@applicaster/zapp-react-native-utils/numberUtils";
 import { MeasurementPortalContext } from "../../../MeasurmentsPortal";
 import { isNilOrEmpty } from "@applicaster/zapp-react-native-utils/reactUtils/helpers";
-import { CellStateContext } from "@applicaster/zapp-react-native-ui-components/Contexts/CellStateContext";
-import { useAccessibilityManager } from "@applicaster/zapp-react-native-utils/appUtils/accessibilityManager/hooks";
 
 type Props = {
   style: any;
@@ -37,9 +35,10 @@ const _Text = ({
 }: Props) => {
   const _label = useTextLabel({ label, entry });
   const isMeasurement = React.useContext(MeasurementPortalContext);
-  const cellFocused = React.useContext(CellStateContext);
 
-  const accessibilityManager = useAccessibilityManager({});
+  if (isNilOrEmpty(_label)) {
+    return null;
+  }
 
   // set maximum possible height for the text in case of measurement
   const height =
@@ -47,27 +46,6 @@ const _Text = ({
       ? toNumber(otherProps.numberOfLines) * toNumber(style.lineHeight)
       : undefined;
 
-  const textLabel = dateTransformEnabled
-    ? dateFormat(dateTransform, label)
-    : textTransform(transformText, _label);
-
-  React.useLayoutEffect(() => {
-    // For FocusableCells with action buttons
-    if (otherProps.state) {
-      if (otherProps.state === "focused" && cellFocused === true) {
-        accessibilityManager.addHeading(textLabel);
-      }
-    } else {
-      if (cellFocused === true) {
-        accessibilityManager.addHeading(textLabel);
-      }
-    }
-  }, [cellFocused, otherProps.state, textLabel]);
-
-  if (isNilOrEmpty(_label)) {
-    return null;
-  }
-
   return (
     <Text
       style={[
@@ -76,7 +54,9 @@ const _Text = ({
       ]}
       {...withoutLabel(otherProps)}
     >
-      {textLabel}
+      {dateTransformEnabled
+        ? dateFormat(dateTransform, label)
+        : textTransform(transformText, _label)}
     </Text>
   );
 };