@applicaster/zapp-react-native-ui-components 12.0.0-alpha.7539319320 → 12.0.0-alpha.9004455836

package/Components/GeneralContentScreen/GeneralContentScreen.tsx

@@ -52,13 +52,13 @@ export const GeneralContentScreen = ({
       React.useState(actionsInitialStateSetters.length === 0);
 
     useEffect(() => {
-      log_info(
-        `ScreenContainer: starting to check river action provider ready, current status: ${riverActionProvidersReady}`,
-        { actionsInitialStateSetters }
-      );
-
       if (!riverActionProvidersReady) {
         if (actionsInitialStateSetters.length > 0) {
+          log_info(
+            "ScreenContainer: starting to check river action providers to initialize",
+            { actionsInitialStateSetters }
+          );
+
           allSettled(actionsInitialStateSetters).finally(() => {
             log_info(
               "ScreenContainer: action provider ready, completed. Starting to present screen"

package/Components/HandlePlayable/HandlePlayable.tsx

@@ -104,7 +104,7 @@ export function HandlePlayable({
   const [Player, playerModuleProperties] = getPlayer(item, state);
 
   const { module: CastPlugin } =
-    findPluginByIdentifier(CHROMECAST_PLUGIN_ID, state.plugins) || {};
+    findPluginByIdentifier(CHROMECAST_PLUGIN_ID, state.plugins, true) || {};
 
   const [playable, setPlayable] =
     React.useState<Nullable<PlayableComponent>>(null);

package/Components/Image/Image.android.tsx

@@ -1,5 +1,4 @@
 import React from "react";
-
 import FastImage, {
   FastImageProps,
 } from "@applicaster/react-native-fast-image";

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

@@ -152,7 +152,6 @@ export const BorderContainerView = (props: Props) => {
     ...updatedPaddings,
     width: updatedWidth,
     height: updatedHeight,
-    ...borderStyleForMissingBorder,
   };
 
   return (

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

@@ -1,6 +1,7 @@
 import {
   compact,
   ifElseFocusedSelected,
+  ifElseSelected,
 } from "@applicaster/zapp-react-native-utils/cellUtils";
 
 import { getPositionStyles } from "./utils";
@@ -12,9 +13,15 @@ type Props = {
   value: Function;
   state: string;
   visible?: Boolean;
+  isMobile?: Boolean;
 };
 
-export const CellBadge = ({ value, state, visible = true }: Props) => {
+export const CellBadge = ({
+  value,
+  state,
+  visible = true,
+  isMobile = false,
+}: Props) => {
   if (!value("cell_badge_switch") || !visible) {
     return null;
   }
@@ -45,13 +52,19 @@ export const CellBadge = ({ value, state, visible = true }: Props) => {
         data: [
           {
             func: () => {
-              return ifElseFocusedSelected(
-                state,
-                value("cell_badge_focused"),
-                value("cell_badge_selected"),
-                value("cell_badge_focused_selected"),
-                value("cell_badge_default")
-              );
+              return isMobile
+                ? ifElseSelected(
+                    state,
+                    value("cell_badge_selected"),
+                    value("cell_badge_default")
+                  )
+                : ifElseFocusedSelected(
+                    state,
+                    value("cell_badge_focused"),
+                    value("cell_badge_selected"),
+                    value("cell_badge_focused_selected"),
+                    value("cell_badge_default")
+                  );
             },
             args: [],
             propName: "uri",

package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts

@@ -50,13 +50,17 @@ export const CollapsibleTextContainer = ({
         func: (data) => {
           const value = getValue("background_color");
 
-          // check if value is a reference to an extension
-          if (value.startsWith("extensions")) {
-            return pathOr(value, value.split("."), data);
-          } else {
-            // return default value
-            return additionalStyles.backgroundColor;
+          const valueFromData = pathOr(value, value.split("."), data);
+
+          if (
+            valueFromData &&
+            (valueFromData.startsWith("#") || valueFromData.startsWith("rgba("))
+          ) {
+            return valueFromData;
           }
+
+          // return default value
+          return additionalStyles.backgroundColor;
         },
         propName: "backgroundColor",
       },

package/Components/River/River.tsx

@@ -1,13 +1,10 @@
 import * as React from "react";
 import * as R from "ramda";
+import { GeneralContentScreen } from "@applicaster/zapp-react-native-ui-components/Components/GeneralContentScreen";
 
 import { FeedLoader } from "../FeedLoader";
 import { ScreenResolver } from "../ScreenResolver";
 
-import type { ZappScreenProps } from "@applicaster/zapp-react-native-flow-types";
-
-import { GeneralContentScreen } from "../GeneralContentScreen";
-
 type Props = ZappScreenProps & {
   feedUrl?: string;
   isInsideContainer?: boolean;
@@ -18,6 +15,12 @@ type Props = ZappScreenProps & {
     | import("react-native").FlatListProps<any>
   ) &
     Record<string, any>;
+  appData: AppDataKeys;
+  screenTitle: string;
+  screenSummary: string;
+  setIsScreenWrappedInContainer: (isInsideContainer: boolean) => void;
+  screenContext: ZappRiver;
+  river: ZappRiver;
 };
 
 type State = {
@@ -27,7 +30,7 @@ type State = {
 export class RiverComponent extends React.Component<Props, State> {
   private currentScreenTitle: string;
   private currentScreenSummary: string;
-  constructor(props) {
+  constructor(props: Props) {
     super(props);
 
     this.state = {

package/Components/Screen/index.tsx

@@ -7,7 +7,6 @@ import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
 import { useScreenOrientationHandler } from "./orientationHandler";
 import { useScreenConfiguration } from "../River/useScreenConfiguration";
 import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
-import type { ZappNavigationProps } from "@applicaster/zapp-react-native-flow-types/index";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
 

package/Components/TrackedView/index.tsx

@@ -17,9 +17,12 @@ type TrackedViewProps = {
 export const TrackedView = memo(function TrackedView(props: TrackedViewProps) {
   const children = props.children;
 
-  const onPositionUpdated = useCallback((event: TrackedViewNativeProps) => {
-    props?.onPositionUpdated(event.nativeEvent);
-  }, []);
+  const onPositionUpdated = useCallback(
+    (event: TrackedViewNativeProps) => {
+      props.onPositionUpdated(event.nativeEvent);
+    },
+    [props.onPositionUpdated]
+  );
 
   if (isTV()) {
     return <View {...(props as any)}>{children}</View>;

package/Components/VideoLive/LiveImageManager.ts

@@ -6,6 +6,7 @@ import {
 import { setUserCellPlayerMutedPreference } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/userCellPlayerMutedPreference";
 import { loggerLiveImageManager } from "./loggerHelper";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
+import { Component } from "react";
 
 const { log_debug, log_info, log_error } = loggerLiveImageManager;
 
@@ -36,7 +37,8 @@ type Position = {
 type LiveImageProps = {
   player: Player;
   playerId: string;
-  setMode: (type: LiveImageType) => void;
+  setMode?: (type: LiveImageType) => void;
+  component: Component;
   // TODO: ...primary, powerCell, tvGallery, etc.
   // type: string;
 };
@@ -164,7 +166,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
 
     // Fake close event, because we unmount native view
     item.player?.onPlayerClose();
-    item.setMode(LiveImageType.Image);
+    item.setMode?.(LiveImageType.Image);
 
     if (item === this.currentlyPlaying) {
       this.currentlyPlaying = null;
@@ -191,8 +193,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
     }
 
     this.currentlyPlaying = item;
-
-    item.setMode(LiveImageType.Video);
+    item.setMode?.(LiveImageType.Video);
 
     if (item.player.playerState.isReadyToPlay) {
       item.player.play();
@@ -209,6 +210,11 @@ export class LiveImageManager implements PlayerLifecycleListener {
     this.pauseItem(item);
   };
 
+  public onLiveImageCompleted = (_item: LiveImage) => {
+    // TODO: Notify listeners that player has died
+    // Do not try look for new playable, otherwise you will restart video finish to play
+  };
+
   public muteAll = () => {
     log_debug("muteAll");
 
@@ -235,6 +241,14 @@ export class LiveImageManager implements PlayerLifecycleListener {
     const playerItem = this.findNextPlayableItem();
 
     if (playerItem) {
+      if (!playerItem.isFullyVisible) {
+        log_error(
+          `checkPlayerPosition: trying to start playback currently invisible item: ${playerInfo(
+            playerItem.player
+          )}`
+        );
+      }
+
       // Will also check if it's item that already playing
       this.playLiveImage(playerItem);
     }
@@ -242,7 +256,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
 
   onPrimaryPlayerClosed = () => {
     const playerItem = this.findNextPlayableItem();
-
     log_info("onPrimaryPlayerClosed: starting to play visible live-image");
 
     this.currentlyPlaying = null;
@@ -299,6 +312,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
     player.removeListener(this.liveImageManagerListenerId);
 
     if (player === this.primaryPlayer) {
+      console.log("Anton primary player closed", this.primaryPlayer);
       this.primaryPlayer = null;
       this.onPrimaryPlayerClosed();
     }
@@ -361,7 +375,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
 
       // TODO: ...Maybe player some other item
     } else {
-      item.setMode(LiveImageType.Image);
+      item.setMode?.(LiveImageType.Image);
     }
 
     // Prevent receiving onEnd event from both `close` and `end` player events
@@ -377,10 +391,14 @@ export class LiveImageManager implements PlayerLifecycleListener {
   };
 
   onLiveImageError = (item: LiveImage, error: Error) => {
-    item.setMode(LiveImageType.Image);
+    item.setMode?.(LiveImageType.Image);
 
-    if (this.currentlyPlaying === item) {
+    const currentItem = this.currentlyPlaying;
+    console.log("Anton onLiveImageError-1", {currentItem});
+
+    if (currentItem === item) {
       this.currentlyPlaying = null;
+      console.log("Anton onLiveImageError, remove current");
       // TODO: ...Maybe player some other item
     }
 
@@ -389,8 +407,8 @@ export class LiveImageManager implements PlayerLifecycleListener {
       event: {
         item,
         error,
-        playerId: this.currentlyPlaying?.playerId,
-        primaryPlayerId: this.primaryPlayer?.playerId,
+        playerId: currentItem?.playerId,
+        primaryPlayerId: currentItem?.playerId,
       },
     });
   };
@@ -446,12 +464,13 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
   };
 
   readonly playerId: string;
+  readonly component: Component;
 
   constructor(props: LiveImageProps) {
     this.player = props.player;
     this.setMode = props.setMode;
     this.playerId = this.player.playerId;
-
+    this.component = props.component;
     this.player.addListener({ id: "live-image", listener: this });
   }
 

package/Components/VideoLive/PlayerLiveImageComponent.tsx

@@ -1,7 +1,6 @@
 // /// <reference types="@applicaster/applicaster-types" />
 //
 import * as React from "react";
-import * as R from "ramda";
 
 import { AppState, AppStateStatus } from "react-native";
 import { TrackedView } from "../TrackedView";
@@ -9,7 +8,6 @@ import { useDimensions } from "@applicaster/zapp-react-native-utils/reactHooks/l
 
 import { playerFactory } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/playerFactory";
 
-import { BufferAnimation } from "@applicaster/zapp-react-native-ui-components/Components/PlayerContainer/BufferAnimation";
 import {
   isApplePlatform,
   isTV,
@@ -25,12 +23,13 @@ import { loggerLiveImageComponent } from "./loggerHelper";
 import { usePlayer } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/usePlayer";
 import { PlayerRole } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/conts";
 import { getAutoplaySettings } from "./utils";
+import { isString } from "@applicaster/zapp-react-native-utils/stringUtils";
+import { BufferAnimation } from "../PlayerContainer/BufferAnimation";
 
 const { log_error } = loggerLiveImageComponent;
 
-const isMeasurement = (item) => {
-  return item.id.startsWith("pre-measurement-");
-};
+const isMeasurement = (item: ZappEntry) =>
+  isString(item.id) && item.id.startsWith("pre-measurement-");
 
 type Props = {
   item: ZappEntry;
@@ -55,69 +54,66 @@ const PlayerLiveImageComponent = (props: Props) => {
     isTV() ? false : getUserCellPlayerMutedPreference(props.audioMutedByDefault)
   );
 
-  const [PlayerViewComponent, setPlayerViewComponent] = React.useState(null);
-  const Player: any = PlayerViewComponent || BufferAnimation;
-
   const ref = React.useRef(null);
 
-  const liveImageItem: LiveImage = React.useMemo(() => {
-    /**
-     * Debounced setMode function.
-     *
-     * Sets to video with a 1sec delay. Set to image happens immediately and cancels the timeout.
-     *
-     * @param type video or image
-     */
-    const setModeDebounced = (type: LiveImageType) => {
-      if (type === LiveImageType.Video) {
-        if (type === mode) {
-          return;
-        }
-
-        timeoutRef.current = setTimeout(() => {
-          setMode(type);
-        }, 1000) as unknown as NodeJS.Timeout;
-      } else {
-        if (timeoutRef.current) {
-          clearTimeout(timeoutRef.current);
-        }
+  /**
+   * Debounced setMode function.
+   *
+   * Sets to video with a 1sec delay. Set to image happens immediately and cancels the timeout.
+   *
+   * @param type video or image
+   */
+  const setModeDebounced = React.useCallback((type: LiveImageType) => {
+    if (type === LiveImageType.Video) {
+      if (type === mode) {
+        return;
+      }
 
+      timeoutRef.current = setTimeout(() => {
         setMode(type);
+      }, 1000) as unknown as NodeJS.Timeout;
+    } else {
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = null;
       }
-    };
 
+      setMode(type);
+    }
+  }, [mode]);
+
+  const { screenConfig, playerPluginId } = props;
+
+  const liveImageItem: LiveImage = React.useMemo(() => {
     const playerFactoryItem = playerFactory({
       player: ref,
-      listener: props as Record<string, any>,
       playerId,
       autoplay: false,
       entry: item,
-      muted,
-      playerPluginId: props?.playerPluginId,
-      screenConfig: props?.screenConfig,
+      muted, // Initial muted state, not needed in dependencies
+      playerPluginId: playerPluginId,
+      screenConfig: screenConfig,
       playerRole: PlayerRole.Cell,
     });
 
-    const Component = playerFactoryItem?.Component;
-
-    if (!R.isNil(Component) && Component !== PlayerViewComponent) {
-      setPlayerViewComponent(Component);
-    }
-
     if (playerFactoryItem) {
       return new LiveImage({
         playerId,
         player: playerFactoryItem.controller,
-        setMode: setModeDebounced,
+        component: playerFactoryItem?.Component
       });
     } else {
       throw new Error("Player factory item is null");
     }
-  }, [playerId, item?.id]);
+  }, [playerId, item, playerPluginId, screenConfig]);
+
+  React.useEffect(() => {
+    liveImageItem.setMode = setModeDebounced;
+  }, [setModeDebounced, liveImageItem]);
 
   const { start, end } = React.useMemo(
     () => getAutoplaySettings(item),
-    [item?.id]
+    [item]
   );
 
   const controller = liveImageItem.getPlayer();
@@ -127,6 +123,10 @@ const PlayerLiveImageComponent = (props: Props) => {
     ref.current = component;
   };
 
+  const onLiveImageCompleted = React.useCallback(() => {
+    LiveImageManager.instance.onLiveImageCompleted(liveImageItem);
+  }, [liveImageItem]);
+
   const onStop = React.useCallback(() => {
     LiveImageManager.instance.pauseLiveImage(liveImageItem);
   }, [liveImageItem]);
@@ -140,13 +140,14 @@ const PlayerLiveImageComponent = (props: Props) => {
     const unregister = LiveImageManager.instance.register(liveImageItem);
 
     return () => {
-      unregister();
-
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
+        timeoutRef.current = null;
       }
+
+      unregister();
     };
-  }, [liveImageItem, item]);
+  }, [item, liveImageItem]);
 
   React.useEffect(() => {
     if (!player) {
@@ -178,11 +179,12 @@ const PlayerLiveImageComponent = (props: Props) => {
           setMuted(false);
         },
         onPlayerClose: () => {
+          onLiveImageCompleted();
           setIsReady(false);
         },
       },
     });
-  }, [player, onStop]);
+  }, [player, onStop, onLiveImageCompleted, start, end]);
 
   React.useEffect(() => {
     const subscription = AppState.addEventListener(
@@ -233,40 +235,43 @@ const PlayerLiveImageComponent = (props: Props) => {
         };
       }
     }
-  }, [liveImageItem]);
+  }, [liveImageItem, playerId, controller]);
 
-  const onPositionUpdated = (data) => {
-    const normalizedRect = (rect) => {
-      if (!rect) {
-        return null;
-      }
+  const onPositionUpdated = React.useCallback(
+    (data) => {
+      const normalizedRect = (rect: {left: number, right: number, top: number, bottom: number }) => {
+        if (!rect) {
+          return null;
+        }
 
-      const { left, right, top, bottom } = rect;
+        const { left, right, top, bottom } = rect;
 
-      return {
-        left: left / dimensions.width,
-        right: right / dimensions.width,
-        top: top / dimensions.height,
-        bottom: bottom / dimensions.height,
-        centerX: (left + right) / 2 / dimensions.width,
-        centerY: (top + bottom) / 2 / dimensions.height,
+        return {
+          left: left / dimensions.width,
+          right: right / dimensions.width,
+          top: top / dimensions.height,
+          bottom: bottom / dimensions.height,
+          centerX: (left + right) / 2 / dimensions.width,
+          centerY: (top + bottom) / 2 / dimensions.height,
+        };
       };
-    };
 
-    liveImageItem.position = normalizedRect(data.rect);
+      liveImageItem.position = normalizedRect(data.rect);
 
-    const newIsFullyVisible = !!data.rect;
+      const newIsFullyVisible = !!data.rect;
 
-    if (liveImageItem.isFullyVisible !== newIsFullyVisible) {
-      liveImageItem.isFullyVisible = newIsFullyVisible;
+      if (liveImageItem.isFullyVisible !== newIsFullyVisible) {
+        liveImageItem.isFullyVisible = newIsFullyVisible;
 
-      liveImageItem.isFullyVisible
-        ? LiveImageManager.instance.onViewportEnter(liveImageItem)
-        : LiveImageManager.instance.onViewportLeave(liveImageItem);
-    } else {
-      LiveImageManager.instance.checkPlayerPosition(liveImageItem);
-    }
-  };
+        liveImageItem.isFullyVisible
+          ? LiveImageManager.instance.onViewportEnter(liveImageItem)
+          : LiveImageManager.instance.onViewportLeave(liveImageItem);
+      } else {
+        LiveImageManager.instance.checkPlayerPosition(liveImageItem);
+      }
+    },
+    [liveImageItem, dimensions]
+  );
 
   const platformSpecificProps = isApplePlatform()
     ? { hideNativeControls: true, controls: false }
@@ -276,6 +281,7 @@ const PlayerLiveImageComponent = (props: Props) => {
   const isVideoMode = mode === LiveImageType.Video;
   const isBackgroundImageVisible = isImageMode || !isReadyToPlay;
   const videoStyles = { ...style, position: "absolute", zIndex: -100 };
+  const Player: any = liveImageItem.component || BufferAnimation;
 
   return (
     <TrackedView

package/Components/VideoModal/PlayerWrapper.tsx

@@ -33,6 +33,7 @@ type Props = {
   containerStyle?: ViewStyle;
   inline?: boolean;
   docked?: boolean;
+  pip?: boolean;
   isModal?: boolean;
   fullscreen?: boolean;
   isTabletPortrait?: boolean;
@@ -135,6 +136,7 @@ export const PlayerWrapper = (props: Props) => {
     children,
     isTabletPortrait,
     configuration,
+    pip,
   } = props;
 
   const isTablet = useIsTablet();
@@ -158,9 +160,9 @@ export const PlayerWrapper = (props: Props) => {
     () => ({
       ...baseDimensions,
       width: isInlineModal && docked ? undefined : baseDimensions.width,
-      aspectRatio: !isInlineModal ? getScreenAspectRatio() : 16 / 9,
+      aspectRatio: !isInlineModal && !pip ? getScreenAspectRatio() : 16 / 9,
     }),
-    [baseDimensions, isInlineModal]
+    [baseDimensions, isInlineModal, pip]
   );
 
   const containerDimensions: DimensionsT = React.useMemo(

package/Decorators/RiverResolver/index.tsx

@@ -1,9 +1,5 @@
 import * as React from "react";
 
-import type {
-  ZappComponent,
-  ZappRivers,
-} from "@applicaster/zapp-react-native-flow-types";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { usePathname } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";

package/Decorators/index.tsx

@@ -1,9 +1,5 @@
 import { zappPipesDataConnector } from "./ZappPipesDataConnector";
 import * as R from "ramda";
-import type {
-  ZappComponent,
-  ZappDecorator,
-} from "@applicaster/zapp-react-native-flow-types";
 
 import { withNavigator } from "./Navigator";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "12.0.0-alpha.7539319320",
+  "version": "12.0.0-alpha.9004455836",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -29,16 +29,15 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "devDependencies": {
-    "@applicaster/zapp-react-native-flow-types": "1.5.0",
     "@types/react": "17.0.2",
     "@types/react-native": "0.69.6",
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "12.0.0-alpha.7539319320",
-    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.7539319320",
-    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.7539319320",
-    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.7539319320",
+    "@applicaster/applicaster-types": "12.0.0-alpha.9004455836",
+    "@applicaster/zapp-react-native-bridge": "12.0.0-alpha.9004455836",
+    "@applicaster/zapp-react-native-redux": "12.0.0-alpha.9004455836",
+    "@applicaster/zapp-react-native-utils": "12.0.0-alpha.9004455836",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",