@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6372000108 → 13.0.0-alpha.6444233049

package/Components/AudioPlayer/AudioPlayer.tsx

@@ -22,8 +22,6 @@ type Props = {
       audio_player_title_color?: string;
       audio_player_summary_color?: string;
       audio_player_rtl?: boolean;
-      magic_background?: boolean;
-      audio_player_background_image_query?: string;
       audio_player_background_image_default_color?: string;
       start_time?: string;
       end_time?: string;
@@ -34,8 +32,6 @@ type Props = {
     audio_player_title_color?: string;
     audio_player_summary_color?: string;
     audio_player_rtl?: string;
-    magic_background?: string;
-    audio_player_background_image_query?: string;
     audio_player_background_image_default_color?: string;
     audio_player_background_image?: string;
     audio_player_artwork_aspect_ratio?: string;
@@ -76,11 +72,6 @@ export function AudioPlayer(props: Props) {
     const artworkAspectRatio = getProp("audio_player_artwork_aspect_ratio");
     const channelIcon = getProp("audio_player_channel_icon");
     const rtlFlag = getProp("audio_player_rtl");
-    const magicBackground = getProp("magic_background");
-
-    const audioPlayerBackgroundImageQuery = getProp(
-      "audio_player_background_image_query"
-    );
 
     const audioPlayerBackgroundImageDefaultColor = getProp(
       "audio_player_background_image_default_color"
@@ -162,8 +153,6 @@ export function AudioPlayer(props: Props) {
       runTimeFontSize,
       artworkAspectRatio,
       channelIcon,
-      magicBackground,
-      audioPlayerBackgroundImageQuery,
       audioPlayerBackgroundImageDefaultColor,
     };
   }, [getProp]);

package/Components/AudioPlayer/helpers.tsx

@@ -4,8 +4,6 @@ const defaults = {
   audio_player_background_color: "black",
   audio_player_artwork_aspect_ratio: "1:1",
   audio_player_rtl: false,
-  magic_background: false,
-  audio_player_background_image_query: "",
   audio_player_background_image_default_color: "",
 };
 

package/Components/GeneralContentScreen/utils/useCurationAPI.ts

@@ -3,8 +3,10 @@ import { all, equals, path, prop, isEmpty, pluck, values } from "ramda";
 import { useEffect, useMemo } from "react";
 import { useDispatch } from "react-redux";
 
-import { useLayoutPresets } from "@applicaster/zapp-react-native-redux/hooks/useLayoutPresets";
-import { useZappPipesFeeds } from "@applicaster/zapp-react-native-redux/hooks/useZappPipesFeeds";
+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";

package/Components/ModalComponent/BottomSheetModalContent.tsx

@@ -1,11 +1,5 @@
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-import { View, LayoutChangeEvent, ScrollView } from "react-native";
+import React, { useCallback, useEffect, useMemo, useRef } from "react";
+import { View, ScrollView } from "react-native";
 import { Button } from "./Button";
 import { ItemIconProps } from "./Button/ItemIcon";
 import { ItemProps } from "./Button/Item";
@@ -15,7 +9,8 @@ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 
 import type { PluginConfiguration } from "./";
 
-import { ModalHeader } from "./Header";
+import { ModalHeader as DefaultModalHeader } from "./Header";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 type ModalComponentProps = {
   items: any[];
@@ -27,6 +22,7 @@ type ModalComponentProps = {
   title?: string;
   maxHeight?: number;
   dismiss: () => void;
+  headerComponent?: React.ComponentType;
   buttonComponent?: React.ComponentType;
   iconProps?: ItemIconProps | ((theme: PluginConfiguration) => ItemIconProps);
   itemProps?:
@@ -48,33 +44,25 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
   const {
     items,
     currentRoute,
-    maxHeight,
     current_selection = null,
     onPress,
     dismiss,
     summary,
     title,
+    headerComponent: ModalHeader = DefaultModalHeader,
     buttonComponent: ButtonComponent = Button,
-    getSelectedItemIcon = (theme) =>
-      theme.modal_bottom_sheet_item_selected_icon,
+    getSelectedItemIcon = ({
+      modal_bottom_sheet_item_selected_icon,
+    }: BaseThemePropertiesMobile) => modal_bottom_sheet_item_selected_icon,
     getDefaultItemIcon = () => null,
     iconPlacement,
   } = props;
 
-  const [headerHeight, setHeaderHeight] = useState(0);
   const route = useRef(currentRoute);
   const theme = useTheme<BaseThemePropertiesMobile>();
   const paddingTop = Number(theme.modal_bottom_sheet_padding_top);
   const paddingBottom = Number(theme.modal_bottom_sheet_padding_bottom);
 
-  const maxContentHeight = maxHeight
-    ? maxHeight - headerHeight - paddingTop
-    : undefined;
-
-  const onHeaderLayout = useCallback((event: LayoutChangeEvent) => {
-    setHeaderHeight(event.nativeEvent.layout.height);
-  }, []);
-
   useEffect(() => {
     if (currentRoute !== route.current) {
       props.dismiss();
@@ -101,46 +89,44 @@ export function BottomSheetModalContent(props: ModalComponentProps) {
     [onPress, dismiss]
   );
 
+  const bottomInset = useSafeAreaInsets().bottom;
+
   return (
     <View
       style={{
-        maxWidth: props.width,
-        paddingTop,
+        maxHeight: props.maxHeight,
+        paddingTop: paddingTop,
       }}
     >
       <ModalHeader
-        width={props.width}
         dismiss={dismiss}
         configuration={theme}
-        onLayout={onHeaderLayout}
         summary={summary}
         title={title}
       />
       <ScrollView
-        bounces={false}
-        style={{ maxHeight: maxContentHeight }}
         contentContainerStyle={{
-          paddingBottom,
-          paddingTop,
+          paddingBottom: paddingBottom + bottomInset,
         }}
       >
-        {items.map((item, index) => (
-          <ButtonComponent
-            key={index}
-            width={props.width}
-            configuration={theme}
-            selectedItem={current_selection}
-            item={item}
-            onPress={handlePress}
-            label={theme[item?.label] ?? item?.label}
-            iconBaseProps={iconBaseProps}
-            itemBaseProps={itemBaseProps}
-            labelBaseProps={labelBaseProps}
-            selectedItemIcon={getSelectedItemIcon(theme)}
-            defaultItemIcon={getDefaultItemIcon(theme)}
-            iconPlacement={iconPlacement}
-          />
-        ))}
+        {items.map((item, index) =>
+          item ? (
+            <ButtonComponent
+              key={index}
+              configuration={theme}
+              selectedItem={current_selection}
+              item={item}
+              onPress={handlePress}
+              label={theme[item?.label] ?? item?.label}
+              iconBaseProps={iconBaseProps}
+              itemBaseProps={itemBaseProps}
+              labelBaseProps={labelBaseProps}
+              selectedItemIcon={getSelectedItemIcon(theme)}
+              defaultItemIcon={getDefaultItemIcon(theme)}
+              iconPlacement={iconPlacement}
+            />
+          ) : null
+        )}
       </ScrollView>
     </View>
   );

package/Components/ModalComponent/Button/index.tsx

@@ -7,7 +7,6 @@ import { defaultSelectedAsset } from "./assets";
 
 type ButtonProps = {
   configuration: any;
-  width: number;
   selectedItem?: any;
   item: any; // Adjust type as needed
   onPress: (item: any) => void; // Adjust type as needed
@@ -33,7 +32,6 @@ export function Button({
   item,
   onPress,
   configuration,
-  width,
   iconBaseProps,
   itemBaseProps: itemProps,
   labelBaseProps,
@@ -65,34 +63,32 @@ export function Button({
   if (disabled) return null;
 
   return (
-    <View style={{ maxWidth: width }}>
-      <TouchableOpacity
-        activeOpacity={1}
-        onPress={() => onPress(item)}
-        onPressIn={() => setFocused(true)}
-        onPressOut={() => setFocused(false)}
-      >
-        <Item {...itemProps} focused={focused} selected={selected}>
-          <View style={styles.label_icon_container}>
-            {iconPlacement === "left" && renderItemIcon}
+    <TouchableOpacity
+      activeOpacity={1}
+      onPress={() => onPress(item)}
+      onPressIn={() => setFocused(true)}
+      onPressOut={() => setFocused(false)}
+    >
+      <Item {...itemProps} focused={focused} selected={selected}>
+        <View style={styles.label_icon_container}>
+          {iconPlacement === "left" && renderItemIcon}
 
-            {label ? (
-              <ItemLabel
-                {...labelBaseProps}
-                label={label ?? null}
-                focused={focused}
-                selected={selected}
-              />
-            ) : null}
-          </View>
+          {label ? (
+            <ItemLabel
+              {...labelBaseProps}
+              label={label ?? null}
+              focused={focused}
+              selected={selected}
+            />
+          ) : null}
+        </View>
 
-          {selected ? (
-            <ItemIcon {...iconBaseProps} asset={selectedItemIconPropsAssets} />
-          ) : (
-            iconPlacement === "right" && renderItemIcon
-          )}
-        </Item>
-      </TouchableOpacity>
-    </View>
+        {selected ? (
+          <ItemIcon {...iconBaseProps} asset={selectedItemIconPropsAssets} />
+        ) : (
+          iconPlacement === "right" && renderItemIcon
+        )}
+      </Item>
+    </TouchableOpacity>
   );
 }

package/Components/ModalComponent/Header/index.tsx

@@ -8,13 +8,18 @@ import { PluginConfiguration } from "../index";
 type Props = {
   dismiss: () => void;
   configuration: PluginConfiguration;
-  width: number;
   onLayout?: (event: LayoutChangeEvent) => void;
   summary?: string;
   title?: string;
 };
 
 const styles = StyleSheet.create({
+  noFlex: {
+    flex: 0,
+  },
+  flex: {
+    flex: 1,
+  },
   container: {
     flexDirection: "row",
     alignItems: "center",
@@ -22,7 +27,7 @@ const styles = StyleSheet.create({
 });
 
 export function ModalHeader(props: Props) {
-  const { configuration, dismiss, width, onLayout, summary, title } = props;
+  const { configuration, dismiss, onLayout, summary, title } = props;
 
   const closeButtonProps = useMemo<CloseButtonProps>(
     () => ({
@@ -55,15 +60,11 @@ export function ModalHeader(props: Props) {
 
   return (
     <View onLayout={onLayout} style={styles.container}>
-      <View
-        style={{
-          width: width - buttonsContainerWidth,
-        }}
-      >
+      <View style={styles.flex}>
         {title ? <Title {...titleProps} /> : null}
         {summary ? <Title {...summaryProps} /> : null}
       </View>
-      <View style={{ width: buttonsContainerWidth }}>
+      <View style={[styles.noFlex, { width: buttonsContainerWidth }]}>
         <CloseButton {...closeButtonProps} />
       </View>
     </View>

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -597,7 +597,7 @@ const PlayerContainerComponent = (props: Props) => {
       );
     }
 
-    if (screen_background_color) {
+    if (screen_background_color && mode !== VideoModalMode.FULLSCREEN) {
       updatedStyles.playerScreen.backgroundColor = screen_background_color;
     }
 
@@ -615,6 +615,7 @@ const PlayerContainerComponent = (props: Props) => {
     tv_component_container_height,
     screen_background_color,
     isInlineTV,
+    mode,
   ]);
 
   const applePlayerProps = {

package/Components/River/ComponentsMap/ComponentsMap.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as R from "ramda";
-import { View, StyleSheet, Platform, FlatList } from "react-native";
+import { View, StyleSheet, FlatList } from "react-native";
 import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { RiverItem } from "../RiverItem";
 import { RiverFooter } from "../RiverFooter";
@@ -24,6 +24,10 @@ import { withComponentsMapProvider } from "@applicaster/zapp-react-native-ui-com
 import { useScreenContextV2 } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 import { useShallow } from "zustand/react/shallow";
 
+import { isAndroidPlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
+
+const isAndroid = isAndroidPlatform();
+
 type Props = {
   feed: ZappFeed;
   groupId?: string;
@@ -273,12 +277,12 @@ function ComponentsMapComponent(props: Props) {
             }}
             // Fix for WebView rerender crashes on Android API 28+
             // https://github.com/react-native-webview/react-native-webview/issues/1915#issuecomment-964035468
-            overScrollMode={Platform.OS === "android" ? "never" : "auto"}
+            overScrollMode={isAndroid ? "never" : "auto"}
             scrollIndicatorInsets={scrollIndicatorInsets}
             extraData={feed}
             stickyHeaderIndices={stickyHeaderIndices}
             onLayout={handleOnLayout}
-            removeClippedSubviews
+            removeClippedSubviews={isAndroid}
             initialNumToRender={3}
             maxToRenderPerBatch={10}
             windowSize={12}
@@ -299,6 +303,10 @@ function ComponentsMapComponent(props: Props) {
             onMomentumScrollEnd={_onMomentumScrollEnd}
             onScrollEndDrag={_onScrollEndDrag}
             scrollEventThrottle={16}
+            maintainVisibleContentPosition={{
+              minIndexForVisible: 0,
+              autoscrollToTopThreshold: 10,
+            }}
             {...scrollViewExtraProps}
           />
         </ViewportTracker>

package/Components/River/RiverItem.tsx

@@ -48,16 +48,20 @@ const useLoadingState = (
   loadingState: RiverItemType["loadingState"]
 ) => {
   const [readyToBeDisplayed, setReadyToBeDisplayed] = React.useState(
-    loadingState.getValue().index + 1 === currentIndex
+    loadingState.getValue().index + 1 >= currentIndex
   );
 
   useEffect(() => {
     const subscription = loadingState.subscribe(({ index }) => {
-      if (index + 1 === currentIndex) {
+      if (index + 1 >= currentIndex) {
         setReadyToBeDisplayed(true);
       }
     });
 
+    if (loadingState.getValue().index + 1 >= currentIndex) {
+      setReadyToBeDisplayed(true);
+    }
+
     return () => {
       subscription.unsubscribe();
     };

package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap

@@ -135,6 +135,12 @@ exports[`componentsMap renders renders components map correctly 1`] = `
       getItemCount={[Function]}
       initialNumToRender={3}
       keyExtractor={[Function]}
+      maintainVisibleContentPosition={
+        {
+          "autoscrollToTopThreshold": 10,
+          "minIndexForVisible": 0,
+        }
+      }
       maxToRenderPerBatch={10}
       onContentSizeChange={[Function]}
       onLayout={[Function]}
@@ -145,7 +151,7 @@ exports[`componentsMap renders renders components map correctly 1`] = `
       onScrollEndDrag={[Function]}
       overScrollMode="auto"
       refreshControl={null}
-      removeClippedSubviews={true}
+      removeClippedSubviews={false}
       renderItem={[Function]}
       scrollEventThrottle={16}
       scrollIndicatorInsets={

package/Components/Screen/TV/__tests__/index.web.test.tsx

@@ -0,0 +1,26 @@
+const {
+  useScreenBackgroundColor,
+} = require("@applicaster/zapp-react-native-utils/reactHooks/screen");
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
+  useScreenBackgroundColor: jest.fn(),
+  useNavbarState: jest.fn().mockReturnValue({ visible: true }),
+}));
+
+describe("TV Screen Component", () => {
+  it("uses the useScreenBackgroundColor hook with the correct screen ID", () => {
+    useScreenBackgroundColor.mockReturnValue("#FF0000");
+
+    expect(useScreenBackgroundColor("test-screen-id")).toBe("#FF0000");
+
+    // Verify the hook was called with the correct screen ID
+    expect(useScreenBackgroundColor).toHaveBeenCalledWith("test-screen-id");
+  });
+
+  it("returns 'transparent' when the screen background color is not defined", () => {
+    useScreenBackgroundColor.mockReturnValue("transparent");
+
+    // Verify the hook returns 'transparent'
+    expect(useScreenBackgroundColor("test-screen-id")).toBe("transparent");
+  });
+});

package/Components/Screen/__tests__/Screen.test.tsx

@@ -68,21 +68,21 @@ jest.mock(
   })
 );
 
-jest.mock(
-  "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenData",
-  () => ({
-    useScreenData: jest.fn(() => ({
-      id: "testId",
-      navigations: [{ id: "testId", category: "nav_bar" }],
-    })),
-  })
-);
-
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   isNavBarVisible: mockIsNavBarVisible,
-  useRoute: jest.fn(() => ({
-    pathname: "/river/testId",
-    screenData: { id: "testId" },
+  useIsScreenActive: jest.fn().mockReturnValue(true),
+}));
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
+  useCurrentScreenData: jest.fn(() => ({
+    id: "testId",
+  })),
+  useNavbarState: jest.fn(() => ({
+    title: "Test Title",
+  })),
+  useScreenData: jest.fn(() => ({
+    id: "testId",
+    navigations: [{ id: "testId", category: "nav_bar" }],
   })),
   useNavigation: jest.fn(() => ({
     canGoBack: () => false,
@@ -91,7 +91,15 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
     screenData: { id: "testId" },
     data: { screen: { id: "testId" } },
   })),
-  useIsScreenActive: jest.fn().mockReturnValue(true),
+  useRoute: jest.fn(() => ({
+    pathname: "/river/testId",
+    screenData: { id: "testId" },
+  })),
+  useDimensions: jest.fn(() => ({
+    width: 1920,
+    height: 1080,
+  })),
+  useIsTablet: jest.fn(() => false),
 }));
 
 jest.mock("@applicaster/zapp-react-native-redux/hooks/usePickFromState", () => {

package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap

@@ -16,7 +16,7 @@ exports[`<Screen Component /> when the navbar should be hidden renders correctly
     pathname="/river/testId"
     selected="testId"
     testID="navBar"
-    title=""
+    title="Test Title"
   />
   <View>
     <View
@@ -48,7 +48,7 @@ exports[`<Screen Component /> when the navbar should show renders correctly 1`]
     pathname="/river/testId"
     selected="testId"
     testID="navBar"
-    title=""
+    title="Test Title"
   />
   <View>
     <View

package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx

@@ -94,7 +94,7 @@ export const AnimationView = ({
   const isAudioItem = React.useMemo(
     () =>
       videoModalItem?.content?.type?.includes?.("audio") ||
-      videoModalItem?.type?.value === "audio",
+      videoModalItem?.type?.value?.includes?.("audio"),
     [videoModalItem]
   );
 
@@ -107,7 +107,6 @@ export const AnimationView = ({
     progressBarHeight,
     isTablet,
     isTabletLandscape,
-    inlineAudioPlayer,
     tabletLandscapePlayerTopPosition,
   });
 

package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx

@@ -17,6 +17,7 @@ export enum PlayerAnimationStateEnum {
   maximize = "maximize",
   drag_player = "drag_player",
   drag_scroll = "drag_scroll",
+  appear_as_docked = "appear_as_docked",
 }
 
 export type PlayerAnimationStateT = number | PlayerAnimationStateEnum | null;

package/Components/VideoModal/ModalAnimation/utils.ts

@@ -309,7 +309,6 @@ export const getMoveUpValue = ({
   progressBarHeight,
   isTablet,
   isTabletLandscape,
-  inlineAudioPlayer,
   tabletLandscapePlayerTopPosition,
 }) => {
   if (additionalData.saveArea) {
@@ -322,17 +321,12 @@ export const getMoveUpValue = ({
   }
 
   if (isTablet) {
-    if (
-      isTabletLandscape &&
-      (!isAudioItem || (isAudioItem && inlineAudioPlayer))
-    ) {
+    if (isTabletLandscape) {
       return -tabletLandscapePlayerTopPosition + progressBarHeight;
+    } else {
+      return -130;
     }
-
-    // for audioPlayer(tablet/isTabletPortrait) in docked mode
-    return -130;
   }
 
-  // for audioPlayer(mobile) in docked mode
   return -50 + progressBarHeight;
 };

package/Components/VideoModal/PlayerWrapper.tsx

@@ -74,20 +74,6 @@ const getScreenAspectRatio = () => {
   return longEdge / shortEdge;
 };
 
-const safeAreaStyles = (
-  configuration: Configuration,
-  isTablet: boolean
-): ViewStyle => {
-  const tablet_landscape_player_container_background_color =
-    configuration?.tablet_landscape_player_container_background_color;
-
-  return {
-    backgroundColor: isTablet
-      ? tablet_landscape_player_container_background_color
-      : "transparent",
-  };
-};
-
 const getEdges = (isTablet: boolean, isInlineModal: boolean) => {
   if (isTablet) {
     return ["top"];
@@ -156,6 +142,7 @@ const PlayerWrapperComponent = (props: Props) => {
     children,
     isTabletPortrait,
     configuration,
+    fullscreen,
     pip,
   } = props;
 
@@ -211,14 +198,17 @@ const PlayerWrapperComponent = (props: Props) => {
     [containerDimensions, playerDimensionsHack]
   );
 
+  const wrapperViewStyle: ViewStyle = {
+    backgroundColor:
+      isTablet && !fullscreen
+        ? configuration?.tablet_landscape_player_container_background_color
+        : "transparent",
+  };
+
   return (
     <WrapperView
       edges={getEdges(isTablet, isInlineModal) as readonly Edge[]}
-      style={[
-        safeAreaStyles(configuration, isTablet),
-        style,
-        playerDimensionsHack,
-      ]}
+      style={[wrapperViewStyle, style, playerDimensionsHack]}
     >
       <AnimationComponent
         animationType={ComponentAnimationType.moveUpComponent}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.6372000108",
+  "version": "13.0.0-alpha.6444233049",
   "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.0-alpha.6372000108",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6372000108",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6372000108",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6372000108",
+    "@applicaster/applicaster-types": "13.0.0-alpha.6444233049",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6444233049",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6444233049",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6444233049",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",