@applicaster/zapp-react-native-ui-components 15.0.0-alpha.1257410812 → 15.0.0-alpha.1305114721

package/Components/ScreenResolver/hooks/useScreenComponentResolver.tsx

@@ -0,0 +1,90 @@
+import * as React from "react";
+import { path, prop } from "ramda";
+import {
+  findPluginByType,
+  findPluginByIdentifier,
+} from "@applicaster/zapp-react-native-utils/pluginUtils";
+import { HandlePlayable } from "../../HandlePlayable";
+import { HookRenderer } from "../../HookRenderer";
+import { LinkHandler } from "../../LinkHandler";
+import { Favorites } from "../../Favorites";
+import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
+import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks";
+
+import { useCallbackActions } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/useCallbackActions";
+import { useGetComponent } from "./useGetComponent";
+import { getScreenTypeProps } from "../utils";
+
+export enum PresentationType {
+  Standalone = "Standalone",
+  Hook = "Hook",
+}
+
+const screenTypeComponents = {
+  favorites: Favorites,
+  link: LinkHandler,
+  playable: HandlePlayable,
+  hooks: HookRenderer,
+};
+
+export const useScreenComponentResolver = (screenType, props) => {
+  const plugins = usePlugins();
+  const { hookPlugin } = props.screenData || {};
+  const component = useGetComponent(screenType);
+
+  const screenAction = useCallbackActions(
+    hookPlugin || props.screenData,
+    props.screenData.callback
+  );
+
+  const {
+    videoModalState: { mode },
+  } = useNavigation();
+
+  const componentProps = {
+    ...props,
+    mode,
+    screenAction,
+  };
+
+  const ScreenTypeComponent = screenTypeComponents?.[screenType];
+
+  if (ScreenTypeComponent) {
+    return (
+      <ScreenTypeComponent
+        {...getScreenTypeProps(screenType, componentProps)}
+      />
+    );
+  }
+
+  const ScreenPlugin =
+    findPluginByType(screenType, plugins, { skipWarning: true }) ||
+    findPluginByIdentifier(screenType, plugins) ||
+    findPluginByIdentifier(hookPlugin && hookPlugin.identifier, plugins) ||
+    component;
+
+  const ScreenComponent =
+    path(["module", "Component"], ScreenPlugin) ||
+    prop("module", ScreenPlugin) ||
+    prop("Component", ScreenPlugin) ||
+    ScreenPlugin;
+
+  const configuration =
+    prop("configuration", ScreenPlugin) ||
+    prop("__plugin_configuration", ScreenComponent);
+
+  if (!ScreenComponent) {
+    return null;
+  }
+
+  return (
+    <ScreenComponent
+      {...props}
+      callback={props.resultCallback || screenAction}
+      screenId={props.screenId}
+      screenData={props.screenData}
+      presentationType={PresentationType.Standalone}
+      configuration={configuration}
+    />
+  );
+};

package/Components/ScreenResolver/index.tsx

@@ -1,29 +1,17 @@
 import * as React from "react";
-import { path, prop } from "ramda";
-import {
-  findPluginByType,
-  findPluginByIdentifier,
-} from "@applicaster/zapp-react-native-utils/pluginUtils";
-import { HandlePlayable } from "../HandlePlayable";
-import { toPascalCase } from "@applicaster/zapp-react-native-utils/stringUtils";
-import { HookRenderer } from "../HookRenderer";
-import { LinkHandler } from "../LinkHandler";
-import { Favorites } from "../Favorites";
-import { ZappPipesScreenContext } from "../../Contexts";
+
 import { componentsLogger } from "../../Helpers/logger";
-import {
-  useAppSelector,
-  usePlugins,
-} from "@applicaster/zapp-react-native-redux/hooks";
-import {
-  useNavigation,
-  useRivers,
-} from "@applicaster/zapp-react-native-utils/reactHooks";
+
 import { useScreenAnalytics } from "@applicaster/zapp-react-native-utils/analyticsUtils/helpers/hooks";
 
-import { useCallbackActions } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/useCallbackActions";
 import { ScreenResultCallback } from "@applicaster/zapp-react-native-utils/zappFrameworkUtils/HookCallback/callbackNavigationAction";
