@applicaster/zapp-react-native-ui-components 14.0.0-alpha.1054425138 → 14.0.0-alpha.2847632144

package/Components/AudioPlayer/Artwork.tsx

@@ -1,5 +1,16 @@
 import React from "react";
-import { View, Image } from "react-native";
+import { View, Image, StyleSheet } from "react-native";
+import { toNumberWithDefaultZero } from "@applicaster/zapp-react-native-utils/numberUtils";
+
+const styles = StyleSheet.create({
+  container: {
+    marginHorizontal: 24,
+  },
+  image: {
+    width: 400,
+    height: 400,
+  },
+});
 
 type Props = {
   srcImage: string;
@@ -9,25 +20,19 @@ type Props = {
     backgroundColor: string;
     backgroundImage: string;
     isRTL: boolean;
+    artworkBorderRadius: Option<number>;
   };
 };
 
-const containerStyles = {
-  marginHorizontal: 24,
-};
-
-const imageStyles = {
-  width: 400,
-  height: 400,
-};
+export function Artwork({ srcImage, config }: Props) {
+  const borderRadius = toNumberWithDefaultZero(config.artworkBorderRadius);
 
-export function Artwork({ srcImage }: Props) {
   return (
-    <View style={containerStyles}>
+    <View style={styles.container}>
       <Image
         fadeDuration={0}
         source={{ uri: srcImage }}
-        style={imageStyles}
+        style={[styles.image, { borderRadius }]}
         resizeMode="cover"
       />
     </View>

package/Components/AudioPlayer/AudioPlayer.tsx

@@ -72,6 +72,7 @@ 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 artworkBorderRadius = getProp("audio_player_artwork_border_radius");
 
     const audioPlayerBackgroundImageDefaultColor = getProp(
       "audio_player_background_image_default_color"
@@ -154,6 +155,7 @@ export function AudioPlayer(props: Props) {
       artworkAspectRatio,
       channelIcon,
       audioPlayerBackgroundImageDefaultColor,
+      artworkBorderRadius,
     };
   }, [getProp]);
 

package/Components/AudioPlayer/AudioPlayerLayout.tsx

@@ -14,6 +14,7 @@ type Props = {
     backgroundColor: string;
     backgroundImage: string;
     isRTL: boolean;
+    artworkBorderRadius: Option<number>;
   };
   children: React.ReactNode;
   style: ViewStyle;
@@ -97,8 +98,8 @@ export function AudioPlayerLayout({ artwork, config, children, style }: Props) {
 
   const backgroundImgStyles = platformSelect({
     tvos: {
-      width: 1920,
-      height: 1080,
+      width: "100%",
+      height: "100%",
       alignItems: "center",
       justifyContent: "center",
     },

package/Components/AudioPlayer/__tests__/__snapshots__/artWork.test.js.snap

@@ -17,10 +17,15 @@ exports[`<Artwork /> renders correctly 1`] = `
       }
     }
     style={
-      {
-        "height": 400,
-        "width": 400,
-      }
+      [
+        {
+          "height": 400,
+          "width": 400,
+        },
+        {
+          "borderRadius": 0,
+        },
+      ]
     }
   />
 </View>

package/Components/MasterCell/utils/behaviorProvider.ts

@@ -7,48 +7,22 @@ import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerM
 import { BehaviorSubject } from "rxjs";
 import { masterCellLogger } from "../logger";
 import get from "lodash/get";
-import { ScreenMultiSelectProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/ScreenStateMultiSelectProvider";
-import { ScreenSingleValueProvider } from "@applicaster/zapp-react-native-bridge/ZappStorage/ScreenSingleValueProvider";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
 
-const parseContextKey = (
-  key: string,
-  context: string = "ctx"
-): string | null => {
-  if (!key?.startsWith(`@{${context}/`)) return null;
+const parseContextKey = (key: string): string | null => {
+  if (!key?.startsWith("@{ctx/")) return null;
 
-  return key.substring(`@{${context}/`.length, key.length - 1);
+  return key.substring("@{ctx/".length, key.length - 1);
 };
 
 const getDataSourceProvider = (
-  behavior: Behavior,
-  screenRoute: string
+  behavior: Behavior
 ): BehaviorSubject<string[] | string> | null => {
   if (!behavior) return null;
 
   const selection = String(behavior.current_selection);
-  const screenKey = parseContextKey(selection, "screen");
-
-  if (screenKey) {
-    if (behavior.select_mode === "multi") {
-      return ScreenMultiSelectProvider.getProvider(
-        screenKey,
-        screenRoute
-      ).getObservable();
-    }
-
-    if (behavior.select_mode === "single") {
-      return ScreenSingleValueProvider.getProvider(
-        screenKey,
-        screenRoute
-      ).getObservable();
-    }
-  }
-
   const contextKey = parseContextKey(selection);
 
   if (contextKey) {
-    // TODO: Add storage scope to behavior
     if (behavior.select_mode === "multi") {
       return StorageMultiSelectProvider.getProvider(contextKey).getObservable();
     }
@@ -67,7 +41,6 @@ const getDataSourceProvider = (
 
 export const useBehaviorUpdate = (behavior: Behavior) => {
   const [lastUpdate, setLastUpdate] = React.useState<number | null>(null);
-  const screenRoute = useRoute()?.pathname || "";
   const player = usePlayer();
 
   const triggerUpdate = () => setLastUpdate(Date.now());
@@ -75,7 +48,7 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
   useEffect(() => {
     if (!behavior) return;
 
-    const dataSource = getDataSourceProvider(behavior, screenRoute);
+    const dataSource = getDataSourceProvider(behavior);
 
     if (dataSource) {
       const subscription = dataSource.subscribe(triggerUpdate);
@@ -99,15 +72,10 @@ export const useBehaviorUpdate = (behavior: Behavior) => {
 
 // We cant use async in this function (its inside render),
 // so we rely on useBehaviorUpdate to update current value and trigger re-render
-export const isCellSelected = ({
-  item,
-  screenRoute,
-  behavior,
-}: {
-  item: ZappEntry;
-  screenRoute: string;
-  behavior?: Behavior;
-}): boolean => {
+export const isCellSelected = (
+  item: ZappEntry,
+  behavior?: Behavior
+): boolean => {
   if (!behavior) return false;
 
   const id = behavior.selector ? get(item, behavior.selector) : item.id;
@@ -131,30 +99,7 @@ export const isCellSelected = ({
   }
 
   const selection = String(behavior.current_selection);
-
-  const screenKey = parseContextKey(selection, "screen");
-
-  if (screenKey) {
-    if (behavior.select_mode === "single") {
-      const selectedItem = ScreenSingleValueProvider.getProvider(
-        screenKey,
-        screenRoute
-      ).getValue();
-
-      return selectedItem === String(id);
-    }
-
-    if (behavior.select_mode === "multi") {
-      const selectedItems = ScreenMultiSelectProvider.getProvider(
-        screenKey,
-        screenRoute
-      ).getSelectedItems();
-
-      return selectedItems?.includes(String(id));
-    }
-  }
-
-  const contextKey = parseContextKey(selection, "ctx");
+  const contextKey = parseContextKey(selection);
 
   if (contextKey) {
     if (behavior.select_mode === "single") {

package/Components/MasterCell/utils/index.ts

@@ -8,7 +8,6 @@ import { masterCellLogger } from "../logger";
 import { getCellState } from "../../Cell/utils";
 import { getColorFromData } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { isCellSelected, useBehaviorUpdate } from "./behaviorProvider";
-import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 const hasElementSpecificViewType = (viewType) => (element) => {
   if (R.isNil(element)) {
@@ -191,16 +190,8 @@ export const getFocusedButtonId = (focusable) => {
   });
 };
 
-export const isSelected = ({
-  item,
-  screenRoute,
-  behavior,
-}: {
-  item: ZappEntry;
-  screenRoute: string;
-  behavior?: Behavior;
-}) => {
-  return isCellSelected({ item, screenRoute, behavior });
+export const isSelected = (item: ZappEntry, behavior?: Behavior) => {
+  return isCellSelected(item, behavior);
 };
 
 export const useCellState = ({
@@ -213,10 +204,9 @@ export const useCellState = ({
   focused: boolean;
 }): CellState => {
   const lastUpdate = useBehaviorUpdate(behavior);
-  const router = useRoute();
 
   const _isSelected = useMemo(
-    () => isSelected({ item, screenRoute: router?.pathname, behavior }),
+    () => isSelected(item, behavior),
     [behavior, item, lastUpdate]
   );
 

package/Components/PlayerContainer/PlayerContainer.tsx

@@ -6,12 +6,15 @@ import * as R from "ramda";
 import uuid from "uuid/v4";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils/playerManager";
 import {
-  isApplePlatform,
   isTV,
   platformSelect,
   isAndroidTVPlatform,
+  isTvOSPlatform,
 } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { isAudioItem } from "@applicaster/zapp-react-native-utils/playerUtils";
+import {
+  isAudioItem,
+  isInlineTV as isInlineTVUtil,
+} from "@applicaster/zapp-react-native-utils/playerUtils";
 
 import { TVEventHandlerComponent } from "@applicaster/zapp-react-native-tvos-ui-components/Components/TVEventHandlerComponent";
 import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
@@ -22,7 +25,7 @@ import {
 } from "@applicaster/zapp-react-native-utils/reactHooks";
 
 import { PlayerStateContext } from "../../Contexts/PlayerStateContext";
-import { isAppleTV } from "../../Helpers/Platform";
+
 import {
   QUICK_BRICK_EVENTS,
   QuickBrickEvent,
@@ -97,6 +100,11 @@ const focusableBottomContainerId = "player-container-bottom";
 
 const isAndroidTV = isAndroidTVPlatform();
 
+const isTvOS = isTvOSPlatform();
+
+// height for container with additional content below player
+const INLINE_CONTAINER_CONTENT_HEIGHT = 400;
+
 const withBorderHack = () => {
   if (isAndroidTV) {
     /* @HACK: see GH#7269 */
@@ -126,7 +134,7 @@ const webStyles = {
     flex: "initial",
   },
   inlineRiver: {
-    height: 400,
+    height: INLINE_CONTAINER_CONTENT_HEIGHT,
   },
 };
 
@@ -144,7 +152,7 @@ const nativeStyles = {
     flex: 1,
   },
   inlineRiver: {
-    height: 400,
+    height: INLINE_CONTAINER_CONTENT_HEIGHT,
   },
 };
 
@@ -164,12 +172,11 @@ const renderApplePlayer = ({
   videoStyle,
   playNextData,
 }) => {
-  const { title, summary } = item || {};
-
-  if (!isAppleTV() || !player) {
+  if (!isTvOS || !player) {
     return null;
   }
 
+  // render audio_player for tvos
   if (isAudioContent) {
     return (
       <AudioPlayer
@@ -183,6 +190,8 @@ const renderApplePlayer = ({
     return null;
   }
 
+  const { title, summary } = item || {};
+
   return (
     <ProgramInfo
       title={title}
@@ -193,21 +202,6 @@ const renderApplePlayer = ({
   );
 };
 
-const renderRestPlayers = ({ item, showAudioPlayer, pluginConfiguration }) => {
-  if (isApplePlatform()) {
-    return null;
-  }
-
-  return (
-    showAudioPlayer && (
-      <AudioPlayer
-        audio_item={item}
-        plugin_configuration={pluginConfiguration}
-      />
-    )
-  );
-};
-
 const PlayerContainerComponent = (props: Props) => {
   const {
     Player,
@@ -337,7 +331,7 @@ const PlayerContainerComponent = (props: Props) => {
 
       setState({ error: errorObj });
 
-      if (!isAppleTV()) {
+      if (!isTvOS) {
         setTimeout(() => {
           close();
         }, 800);
@@ -568,10 +562,7 @@ const PlayerContainerComponent = (props: Props) => {
 
   const uri = item?.content ? item.content?.src : null;
 
-  const isInlineTV =
-    screenData?.ui_components &&
-    screenData?.ui_components?.length > 0 &&
-    isTV();
+  const isInlineTV = isInlineTVUtil(screenData);
 
   const inline =
     [VideoModalMode.MAXIMIZED, VideoModalMode.MINIMIZED].includes(mode) ||
@@ -626,12 +617,6 @@ const PlayerContainerComponent = (props: Props) => {
     playNextData,
   };
 
-  const restPlayerProps = {
-    item,
-    showAudioPlayer: isAudioContent,
-    pluginConfiguration,
-  };
-
   return (
     <PlayerStateContext.Provider value={value}>
       <PlayerContainerContextProvider
@@ -707,8 +692,6 @@ const PlayerContainerComponent = (props: Props) => {
                       </Player>
                     </PlayerFocusableWrapperView>
 
-                    {renderRestPlayers(restPlayerProps)}
-
                     {state.error ? <ErrorDisplay error={state.error} /> : null}
                   </View>
                   {/* Components container */}
@@ -732,7 +715,7 @@ const PlayerContainerComponent = (props: Props) => {
                             screenId={screenData.id}
                             key={item.id}
                             groupId={FocusableGroupMainContainerId}
-                            cellTapAction={(event) => onCellTap(event)}
+                            cellTapAction={onCellTap}
                             extraAnchorPointYOffset={-600}
                             isScreenWrappedInContainer={true}
                             containerHeight={styles.inlineRiver.height}

package/Decorators/RiverFeedLoader/index.tsx

@@ -13,7 +13,6 @@ import {
   loadDatasources,
   usePipesContexts,
 } from "./utils";
-import { useScreenResolvers } from "../ZappPipesDataConnector";
 
 type RiverProps = {
   dispatch: DispatchProp;
@@ -26,7 +25,7 @@ export function WithRiverFeedLoader(Component: ZappComponent) {
   return function WrappedWithRiverFeedLoader(props: RiverProps) {
     const { river } = props;
     const { screenData, pathname } = useRoute();
-    const resolvers = useScreenResolvers(pathname);
+
     const pipesContexts = usePipesContexts(river.id, pathname);
 
     const componentsToLoad = ignoreComponentsWithClearCacheFlag(
@@ -50,12 +49,7 @@ export function WithRiverFeedLoader(Component: ZappComponent) {
         item?.filter((item2) => item2 !== undefined)
       );
 
-      loadDatasources(
-        nonEmptyDataSources,
-        river?.id,
-        props.dispatch,
-        resolvers
-      );
+      loadDatasources(nonEmptyDataSources, river?.id, props.dispatch);
     }, []);
 
     return <Component {...props} />;

package/Decorators/RiverFeedLoader/utils/index.ts

@@ -12,16 +12,11 @@ export { getDatasourceUrl } from "./getDatasourceUrl";
 
 export const DATASOURCE_CHUNKS = 10;
 
-export async function loadDatasources(
-  urls: string[][],
-  riverId,
-  dispatch,
-  resolvers
-) {
+export async function loadDatasources(urls: string[][], riverId, dispatch) {
   return reducePromises<string, void>(
     mapPromises<string, void>((url) => {
       if (url) {
-        return dispatch(loadPipesData(url, { riverId, resolvers }));
+        return dispatch(loadPipesData(url, { riverId }));
       }
     }),
     undefined,

package/Decorators/ZappPipesDataConnector/index.tsx

@@ -19,11 +19,7 @@ import { ZappPipesSearchContext } from "@applicaster/zapp-react-native-ui-compon
 import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 
 import { isVerticalListOrGrid } from "./utils";
-import {
-  subscribeForUrlContextKeyChanges,
-  subscribeForUrlScreenKeyChanges,
-} from "@applicaster/zapp-pipes-v2-client";
-import { ScreenStateResolver } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/contextResolver";
+import { subscribeForUrlContextKeyChanges } from "@applicaster/zapp-pipes-v2-client";
 
 type Props = {
   component: ZappUIComponent;
@@ -204,15 +200,11 @@ const useGetStaticFeed = (getter, component, index) => {
   return { url, loading, data, error };
 };
 
-export const useScreenResolvers = (screenRoute: string) => {
-  return { screen: new ScreenStateResolver(screenRoute) };
-};
-
 export function zappPipesDataConnector(
   Component: React.FC<any> | React.ComponentClass<any>
 ) {
   return function WrappedWithZappPipesData(props: Props) {
-    const { screenData, pathname } = useRoute();
+    const { screenData } = useRoute();
     const { plugins } = usePickFromState(["plugins"]);
 
     const screenContextData = useScreenContext();
@@ -294,17 +286,6 @@ export function zappPipesDataConnector(
       componentIndex
     );
 
-    useEffect(() => {
-      if (!(dataSourceUrl?.includes("pipesv2://") && reloadData)) {
-        return subscribeForUrlScreenKeyChanges(
-          dataSourceUrl,
-          pathname,
-          {},
-          reloadData
-        );
-      }
-    }, [dataSourceUrl, reloadData]);
-
     useEffect(() => {
       if (dataSourceUrl?.includes("pipesv2://") && reloadData) {
         const addListener = getListenerFromPlugin(dataSourceUrl, plugins);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "14.0.0-alpha.1054425138",
+  "version": "14.0.0-alpha.2847632144",
   "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": "14.0.0-alpha.1054425138",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.1054425138",
-    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.1054425138",
-    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.1054425138",
+    "@applicaster/applicaster-types": "14.0.0-alpha.2847632144",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-alpha.2847632144",
+    "@applicaster/zapp-react-native-redux": "14.0.0-alpha.2847632144",
+    "@applicaster/zapp-react-native-utils": "14.0.0-alpha.2847632144",
     "promise": "^8.3.0",
     "url": "^0.11.0",
     "uuid": "^3.3.2"