@applicaster/zapp-react-native-ui-components 15.1.20-alpha.3704390340 → 15.1.21-alpha.2368211243

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

@@ -248,14 +248,11 @@ const LiveImageComponent = (props: LiveImageProps) => {
 
   const isCurrentlyFocused = useTrackCurrentAutoScrollingElement(componentId);
 
-  const rivers = appStore.get("rivers");
-  const plugins = appStore.get("plugins");
-
   // New object identities here restart PlayerLiveImage's register effect,
   // which throws away the in-flight player and runs preload hooks again.
   const playerConfig = React.useMemo(
     () => getPlayerConfig(player_screen_id, actionIdentifier),
-    [player_screen_id, actionIdentifier, rivers, plugins]
+    [player_screen_id, actionIdentifier]
   );
 
   const { playerPluginId, screenConfig, preloadHooks } = playerConfig ?? {};
@@ -265,6 +262,7 @@ const LiveImageComponent = (props: LiveImageProps) => {
     [playerPluginId, item?.id]
   );
 
+  const plugins = appStore.get("plugins");
   const playerPlugin = findPluginByIdentifier(playerPluginId, plugins);
 
   const isShouldRender =

package/Components/VideoModal/PlayerWrapper.tsx

@@ -14,6 +14,7 @@ type Props = {
   inline?: boolean;
   docked?: boolean;
   pip?: boolean;
+  vertical?: boolean;
   isModal?: boolean;
   fullscreen?: boolean;
   isTabletPortrait?: boolean;
@@ -32,6 +33,7 @@ const PlayerWrapperComponent = (props: Props) => {
     isTabletPortrait,
     configuration,
     pip,
+    vertical,
     playerContent,
   } = props;
 
@@ -42,6 +44,7 @@ const PlayerWrapperComponent = (props: Props) => {
     isTabletPortrait,
     configuration,
     pip,
+    vertical,
   });
 
   const isTablet = useIsTablet();
@@ -52,7 +55,7 @@ const PlayerWrapperComponent = (props: Props) => {
 
   return (
     <WrapperView
-      edges={getEdges(isTablet, isInlineModal) as readonly Edge[]}
+      edges={getEdges(isTablet, isInlineModal, vertical) as readonly Edge[]}
       style={playerDimensionsHack}
     >
       <View

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

@@ -37,6 +37,7 @@ jest.mock(
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/device", () => ({
   useIsTablet: mockUseIsDeviceTablet,
+  useOrientation: () => "portrait",
 }));
 
 jest.mock("@applicaster/zapp-react-native-utils/theme", () => ({

package/Components/VideoModal/__tests__/playerWrapperStyle.test.ts

@@ -0,0 +1,58 @@
+import { renderHook } from "@testing-library/react-native";
+
+import { useStyle } from "../playerWrapperStyle";
+import { getScreenAspectRatio } from "../playerWrapperUtils";
+
+let mockOrientation = "portrait";
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks", () => ({
+  useIsTablet: () => false,
+  useOrientation: () => mockOrientation,
+}));
+
+const getAspectRatio = (props: {
+  vertical: boolean;
+  inline?: boolean;
+  isModal?: boolean;
+}) => {
+  const { result } = renderHook(() =>
+    useStyle({
+      style: {},
+      inline: false,
+      isModal: true,
+      isTabletPortrait: false,
+      configuration: {},
+      pip: false,
+      ...props,
+    })
+  );
+
+  return result.current.containerDimensions.aspectRatio;
+};
+
+describe("useStyle aspectRatio", () => {
+  const screenRatio = getScreenAspectRatio();
+
+  it("uses the screen ratio when not vertical", () => {
+    mockOrientation = "portrait";
+    expect(getAspectRatio({ vertical: false })).toBeCloseTo(screenRatio);
+  });
+
+  it("inverts the screen ratio for vertical fullscreen in portrait", () => {
+    mockOrientation = "portrait";
+    expect(getAspectRatio({ vertical: true })).toBeCloseTo(1 / screenRatio);
+  });
+
+  it("keeps the screen ratio for vertical fullscreen in landscape", () => {
+    mockOrientation = "landscape";
+    expect(getAspectRatio({ vertical: true })).toBeCloseTo(screenRatio);
+  });
+
+  it("inverts 16:9 for the vertical inline modal in landscape", () => {
+    mockOrientation = "landscape";
+
+    expect(getAspectRatio({ vertical: true, inline: true })).toBeCloseTo(
+      9 / 16
+    );
+  });
+});

package/Components/VideoModal/__tests__/playerWrapperUtils.test.ts

@@ -0,0 +1,16 @@
+import { getEdges } from "../playerWrapperUtils";
+
+describe("getEdges", () => {
+  it("keeps the top edge in fullscreen when not vertical", () => {
+    expect(getEdges(false, false)).toEqual(["top"]);
+  });
+
+  it("has no edges in vertical fullscreen", () => {
+    expect(getEdges(false, false, true)).toEqual([]);
+    expect(getEdges(true, false, true)).toEqual([]);
+  });
+
+  it("keeps the top edge for the vertical inline modal", () => {
+    expect(getEdges(false, true, true)).toEqual(["top"]);
+  });
+});

package/Components/VideoModal/playerWrapperStyle.ts

@@ -1,7 +1,10 @@
 import * as React from "react";
 import { StyleSheet, ViewStyle } from "react-native";
 import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
-import { useIsTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
+import {
+  useIsTablet,
+  useOrientation,
+} from "@applicaster/zapp-react-native-utils/reactHooks";
 import { playerDimensionsHack } from "./utils";
 import { getTabletWidth } from "@applicaster/zapp-react-native-utils/playerUtils";
 import {
@@ -22,8 +25,10 @@ export const useStyle = ({
   isTabletPortrait,
   configuration,
   pip,
+  vertical,
 }) => {
   const isTablet = useIsTablet();
+  const isLandscape = useOrientation() === "landscape";
 
   const isInlineModal = inline && isModal;
 
@@ -40,10 +45,23 @@ export const useStyle = ({
   );
 
   const aspectRatio = React.useMemo(
-    () => calculateAspectRatio(isInlineModal, pip),
+    () => {
+      const value = calculateAspectRatio(isInlineModal, pip);
+
+      if (!vertical) {
+        return value;
+      }
+
+      // vertical fullscreen in landscape: the width is the long side, keep the screen ratio so the container matches the screen
+      if (isLandscape && !isInlineModal && !pip) {
+        return value;
+      }
+
+      return 1 / value;
+    },
     // ignoring insets - only initial needed
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [isInlineModal, pip]
+    [isInlineModal, pip, vertical, isLandscape]
   );
 
   return React.useMemo(() => {

package/Components/VideoModal/playerWrapperUtils.ts

@@ -44,8 +44,14 @@ export const getScreenAspectRatio = () => {
 
 export const getEdges = (
   isTablet: boolean,
-  isInlineModal: boolean
+  isInlineModal: boolean,
+  vertical: boolean = false
 ): readonly Edge[] => {
+  // vertical fullscreen: the player takes the full screen height, a top inset would push it below the screen
+  if (vertical && !isInlineModal) {
+    return [];
+  }
+
   if (isTablet) {
     return ["top"];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.1.20-alpha.3704390340",
+  "version": "15.1.21-alpha.2368211243",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.20-alpha.3704390340",
-    "@applicaster/zapp-react-native-bridge": "15.1.20-alpha.3704390340",
-    "@applicaster/zapp-react-native-redux": "15.1.20-alpha.3704390340",
-    "@applicaster/zapp-react-native-utils": "15.1.20-alpha.3704390340",
+    "@applicaster/applicaster-types": "15.1.21-alpha.2368211243",
+    "@applicaster/zapp-react-native-bridge": "15.1.21-alpha.2368211243",
+    "@applicaster/zapp-react-native-redux": "15.1.21-alpha.2368211243",
+    "@applicaster/zapp-react-native-utils": "15.1.21-alpha.2368211243",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "react-native-sortables": "1.7.1",