-import { selectComponents } from "@applicaster/zapp-react-native-redux";
+import { useScreenComponentResolver } from "./hooks/useScreenComponentResolver";
+import { withDefaultScreenContext } from "./withDefaultScreenContext";
+
+export enum PresentationType {
+  Standalone = "Standalone",
+  Hook = "Hook",
+}
 
 const logger = componentsLogger.addSubsystem("ScreenResolver");
 
@@ -44,102 +32,14 @@ type Props = {
   groupId?: string;
 };
 
-export enum PresentationType {
-  Standalone = "Standalone",
-  Hook = "Hook",
-}
-
 export function ScreenResolverComponent(props: Props) {
-  useScreenAnalytics(props);
-
-  const { screenType, screenId, screenData, groupId } = props;
-
-  const { hookPlugin } = screenData || {};
-
-  const plugins = usePlugins();
-  const rivers = useRivers();
-
-  const components = useAppSelector(selectComponents);
+  const { screenType } = props;
+  const component = useScreenComponentResolver(screenType, props);
 
-  const {
-    videoModalState: { mode },
-  } = useNavigation();
-
-  const [, setScreenContext] = ZappPipesScreenContext.useZappPipesContext();
-
-  React.useEffect(() => {
-    setScreenContext(rivers[screenId]);
-  }, [rivers, screenId, setScreenContext]);
-
-  const parentCallback = props.resultCallback;
-
-  const screenAction = useCallbackActions(
-    hookPlugin || screenData,
-    screenData.callback
-  );
-
-  const callbackAction = parentCallback || screenAction;
-
-  const ScreenPlugin =
-    findPluginByType(screenType, plugins, { skipWarning: true }) ||
-    findPluginByIdentifier(screenType, plugins) ||
-    findPluginByIdentifier(hookPlugin && hookPlugin.identifier, plugins) ||
-    components[toPascalCase(screenType)];
-
-  if (screenType === "favorites") {
-    return <Favorites screenData={screenData} />;
-  }
-
-  if (screenType === "link") {
-    return <LinkHandler screenData={screenData} />;
-  }
-
-  if (screenType === "playable") {
-    return (
-      // @ts-ignore
-      <HandlePlayable
-        item={screenData}
-        mode={mode === "PIP" ? "PIP" : "FULLSCREEN"}
-        isModal={false}
-        groupId={groupId}
-      />
-    );
-  }
-
-  if (hookPlugin || screenType === "hooks") {
-    return (
-      screenData && (
-        <HookRenderer
-          callback={callbackAction}
-          screenData={screenData}
-          focused={props.focused}
-          parentFocus={props.parentFocus as ParentFocus}
-        />
-      )
-    );
-  }
-
-  const ScreenComponent =
-    path(["module", "Component"], ScreenPlugin) ||
-    prop("module", ScreenPlugin) ||
-    prop("Component", ScreenPlugin) ||
-    ScreenPlugin;
-
-  const configuration =
-    prop("configuration", ScreenPlugin) ||
-    prop("__plugin_configuration", ScreenComponent);
+  useScreenAnalytics(props);
 
-  if (ScreenComponent) {
-    return (
-      <ScreenComponent
-        {...props}
-        callback={callbackAction}
-        screenId={screenId}
-        screenData={screenData}
-        configuration={configuration}
-        presentationType={PresentationType.Standalone}
-      />
-    );
+  if (component) {
+    return component;
   }
 
   logger.warning({
@@ -150,6 +50,4 @@ export function ScreenResolverComponent(props: Props) {
   return null;
 }
 
-export const ScreenResolver = ZappPipesScreenContext.withProvider(
-  ScreenResolverComponent
-);
+export const ScreenResolver = withDefaultScreenContext(ScreenResolverComponent);

package/Components/ScreenResolver/utils/__tests__/getScreenTypeProps.test.ts

@@ -0,0 +1,45 @@
+import { getScreenTypeProps } from "../getScreenTypeProps";
+
+const baseProps = {
+  screenData: { id: "entry-1" },
+  mode: "PIP",
+  screenId: "screen-1",
+  groupId: "group-1",
+  focused: true,
+  parentFocus: { nextFocusDown: { current: null } },
+  screenAction: jest.fn(),
+  resultCallback: null,
+};
+
+describe("getScreenTypeProps", () => {
+  it("returns props for favorites/link", () => {
+    expect(getScreenTypeProps("favorites", baseProps)).toEqual({
+      screenData: baseProps.screenData,
+    });
+
+    expect(getScreenTypeProps("link", baseProps)).toEqual({
+      screenData: baseProps.screenData,
+    });
+  });
+
+  it("returns props for playable", () => {
+    expect(getScreenTypeProps("playable", baseProps)).toEqual({
+      item: baseProps.screenData,
+      mode: "PIP",
+      isModal: false,
+      groupId: "group-1",
+    });
+  });
+
+  it("returns props for hooks", () => {
+    const result = getScreenTypeProps("hooks", baseProps);
+
+    expect(result).toMatchObject({
+      screenData: baseProps.screenData,
+      focused: true,
+      parentFocus: baseProps.parentFocus,
+    });
+
+    expect(result.callback).toBe(baseProps.screenAction);
+  });
+});

package/Components/ScreenResolver/utils/getScreenTypeProps.ts

@@ -0,0 +1,43 @@
+export const getScreenTypeProps = (
+  screenType: "favorites" | "link" | "playable" | "hooks",
+  props
+) => {
+  const {
+    screenData,
+    mode,
+    screenId,
+    groupId,
+    focused,
+    parentFocus,
+    screenAction,
+    resultCallback,
+  } = props;
+
+  switch (screenType) {
+    case "favorites":
+    case "link":
+      return {
+        screenData,
+      };
+    case "playable":
+      return {
+        item: screenData,
+        mode: mode === "PIP" ? "PIP" : "FULLSCREEN",
+        isModal: false,
+        groupId: groupId,
+      };
+    case "hooks":
+      return {
+        screenData,
+        callback: resultCallback || screenAction,
+        focused,
+        parentFocus: parentFocus as ParentFocus,
+      };
+    default:
+      return {
+        callback: resultCallback || screenAction,
+        screenId: screenId,
+        screenData,
+      };
+  }
+};

package/Components/ScreenResolver/utils/index.ts

@@ -0,0 +1 @@
+export { getScreenTypeProps } from "./getScreenTypeProps";

package/Components/ScreenResolver/withDefaultScreenContext.tsx

@@ -0,0 +1,16 @@
+import * as React from "react";
+import { useRivers } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { ZappPipesScreenContext } from "../../Contexts";
+
+export function withDefaultScreenContext(Component: React.ComponentType<any>) {
+  return function WithDefaultScreenContext(props: any) {
+    const screenId = props.screenId;
+    const rivers = useRivers();
+
+    return (
+      <ZappPipesScreenContext.Provider initialContextValue={rivers[screenId]}>
+        <Component {...props} />
+      </ZappPipesScreenContext.Provider>
+    );
+  };
+}

package/Components/ScreenResolverFeedProvider/ScreenResolverFeedProvider.tsx

@@ -0,0 +1,25 @@
+import React from "react";
+import { ScreenFeedLoader } from "../ScreenFeedLoader/ScreenFeedLoader";
+
+/** Resolves screen-feed for a given screen `id` by using the provided `useFeedData` hook */
+export const ScreenResolverFeedProvider = ({
+  id,
+  children,
+  useFeedData,
+}: {
+  id: string;
+  children: React.ReactNode;
+  useFeedData: (id: string) => Option<ZappDataSource>;
+}) => {
+  const feedData = useFeedData(id);
+
+  if (feedData?.source) {
+    return (
+      <ScreenFeedLoader id={id} feedData={feedData}>
+        {children}
+      </ScreenFeedLoader>
+    );
+  } else {
+    return <>{children}</>;
+  }
+};

package/Components/ScreenResolverFeedProvider/__tests__/ScreenResolverFeedProvider.test.tsx

@@ -0,0 +1,44 @@
+import React from "react";
+import { Text } from "react-native";
+import { render } from "@testing-library/react-native";
+import { ScreenResolverFeedProvider } from "../ScreenResolverFeedProvider";
+
+jest.mock("../../ScreenFeedLoader/ScreenFeedLoader", () => ({
+  ScreenFeedLoader: ({ children }) => {
+    const React = require("react");
+    const { View } = require("react-native");
+
+    return <View testID="feed-loader">{children}</View>;
+  },
+}));
+
+describe("ScreenResolverFeedProvider", () => {
+  it("renders ScreenFeedLoader when screen feed source exists", () => {
+    const useFeedData = jest.fn(() => ({
+      source: "https://feed",
+      mapping: {},
+    }));
+
+    const { getByTestId, getByText } = render(
+      <ScreenResolverFeedProvider id="screen-1" useFeedData={useFeedData}>
+        <Text>content</Text>
+      </ScreenResolverFeedProvider>
+    );
+
+    expect(getByTestId("feed-loader")).toBeDefined();
+    expect(getByText("content")).toBeDefined();
+  });
+
+  it("renders children directly when screen feed source is missing", () => {
+    const useFeedData = jest.fn(() => ({}));
+
+    const { queryByTestId, getByText } = render(
+      <ScreenResolverFeedProvider id="screen-1" useFeedData={useFeedData}>
+        <Text>content</Text>
+      </ScreenResolverFeedProvider>
+    );
+
+    expect(queryByTestId("feed-loader")).toBeNull();
+    expect(getByText("content")).toBeDefined();
+  });
+});

package/Components/ScreenResolverFeedProvider/index.ts

@@ -0,0 +1 @@
+export { ScreenResolverFeedProvider } from "./ScreenResolverFeedProvider";

package/Components/Tabs/TabContent.tsx

@@ -1,11 +1,10 @@
 import React from "react";
-import { View, ViewStyle } from "react-native";
+import { View, StyleSheet } from "react-native";
 
 import { River } from "@applicaster/zapp-react-native-ui-components/Components";
 import { withNestedNavigationContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/NestedNavigationContext";
 
 type Props = {
-  styles: Record<string, ViewStyle>;
   minHeight: number;
   changingTab: boolean;
   feedUrl: string;
@@ -14,9 +13,14 @@ type Props = {
   backgroundColor: string;
 };
 
+const styles = StyleSheet.create({
+  riverWrapper: {
+    flex: 1,
+  },
+});
+
 function TabContentComponent(props: Props) {
   const {
-    styles,
     minHeight,
     backgroundColor,
     changingTab,
@@ -29,7 +33,6 @@ function TabContentComponent(props: Props) {
     <View
       style={[
         styles.riverWrapper,
-
         {
           backgroundColor,
           minHeight,

package/Components/Transitioner/Scene.tsx

@@ -1,9 +1,9 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { equals } from "ramda";
 import { Animated, ViewProps, ViewStyle } from "react-native";
-import { useSafeAreaFrame } from "react-native-safe-area-context";
 
 import { useScreenOrientationHandler } from "@applicaster/zapp-react-native-ui-components/Components/Screen/orientationHandler";
+import { useMemoizedSafeAreaFrameWithActiveState } from "@applicaster/zapp-react-native-ui-components/Components/Screen/hooks";
 
 import { PathnameContext } from "../../Contexts/PathnameContext";
 import { ScreenDataContext } from "../../Contexts/ScreenDataContext";
@@ -94,19 +94,13 @@ function SceneComponent({
     isActive,
   });
 
-  const frame = useSafeAreaFrame();
-
-  const [memoFrame, setMemoFrame] = React.useState(frame);
-
-  useEffect(() => {
-    if (isActive) {
-      setMemoFrame((oldFrame) =>
-        oldFrame.width === frame.width && oldFrame.height === frame.height
-          ? oldFrame
-          : frame
-      );
-    }
-  }, [isActive, frame.width, frame.height]);
+  // Use shared memoized frame hook - synchronized with useWaitForValidOrientation
+  // to prevent race conditions during orientation changes
+  // Pass isActive from props since Scene knows its active state from Transitioner
+  const memoFrame = useMemoizedSafeAreaFrameWithActiveState({
+    updateForInactiveScreens: false,
+    isActive,
+  });
 
   const isAnimating = animating && overlayStyle;