@applicaster/zapp-react-native-ui-components 13.0.0-alpha.6944415045 → 13.0.0-alpha.7192404241

package/Components/Cell/Cell.tsx

@@ -61,7 +61,6 @@ type Props = {
   skipFocusManagerRegistration?: boolean;
   shouldUpdate: boolean;
   behavior: Behavior;
-  componentsMapOffset: number;
 };
 
 type State = {
@@ -274,10 +273,14 @@ export class CellComponent extends React.Component<Props, State> {
             if (isFocused) {
               const accessibilityManager = AccessibilityManager.getInstance();
 
+              const accessibilityTitle =
+                item?.extensions?.accessibility?.label || item?.title || "";
+
+              const accessibilityHint =
+                item?.extensions?.accessibility?.hint || "";
+
               accessibilityManager.readText({
-                text: String(
-                  item.extensions?.accessibility?.label || item.title
-                ),
+                text: `${accessibilityTitle} ${accessibilityHint}`,
               });
             }
 

package/Components/Cell/TvOSCellComponent.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import * as R from "ramda";
 import { View, StyleSheet } from "react-native";
 
-import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable/FocusableTvOS";
+import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
 import { FocusableCell } from "@applicaster/zapp-react-native-ui-components/Components/FocusableCell";
 import { getItemType } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";
@@ -65,7 +65,6 @@ type Props = {
   isFocusable: boolean;
   shouldUpdate: boolean;
   behavior: Behavior;
-  componentsMapOffset: number;
 };
 
 type State = {
@@ -180,7 +179,6 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       groupId,
       component,
       index,
-      componentsMapOffset,
     } = this.props;
 
     this.setScreenLayout(componentAnchorPointY, screenLayout);
@@ -195,11 +193,13 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       const extraAnchorPointYOffset =
         screenLayout?.extraAnchorPointYOffset || 0;
 
+      const marginTop = screenLayout?.screenMarginTop || 0;
+
       const totalOffset =
         headerOffset +
-          (componentAnchorPointY || 0) +
-          extraAnchorPointYOffset -
-          componentsMapOffset || 0;
+        (componentAnchorPointY || 0) +
+        extraAnchorPointYOffset -
+        marginTop;
 
       mainOffsetUpdater?.(
         { tag: this.target },
@@ -247,7 +247,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
 
     const focusableId = R.join("-", [component?.id, id, index]);
 
-    const handleFocus = (arg1: any, index?: number) => {
+    const handleFocus = (arg1: any, index: number) => {
       const focusFn = onFocus || noop;
       focusFn(arg1, index);
 
@@ -280,7 +280,7 @@ export class TvOSCellComponent extends React.Component<Props, State> {
       <View onLayout={this.onLayout} style={styles.container}>
         <Focusable
           id={focusableId}
-          groupId={String(groupId || component?.id)}
+          groupId={groupId || component?.id}
           onFocus={handleFocus}
           onBlur={onBlur || this.onBlur}
           isParallaxDisabled={this.layout?.width > 1740}
@@ -292,18 +292,20 @@ export class TvOSCellComponent extends React.Component<Props, State> {
           style={baseCellStyles}
           isFocusable={isFocusable}
         >
-          {(focused) => (
-            <FocusableCell
-              {...{
-                index,
-                CellRenderer,
-                item,
-                focused: !!(this.props.focused || selectedCell || focused),
-                scrollTo: this.scrollTo,
-                behavior,
-              }}
-            />
-          )}
+          {(focused) => {
+            return (
+              <FocusableCell
+                {...{
+                  index,
+                  CellRenderer,
+                  item,
+                  focused: this.props.focused || selectedCell || focused,
+                  scrollTo: this.scrollTo,
+                  behavior,
+                }}
+              />
+            );
+          }}
         </Focusable>
       </View>
     );

package/Components/Cell/index.js

@@ -11,7 +11,6 @@ import { ScreenScrollingContext } from "../../Contexts/ScreenScrollingContext";
 
 import { ScreenLayoutContextConsumer } from "../../Contexts/ScreenLayoutContext";
 import { createContext } from "@applicaster/zapp-react-native-utils/reactUtils/createContext";
-import { withComponentsMapOffsetContextConsumer } from "../../Contexts/ComponentsMapOffsetContext";
 
 // TODO | Gallery QB | Extract this
 export const ScrollInterceptorContext = createContext(
@@ -31,6 +30,5 @@ export const Cell = R.compose(
   RiverOffsetContext.withConsumer,
   HorizontalScrollContext.withConsumer,
   withConsumer,
-  ScreenLayoutContextConsumer,
-  withComponentsMapOffsetContextConsumer
+  ScreenLayoutContextConsumer
 )(Component);

package/Components/Focusable/FocusableTvOS.tsx

@@ -9,7 +9,7 @@ import {
   focusManager,
   forceFocusableFocus,
 } from "@applicaster/zapp-react-native-utils/appUtils/focusManager/index.ios";
-import { findNodeHandle, ViewStyle } from "react-native";
+import { findNodeHandle } from "react-native";
 
 function noop() {}
 
@@ -35,10 +35,6 @@ type Props = {
   forceFocus?: boolean;
   initialFocus?: boolean;
   onLayout?: (e: any) => void;
-  willReceiveFocus: () => void;
-  hasReceivedFocus: () => void;
-  offsetUpdater: (arg1: string, arg2: number) => number;
-  style: ViewStyle;
 };
 
 export class Focusable extends BaseFocusable<Props> {

package/Components/FocusableList/index.tsx

@@ -15,7 +15,6 @@ import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
 
 import { useParentFocus, useCheckItemIdsForUnique } from "./hooks";
 import { FocusableListItemWrapper } from "./FocusableListItemWrapper";
-import { FocusableScrollView } from "../FocusableScrollView";
 
 const mapIndexed = R.addIndex(R.map);
 
@@ -55,7 +54,6 @@ export type Props<ItemT> = FlatListProps<ItemT> & {
   disableNextFocusUp?: boolean;
   disableNextFocusLeft?: boolean;
   disableNextFocusRight?: boolean;
-  useScrollView?: boolean;
 } & ParentFocus;
 
 function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
@@ -90,7 +88,6 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
     data = [],
     // eslint-disable-next-line unused-imports/no-unused-vars
     omitPropsPropagation = [],
-    useScrollView = false,
   } = props;
 
   useCheckItemIdsForUnique({ componentId: props.id, items: data });
@@ -276,7 +273,6 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
         "initialFocusDirection",
         "withStateMemory",
         "useSequentialLoading",
-        "useScrollView",
         ...omitPropsPropagation,
       ],
       R.__
@@ -299,27 +295,15 @@ function FocusableListComponent<ItemT>(props: Props<ItemT>, ref) {
   return (
     // @ts-ignore
     <ChildrenFocusDeactivatorView flex={1}>
-      {useScrollView ? (
-        <FocusableScrollView
-          ref={ref}
-          {...getFlatListProps(props)}
-          onEndReached={onEndReached}
-          initialNumToRender={initialNumToRender}
-          renderItem={renderItem}
-          focused={focused}
-          data={data}
-        />
-      ) : (
-        <FlatList
-          focusable={false}
-          scrollEnabled={false}
-          ref={ref}
-          {...getFlatListProps(props)}
-          renderItem={renderItem}
-          onEndReached={onEndReached}
-          initialNumToRender={initialNumToRender}
-        />
-      )}
+      <FlatList
+        focusable={false}
+        scrollEnabled={false}
+        ref={ref}
+        {...getFlatListProps(props)}
+        renderItem={renderItem}
+        onEndReached={onEndReached}
+        initialNumToRender={initialNumToRender}
+      />
     </ChildrenFocusDeactivatorView>
   );
 }

package/Components/FocusableScrollView/index.tsx

@@ -11,13 +11,6 @@ import {
   useInitialFocus,
 } from "@applicaster/zapp-react-native-utils/focusManager";
 
-export type FocusableScrollViewRenderItem = (info: {
-  item: ZappUIComponent;
-  index: number;
-  focused: boolean;
-  parentFocus: ParentFocus;
-}) => React.ReactElement;
-
 export type Props = ScrollViewProps & {
   id?: number | string;
   horizontal?: boolean;
@@ -39,27 +32,17 @@ export type Props = ScrollViewProps & {
   initialFocusDirection?: FocusManager.Android.FocusNavigationDirections;
   onAllComponentsLoaded?: () => void;
   omitPropsPropagation?: Array<keyof FlatListProps<any>>;
-  renderItem: FocusableScrollViewRenderItem;
+  renderItem: (info: {
+    item: ZappUIComponent;
+    index: number;
+    focused: boolean;
+    parentFocus: ParentFocus;
+  }) => React.ReactElement;
 } & ParentFocus;
 
 type State = boolean[];
 type Action = { index?: number; isFocusable: boolean; type?: string };
 
-const unwrapArray = (maybeArray) =>
-  Array.isArray(maybeArray) ? maybeArray[0] : maybeArray;
-
-function getEntry<T>(data: T | T[], index: unknown): T {
-  let entry;
-
-  if (R.isNil(index)) {
-    entry = unwrapArray(data);
-  } else if (typeof index === "number") {
-    entry = unwrapArray(data[index]);
-  }
-
-  return entry;
-}
-
 const focusableStateReducer = (
   state: State,
   { index = null, isFocusable, type = null }: Action
@@ -90,7 +73,7 @@ const extendScrollViewRef = (_ref, childCompsMeasurementsMap) => {
   };
 
   _ref.scrollToIndex = (params) => {
-    const { index, viewOffset = 0 } = params;
+    const { index, viewOffset } = params;
 
     const itemByIndex = R.find(R.propEq("index", index))(
       R.values(childCompsMeasurementsMap)
@@ -146,11 +129,8 @@ function FocusableScrollViewComponent(props: Props, ref) {
   );
 
   const getFocusableEntryId = React.useCallback(
-    (_entry: ZappEntry | null, index?: number) => {
-      const entry: { id?: string } = getEntry(
-        R.isNil(index) ? _entry : data,
-        index
-      );
+    (_entry: ZappEntry, index?: number) => {
+      const entry = R.isNil(index) ? _entry : data[index];
 
       return entry ? `${props.id}--${entry?.id}` : undefined;
     },
@@ -293,18 +273,11 @@ function FocusableScrollViewComponent(props: Props, ref) {
   const renderItem = React.useCallback(
     (item, index) => {
       const renderArgs = { item, index };
-
-      const id = getFocusableEntryId(
-        Array.isArray(item) ? item[0] : item,
-        index
-      );
-
-      const nextFocus = getNextFocus(index);
+      const id = `${props.id}--${renderArgs?.item?.id}`;
+      const nextFocus = getNextFocus(renderArgs?.index);
 
       const onItemLayout = (event) => {
-        childCompsMeasurementsMap.current[
-          Array.isArray(item) ? index : item.id
-        ] = {
+        childCompsMeasurementsMap.current[item.id] = {
           index,
           layout: event.nativeEvent.layout,
         };

package/Components/Layout/TV/NavBarContainer.tsx

@@ -1,5 +1,7 @@
 import * as React from "react";
 import { View, StyleSheet } from "react-native";
+import { ScreenLayoutContext } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenLayoutContext";
+import { ifEmptyUseFallback } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { useCurrentScreenData } from "@applicaster/zapp-react-native-utils/reactHooks/screen";
 import { useScreenConfiguration } from "../../River/useScreenConfiguration";
 
@@ -10,15 +12,12 @@ type Props = {
 };
 
 const styles = StyleSheet.create({
-  container: {
-    position: "absolute",
-    top: 0,
-    zIndex: 10,
-    width: 1920,
-  },
+  container: { position: "absolute", top: 0, zIndex: 10, width: 1920 },
 });
 
 export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
+  const screenLayout = React.useContext(ScreenLayoutContext);
+  const screenMarginTop = screenLayout?.screenMarginTop || 0;
   const screen = useCurrentScreenData();
   const screenConfig = useScreenConfiguration(screen?.id);
 
@@ -27,9 +26,9 @@ export const NavBarContainer = ({ children, isVisible, onReady }: Props) => {
       // limits the height of the focusable container of the TopMenuBarTV component
       // to prevent it from being overlapped by the screen content,
       // as it makes TopMenuBarTV unfocusable on tvOS
-      maxHeight: 1,
+      maxHeight: ifEmptyUseFallback(screenConfig?.marginTop, screenMarginTop),
     }),
-    [screenConfig]
+    [screenLayout, screenConfig]
   );
 
   React.useEffect(() => {

package/Components/River/TV/index.tsx

@@ -1,9 +1,4 @@
-import { compose } from "ramda";
 import { River as RiverComponent } from "./River";
 import { withTvEventHandler } from "./withTVEventHandler";
-import { withComponentsMapOffsetContext } from "../../../Contexts/ComponentsMapOffsetContext";
 
-export const River = compose(
-  withTvEventHandler,
-  withComponentsMapOffsetContext
-)(RiverComponent);
+export const River = withTvEventHandler(RiverComponent);

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

@@ -81,6 +81,13 @@ const mockScreenData = {
   id: "A1234",
 };
 
+jest.mock("@applicaster/zapp-react-native-redux/AppStore", () => ({
+  appStore: {
+    get: jest.fn((prop) => mockStore[prop]),
+    getState: jest.fn(),
+  },
+}));
+
 jest.mock("@applicaster/zapp-react-native-utils/localizationUtils", () => ({
   useIsRTL: jest.fn(() => mock_rtl_flag),
 }));
@@ -153,7 +160,13 @@ const plugins = [];
 const navigation = {};
 
 const props = { components, cellStyles, riverComponents, navigation };
-const store = mockStore({ components, cellStyles, plugins });
+
+const store = mockStore({
+  components,
+  cellStyles,
+  plugins,
+  getState: jest.fn(),
+});
 
 jest.useFakeTimers();
 

package/Components/VideoModal/OpaqueLayer.tsx

@@ -0,0 +1,33 @@
+import * as React from "react";
+import { StyleSheet, View } from "react-native";
+
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+
+import { Spinner } from "../Spinner";
+
+const styles = StyleSheet.create({
+  container: {
+    ...StyleSheet.absoluteFillObject,
+    alignItems: "center",
+    justifyContent: "center",
+  },
+});
+
+export const OpaqueLayer = () => {
+  const theme = useTheme();
+
+  return (
+    <View
+      style={[
+        styles.container,
+        {
+          // we assume that it's non-transparent and we could show spinner always until it will be covered by player
+          // this spinner hides all content under modal
+          backgroundColor: theme?.app_background_color,
+        },
+      ]}
+    >
+      <Spinner />
+    </View>
+  );
+};

package/Components/VideoModal/PlayerWrapper.tsx

@@ -10,7 +10,8 @@ import { Edge, SafeAreaView } from "react-native-safe-area-context";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { PlayerDetails } from "./PlayerDetails";
-import { playerDimesionsHack } from "./utils";
+import { playerDimensionsHack } from "./utils";
+import { useDelayedPlayerDetails } from "./hooks";
 
 import {
   AnimatedScrollModal,
@@ -121,34 +122,6 @@ const getTabletWidth = (
   return Number(width) - sidebarWidth;
 };
 
-const showDetails = (
-  isMobile: boolean,
-  docked: boolean,
-  isInlineModal,
-  pip
-): boolean => {
-  if (pip) {
-    return false;
-  }
-
-  if (!isInlineModal) {
-    return false;
-  }
-
-  // for mobile we always show details. Mounting of it very heavy operation.
-  if (isMobile) {
-    return true;
-  }
-
-  // workaround for tablets we need to mount/unmount in order to avoid PlayerDetails content dissappearing
-  // FIXME - find out the reason of dissapearing of content
-  if (docked) {
-    return false;
-  }
-
-  return true;
-};
-
 const PlayerWrapperComponent = (props: Props) => {
   const {
     entry,
@@ -167,7 +140,15 @@ const PlayerWrapperComponent = (props: Props) => {
 
   const isInlineModal = inline && isModal;
 
-  // const style = getStyles(baseStyle, !isTablet, isInlineModal, pip);
+  // Mounting the PlayerDetails component is a resource-intensive process.
+  // Therefore, for performance reasons, we mount it with a delay to make the rotation process as smooth as possible.
+  // The flow is as follows: the rotation occurs first, and then, after a short delay, we mount the PlayerDetails component.
+  // This helps to avoid blocking the rotation and any animations related to the rotation.
+  const isShowPlayerDetails = useDelayedPlayerDetails({
+    isInline: isInlineModal,
+    isDocked: docked,
+    isPip: pip,
+  });
 
   const isTabletLandscape = !isTV() && isTablet && !isTabletPortrait;
 
@@ -203,8 +184,8 @@ const PlayerWrapperComponent = (props: Props) => {
   const WrapperView = React.useMemo(() => (isTV() ? View : SafeAreaView), []);
 
   const childrenStyles = React.useMemo(
-    () => ({ ...playerDimensions, ...playerDimesionsHack }),
-    [containerDimensions, playerDimesionsHack]
+    () => ({ ...playerDimensions, ...playerDimensionsHack }),
+    [containerDimensions, playerDimensionsHack]
   );
 
   return (
@@ -213,7 +194,7 @@ const PlayerWrapperComponent = (props: Props) => {
       style={[
         safeAreaStyles(configuration, isTablet),
         style,
-        playerDimesionsHack,
+        playerDimensionsHack,
       ]}
     >
       <AnimationComponent
@@ -227,7 +208,7 @@ const PlayerWrapperComponent = (props: Props) => {
             defaultStyles.playerContainer,
             containerDimensions,
             containerStyle,
-            playerDimesionsHack,
+            playerDimensionsHack,
           ]}
         >
           <AnimationComponent
@@ -246,7 +227,7 @@ const PlayerWrapperComponent = (props: Props) => {
         </View>
 
         <AnimatedScrollModal>
-          {showDetails(!isTablet, docked, isInlineModal, pip) && (
+          {isShowPlayerDetails && (
             <AnimationComponent
               animationType={ComponentAnimationType.componentFade}
               style={defaultStyles.flex}

package/Components/VideoModal/VideoModal.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import * as R from "ramda";
-import { StyleSheet, View, StatusBar } from "react-native";
+import { equals } from "ramda";
+import { StyleSheet, StatusBar } from "react-native";
 
 import { HandlePlayable } from "@applicaster/zapp-react-native-ui-components/Components/HandlePlayable";
 import {
@@ -17,17 +17,20 @@ import {
 import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks/device/useIsTablet";
 
 import { withModalNavigationContextProvider } from "../../Contexts/ModalNavigationContext";
-import { useModalSize } from "./hooks/useModalSize";
-import { useBackgroundColor } from "./hooks/useBackgroundColor";
-import { useInitialPlayerState } from "./hooks/useInitialPlayerState";
+import {
+  useModalSize,
+  useBackgroundColor,
+  useInitialPlayerState,
+} from "./hooks";
+
 import { APP_EVENTS } from "@applicaster/zapp-react-native-utils/appUtils/events";
-import { Spinner } from "../Spinner";
 import { PathnameContext } from "@applicaster/zapp-react-native-ui-components/Contexts/PathnameContext";
 import { ROUTE_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/routeTypes";
 import { useSubscriberFor } from "@applicaster/zapp-react-native-utils/reactHooks/useSubscriberFor";
 import { requiresAuthentication } from "@applicaster/zapp-react-native-utils/configurationUtils";
 import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
 import { ScreenContextProvider } from "../../Contexts/ScreenContext";
+import { OpaqueLayer } from "./OpaqueLayer";
 
 import { AnimatedPlayerModalWrapper } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
 
@@ -39,17 +42,6 @@ const styles = StyleSheet.create({
     bottom: 0,
     position: "absolute",
   },
-  // eslint-disable-next-line react-native/no-color-literals
-  loaderContainer: {
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0,
-    position: "absolute",
-    alignItems: "center",
-    justifyContent: "center",
-    backgroundColor: "rgba(64,64,64,.5)",
-  },
 });
 
 const VideoModalComponent = () => {
@@ -100,7 +92,7 @@ const VideoModalComponent = () => {
 
   const onHooksSuccess = ({ payload }) => {
     // set new modified entry
-    if (!R.equals(payload, item)) {
+    if (!equals(payload, item)) {
       onVideoModalHookSuccessAnalyticsEvent();
       setVideoModalItem(payload);
     }
@@ -136,7 +128,10 @@ const VideoModalComponent = () => {
 
       <PathnameContext.Provider value={pathname}>
         <ScreenContextProvider pathname={pathname}>
-          {itemIdHooksFinished === item?.id ? (
+          {/* Hide content underneath when we switch to next video in fullscreen mode */}
+          {mode === "FULLSCREEN" && <OpaqueLayer />}
+
+          {itemIdHooksFinished === item?.id && (
             <AnimatedPlayerModalWrapper
               style={[
                 styles.container,
@@ -153,10 +148,6 @@ const VideoModalComponent = () => {
                 mode={mode}
               />
             </AnimatedPlayerModalWrapper>
-          ) : (
-            <View style={styles.loaderContainer}>
-              <Spinner />
-            </View>
           )}
         </ScreenContextProvider>
       </PathnameContext.Provider>

package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx

@@ -62,7 +62,7 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
   })),
 }));
 
-jest.mock("../utils", () => ({ playerDimesionsHack: {} }));
+jest.mock("../utils", () => ({ playerDimensionsHack: {} }));
 
 const { PlayerWrapper } = require("../PlayerWrapper");
 

package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap

@@ -71,36 +71,6 @@ exports[`PlayerWrapper renders inline 1`] = `
         }
         testID="test-player-container"
       />
-      <View
-        animationType="componentFade"
-        style={
-          {
-            "flex": 1,
-          }
-        }
-      >
-        <View
-          configuration={
-            {
-              "tablet_landscape_player_container_background_color": "red",
-              "tablet_landscape_sidebar_width": "35%",
-            }
-          }
-          entry={
-            {
-              "id": "test",
-            }
-          }
-          isTablet={false}
-          isTabletLandscape={false}
-          style={
-            {
-              "flex": 1,
-              "paddingTop": 20,
-            }
-          }
-        />
-      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -177,36 +147,6 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
         }
         testID="test-player-container"
       />
-      <View
-        animationType="componentFade"
-        style={
-          {
-            "flex": 1,
-          }
-        }
-      >
-        <View
-          configuration={
-            {
-              "tablet_landscape_player_container_background_color": "red",
-              "tablet_landscape_sidebar_width": "35%",
-            }
-          }
-          entry={
-            {
-              "id": "test",
-            }
-          }
-          isTablet={false}
-          isTabletLandscape={false}
-          style={
-            {
-              "flex": 1,
-              "paddingTop": 20,
-            }
-          }
-        />
-      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>
@@ -299,36 +239,6 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
           }
         />
       </View>
-      <View
-        animationType="componentFade"
-        style={
-          {
-            "flex": 1,
-          }
-        }
-      >
-        <View
-          configuration={
-            {
-              "tablet_landscape_player_container_background_color": "red",
-              "tablet_landscape_sidebar_width": "35%",
-            }
-          }
-          entry={
-            {
-              "id": "test",
-            }
-          }
-          isTablet={true}
-          isTabletLandscape={true}
-          style={
-            {
-              "flex": 1,
-              "paddingTop": 20,
-            }
-          }
-        />
-      </View>
     </View>
   </RNCSafeAreaView>
 </RNCSafeAreaProvider>

package/Components/VideoModal/hooks/__tests__/useDelayedPlayerDetails.test.ts

@@ -0,0 +1,89 @@
+import { renderHook } from "@testing-library/react-hooks";
+import { useDelayedPlayerDetails } from "../useDelayedPlayerDetails";
+import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
+import { showDetails } from "../utils";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+
+jest.mock("@applicaster/zapp-react-native-utils/idleUtils", () => ({
+  withTimeout$: jest.fn(),
+}));
+
+jest.mock("../utils", () => ({
+  showDetails: jest.fn(),
+}));
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
+  useIsTablet: jest.fn(),
+}));
+
+describe("useDelayedPlayerDetails", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should return false initially", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: jest.fn().mockReturnValue({ unsubscribe: jest.fn() }),
+    });
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it("should return true if showDetails returns true", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: (callback) => {
+        callback.next();
+
+        return { unsubscribe: jest.fn() };
+      },
+    });
+
+    (showDetails as jest.Mock).mockReturnValue(true);
+    (useIsTablet as jest.Mock).mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(true);
+  });
+
+  it("should return false if showDetails returns false", () => {
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: (callback) => {
+        callback.next();
+
+        return { unsubscribe: jest.fn() };
+      },
+    });
+
+    (showDetails as jest.Mock).mockReturnValue(false);
+    (useIsTablet as jest.Mock).mockReturnValue(false);
+
+    const { result } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    expect(result.current).toBe(false);
+  });
+
+  it("should unsubscribe on unmount", () => {
+    const unsubscribeMock = jest.fn();
+
+    (withTimeout$ as jest.Mock).mockReturnValue({
+      subscribe: jest.fn().mockReturnValue({ unsubscribe: unsubscribeMock }),
+    });
+
+    const { unmount } = renderHook(() =>
+      useDelayedPlayerDetails({ isInline: true, isDocked: false, isPip: false })
+    );
+
+    unmount();
+
+    expect(unsubscribeMock).toHaveBeenCalled();
+  });
+});

package/Components/VideoModal/hooks/index.ts

@@ -0,0 +1,7 @@
+export { useBackgroundColor } from "./useBackgroundColor";
+
+export { useDelayedPlayerDetails } from "./useDelayedPlayerDetails";
+
+export { useInitialPlayerState } from "./useInitialPlayerState";
+
+export { useModalSize } from "./useModalSize";

package/Components/VideoModal/hooks/useDelayedPlayerDetails.ts

@@ -0,0 +1,49 @@
+import * as React from "react";
+import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { withTimeout$ } from "@applicaster/zapp-react-native-utils/idleUtils";
+
+import { showDetails } from "./utils";
+
+const TIMEOUT = 100; // ms
+
+type Props = { isInline: boolean; isDocked: boolean; isPip: boolean };
+
+/**
+ * Custom hook to determine whether to show player details with a delay.
+ *
+ * @param {Object} params - The parameters object.
+ * @param {boolean} params.isInline - Indicates if the player is inline.
+ * @param {boolean} params.isDocked - Indicates if the player is docked.
+ * @param {boolean} params.isPip - Indicates if the player is in PIP mode.
+ * @returns {boolean} - Returns true if player details should be shown, otherwise false.
+ */
+export const useDelayedPlayerDetails = ({
+  isInline,
+  isDocked,
+  isPip,
+}: Props): boolean => {
+  const [shouldShowDetails, setShouldShowDetails] = React.useState(false);
+
+  const isTablet = useIsTablet();
+
+  React.useEffect(() => {
+    const subscription = withTimeout$(TIMEOUT).subscribe({
+      next: () => {
+        setShouldShowDetails(() => {
+          return showDetails({
+            isMobile: !isTablet,
+            isInline,
+            isDocked,
+            isPip,
+          });
+        });
+      },
+    });
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [isDocked, isTablet, isInline, isPip]);
+
+  return shouldShowDetails;
+};

package/Components/VideoModal/hooks/utils/__tests__/showDetails.test.ts

@@ -0,0 +1,91 @@
+import { showDetails } from "..";
+
+describe("showDetails", () => {
+  it("should return false if isPip is true", () => {
+    const result = showDetails({
+      isMobile: true,
+      isInline: true,
+      isDocked: false,
+      isPip: true,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it("should return false if isDocked is true", () => {
+    const result = showDetails({
+      isMobile: true,
+      isInline: true,
+      isDocked: true,
+      isPip: false,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it("should return true if isMobile is true and isInline is true", () => {
+    const result = showDetails({
+      isMobile: true,
+      isInline: true,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it("should return false if isMobile is true and isInline is false", () => {
+    const result = showDetails({
+      isMobile: true,
+      isInline: false,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it("should return true if isMobile is false", () => {
+    const result = showDetails({
+      isMobile: false,
+      isInline: true,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it("should return true if isMobile is false and isInline is false", () => {
+    const result = showDetails({
+      isMobile: false,
+      isInline: false,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(true);
+  });
+
+  it("should return false if all properties are false except isMobile", () => {
+    const result = showDetails({
+      isMobile: true,
+      isInline: false,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(false);
+  });
+
+  it("should return true if all properties are false except isInline", () => {
+    const result = showDetails({
+      isMobile: false,
+      isInline: true,
+      isDocked: false,
+      isPip: false,
+    });
+
+    expect(result).toBe(true);
+  });
+});

package/Components/VideoModal/hooks/utils/index.ts

@@ -35,3 +35,36 @@ export const orientationWasChangedFromPortraitToLandscape = ({
     isOrientationLandscape(toOrientation)
   );
 };
+
+export const showDetails = ({
+  isMobile,
+  isInline,
+  isDocked,
+  isPip,
+}: {
+  isMobile: boolean;
+  isInline: boolean;
+  isDocked: boolean;
+  isPip: boolean;
+}): boolean => {
+  if (isPip) {
+    return false;
+  }
+
+  if (isDocked) {
+    return false;
+  }
+
+  // for mobile with inline mode(rotation is portrait) we always show details.
+  if (isMobile && isInline) {
+    return true;
+  }
+
+  // for mobile with landscape rotation(player is fullscreen) we always hide details. Mounting of it is very heavy operation.
+  if (isMobile && !isInline) {
+    return false;
+  }
+
+  // for tablets we always show details
+  return true;
+};

package/Components/VideoModal/utils.ts

@@ -52,7 +52,7 @@ const fullSize = {
   height: "100%",
 };
 
-export const playerDimesionsHack = platformSelect({
+export const playerDimensionsHack = platformSelect({
   android_tv: fullSize,
   amazon: fullSize,
   lg_tv: fullSize,

package/Decorators/ZappPipesDataConnector/index.tsx

@@ -1,10 +1,12 @@
 /// <reference types="@applicaster/applicaster-types" />
 /// <reference types="@applicaster/zapp-react-native-ui-components" />
 import React, { useEffect, useMemo } from "react";
+import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
+
 import * as R from "ramda";
 import { Platform } from "react-native";
 import Url from "url";
-
+import { ENDPOINT_TAGS } from "@applicaster/zapp-react-native-utils/types";
 import { favoritesListener } from "@applicaster/zapp-react-native-bridge/Favorites";
 import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
 import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
@@ -19,6 +21,12 @@ 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 { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
+import {
+  findEndpointForURL,
+  HTTP_METHODS,
+} from "@applicaster/zapp-pipes-v2-client";
+import { getNamespaceAndKey } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/utils";
 
 type Props = {
   component: ZappUIComponent;
@@ -291,6 +299,28 @@ export function zappPipesDataConnector(
         if (addListener) {
           return addListener(reloadData);
         }
+      } else {
+        const pipesEndpoints = appStore.get("pipesEndpoints");
+
+        const endpointURL = findEndpointForURL(
+          dataSourceUrl,
+          pipesEndpoints,
+          HTTP_METHODS.GET
+        );
+
+        const endpoint = pipesEndpoints?.[endpointURL];
+
+        if (endpoint?.tags?.includes(ENDPOINT_TAGS.observe_storage)) {
+          const subscriptions: (() => void)[] = endpoint.context_obj.map(
+            (data: Record<string, any>) => {
+              const { namespace, key } = getNamespaceAndKey(data.key);
+
+              return localStorage.addListener({ key, namespace }, reloadData);
+            }
+          );
+
+          return () => subscriptions.forEach((listener) => listener());
+        }
       }
     }, [dataSourceUrl, reloadData]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "13.0.0-alpha.6944415045",
+  "version": "13.0.0-alpha.7192404241",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -34,10 +34,10 @@
     "redux-mock-store": "^1.5.3"
   },
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-alpha.6944415045",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.6944415045",
-    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.6944415045",
-    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.6944415045",
+    "@applicaster/applicaster-types": "13.0.0-alpha.7192404241",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-alpha.7192404241",
+    "@applicaster/zapp-react-native-redux": "13.0.0-alpha.7192404241",
+    "@applicaster/zapp-react-native-utils": "13.0.0-alpha.7192404241",
     "promise": "^8.3.0",
     "react-router-native": "^5.1.2",
     "url": "^0.11.0",

package/Contexts/ComponentsMapOffsetContext/index.tsx

@@ -1,46 +0,0 @@
-import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
-import React, { PropsWithChildren } from "react";
-
-export const ComponentsMapOffsetContext = React.createContext({
-  setComponentsMapOffset: (_offset: number) => void 0,
-  componentsMapOffset: 0,
-});
-
-export const ComponentsMapOffsetContextProvider = ({
-  children,
-}: PropsWithChildren<{}>) => {
-  const theme = useTheme<BaseThemePropertiesTV>();
-
-  const [componentsMapOffset, setComponentsMapOffset] = React.useState(
-    theme?.screen_margin_top
-  );
-
-  const contextValue = {
-    componentsMapOffset,
-    setComponentsMapOffset,
-  };
-
-  return (
-    <ComponentsMapOffsetContext.Provider value={contextValue}>
-      {children}
-    </ComponentsMapOffsetContext.Provider>
-  );
-};
-
-export const withComponentsMapOffsetContext = (Component: any) =>
-  function ComponentsMapOffsetContextProviderWrapper(props: {}) {
-    return (
-      <ComponentsMapOffsetContextProvider>
-        <Component {...props} />
-      </ComponentsMapOffsetContextProvider>
-    );
-  };
-
-export const withComponentsMapOffsetContextConsumer = (Component: any) =>
-  function ComponentsMapOffsetContextConsumerWrapper(props: {}) {
-    const { componentsMapOffset } = React.useContext(
-      ComponentsMapOffsetContext
-    );
-
-    return <Component {...props} componentsMapOffset={componentsMapOffset} />;
-  };