@applicaster/zapp-react-native-ui-components 12.0.0-alpha.5786305091 → 12.0.0-alpha.5882013252

package/Components/Image/Image.android.tsx

@@ -1,3 +1,31 @@
-import FastImage from "@applicaster/react-native-fast-image";
+import React from "react";
 
-export const QBImage = FastImage;
+import FastImage, {
+  FastImageProps,
+} from "@applicaster/react-native-fast-image";
+
+export const QBImage = (props: FastImageProps) => {
+  const source = React.useMemo(() => {
+    if (typeof props.source === "number") {
+      return props.source;
+    }
+
+    return {
+      uri: props.source.uri,
+      headers: props.source.headers,
+      priority: props.source.priority,
+      cache: props.source.cache,
+    };
+  }, [
+    ...(typeof props.source === "object"
+      ? [
+          props.source?.uri,
+          props.source?.priority,
+          props.source?.cache,
+          props.source?.headers,
+        ]
+      : []),
+  ]);
+
+  return <FastImage {...props} source={source} />;
+};

package/Components/MeasurmentsPortal/MeasurementsPortal.tsx

@@ -1,43 +1,17 @@
-import React, { useEffect, useCallback, ReactNode, useReducer } from "react";
-import { View, StyleSheet, LayoutChangeEvent } from "react-native";
-import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+/* eslint react/prop-types: off */
 
-const { log_debug } = createLogger({
-  subsystem: "MeasurementsPortal",
-  category: "UIComponents",
-});
-
-type LayoutDimensions = {
-  width: number;
-  height: number;
-};
+import React from "react";
+import { View, StyleSheet } from "react-native";
+import * as R from "ramda";
+import { v4 } from "uuid";
 
-type MeasurementResult = {
-  width: number;
-  height: number;
-  index?: number;
-};
-
-type MeasurementsPortalProps = {
+type Props = {
   Component: React.ElementType;
-  onLayout: (event: LayoutChangeEvent) => void;
-  componentProps?: Record<string, any>;
-  onLoadFinished?: () => void;
+  onLayout: (LayoutChangeEvent) => void;
+  componentProps?: Record<any, any>;
 };
 
-type MeasurementPortalContextValue = {
-  measureComponent: (
-    comp: React.ElementType,
-    props: Record<string, any>
-  ) => Promise<MeasurementResult>;
-  measuringInProgress: boolean;
-};
-
-type MeasurementsPortalContextProviderProps = {
-  children: ReactNode;
-};
-
-const isError = (possibleError: any): boolean => possibleError instanceof Error;
+const isError = (possibleError): boolean => possibleError instanceof Error;
 
 const styles = StyleSheet.create({
   container: {
@@ -51,245 +25,100 @@ const styles = StyleSheet.create({
   wrapper: {},
 });
 
-type State = {
-  component: React.ElementType;
-  componentProps: Record<string, any> | null;
-  measureComponentCallback: ((result: MeasurementResult) => void) | null;
-  onLoadFinishedIsCalled: boolean;
-  measuringInProgress: boolean;
-  layout: LayoutDimensions;
-};
-
-type Action =
-  | { type: "SET_COMPONENT"; payload: React.ElementType }
-  | { type: "SET_COMPONENT_PROPS"; payload: Record<string, any> | null }
-  | {
-      type: "SET_MEASURE_CALLBACK";
-      payload: ((result: MeasurementResult) => void) | null;
-    }
-  | { type: "SET_ON_LOAD_FINISHED"; payload: boolean }
-  | { type: "SET_MEASURING_PROGRESS"; payload: boolean }
-  | { type: "SET_LAYOUT"; payload: LayoutDimensions };
-
-const MEASUREMENT_ACTIONS = {
-  setComponent: "SET_COMPONENT",
-  setComponentProps: "SET_COMPONENT_PROPS",
-  setMeasureCallback: "SET_MEASURE_CALLBACK",
-  setOnLoadFinished: "SET_ON_LOAD_FINISHED",
-  setMeasuringProgress: "SET_MEASURING_PROGRESS",
-  setLayout: "SET_LAYOUT",
-} as const;
-
-const reducer = (state: State, action: Action): State => {
-  switch (action.type) {
-    case MEASUREMENT_ACTIONS.setComponent:
-      return { ...state, component: action.payload };
-    case MEASUREMENT_ACTIONS.setComponentProps:
-      return { ...state, componentProps: action.payload };
-    case MEASUREMENT_ACTIONS.setMeasureCallback:
-      return { ...state, measureComponentCallback: action.payload };
-    case MEASUREMENT_ACTIONS.setOnLoadFinished:
-      return { ...state, onLoadFinishedIsCalled: action.payload };
-    case MEASUREMENT_ACTIONS.setMeasuringProgress:
-      return { ...state, measuringInProgress: action.payload };
-    case MEASUREMENT_ACTIONS.setLayout:
-      return { ...state, layout: action.payload };
-    default:
-      return state;
-  }
-};
-
-const initialState: State = {
-  component: null,
-  componentProps: null,
-  measureComponentCallback: null,
-  onLoadFinishedIsCalled: false,
-  measuringInProgress: false,
-  layout: { width: 0, height: 0 },
-};
-
-/**
- * Handles layout changes for the MeasurementsPortal component
- */
-const onLayout =
-  (dispatch) =>
-  ({ nativeEvent: { layout: newLayout } }: LayoutChangeEvent) => {
-    log_debug("Rendered measurement layout", { newLayout });
-    dispatch({ type: MEASUREMENT_ACTIONS.setLayout, payload: newLayout });
-  };
-
-/**
- * MeasurementsPortal is a component that is used to measure the size of a component
- * It is not rendered to the main tree, but it actually uses a component and its props to measure the size of the component.
- * The <Component> comes from the measureComponent method of the MeasurementPortalContext.
- */
-const MeasurementsPortal = ({
-  Component,
-  onLayout,
-  componentProps,
-}: MeasurementsPortalProps) => {
-  if (!Component) {
-    return null;
-  }
-
+const MeasurementsPortal = ({ Component, onLayout, componentProps }: Props) => {
   return (
     <View style={styles.container} testID="MeasurementsPortal">
-      <View style={styles.wrapper} onLayout={onLayout}>
+      <View style={styles.wrapper} onLayout={onLayout} key={v4()}>
         <Component {...componentProps} />
       </View>
     </View>
   );
 };
 
-const MeasurementPortalContext =
-  React.createContext<MeasurementPortalContextValue | null>(null);
-
-/**
- * The MeasurementsPortalContextProvider provides a measureComponent method, and a measuringInProgress flag
- * With these we can pre-render a component and measure its size before rendering it to the main tree to avoid layout shifts
- */
-const MeasurementsPortalContextProvider = ({
-  children,
-}: MeasurementsPortalContextProviderProps) => {
-  const [state, dispatch] = useReducer(reducer, initialState);
-
-  const onLoadFinishedRef =
-    React.useRef<MeasurementsPortalProps["onLoadFinished"]>(null);
+const MeasurementPortalContext = React.createContext(null);
 
-  /**
-   * Finalize resolves the promise created by measureComponent and finalizes the measurement process
-   * It resolves with the measurement result (width/height/index) to the measureComponentCallback
-   */
-  const finalize = useCallback(() => {
-    if (state.measureComponentCallback) {
-      log_debug("Finalize measurement process", {
-        layout: state.layout,
-        componentProps: state.componentProps,
-      });
+const MeasurementsPortalContextProvider = ({ children }) => {
+  const Component = React.useRef(View);
+  const [measuringInProgress, setMeasuringInProgress] = React.useState(false);
 
-      state.measureComponentCallback({
-        width: state.layout.width,
-        height: state.layout.height,
-        index: state.componentProps?.index,
-      });
-    }
+  const measureComponentCallback = React.useRef(null);
+  const componentProps = React.useRef(null);
+  const onLoadFinishedIsCalled = React.useRef(null);
 
-    dispatch({ type: MEASUREMENT_ACTIONS.setMeasureCallback, payload: null });
-
-    dispatch({
-      type: MEASUREMENT_ACTIONS.setMeasuringProgress,
-      payload: false,
-    });
+  const setComponent = (comp) => {
+    Component.current = comp;
+  };
 
-    dispatch({ type: MEASUREMENT_ACTIONS.setOnLoadFinished, payload: false });
-  }, [state.layout, state.componentProps, state.measureComponentCallback]);
+  const setMeasureComponentCallback = (cb) => {
+    measureComponentCallback.current = cb;
+  };
 
-  useEffect(() => {
-    log_debug("Measurement portal updated", {
-      measureComponentCallback: state.measureComponentCallback,
-      onLoadFinishedIsCalled: state.onLoadFinishedIsCalled,
-      layout: state.layout,
+  const finalize = ({ width, height }) => {
+    measureComponentCallback?.current?.({
+      width,
+      height,
+      index: componentProps.current.index,
     });
 
-    if (
-      state.measureComponentCallback &&
-      state.layout.width > 0 &&
-      state.layout.height > 0 &&
-      onLoadFinishedRef.current
-    ) {
-      finalize();
-    }
-  }, [state.measureComponentCallback, state.layout, finalize]);
-
-  /**
-   * Utility function that takes, a component and its props, measures the rendered size of the component
-   * and creates a promise that does not get resolved with the measurement result (width/height/index)
-   * until the onLoadFinished callback is called
-   */
-  const measureComponent = useCallback(
-    (
-      comp: React.ElementType,
-      props: { onLoadFinished: () => void; [key: string]: any }
-    ): Promise<MeasurementResult> => {
-      return new Promise((resolve) => {
-        log_debug("Measuring process started", { comp, props });
-
-        dispatch({
-          type: MEASUREMENT_ACTIONS.setMeasureCallback,
-          payload: resolve,
-        });
-
-        dispatch({
-          type: MEASUREMENT_ACTIONS.setMeasuringProgress,
-          payload: true,
-        });
-
-        dispatch({
-          type: MEASUREMENT_ACTIONS.setOnLoadFinished,
-          payload: false,
-        });
-
-        dispatch({
-          type: MEASUREMENT_ACTIONS.setLayout,
-          payload: { width: 0, height: 0 },
-        });
-
-        onLoadFinishedRef.current =
-          // eslint-disable-next-line react/prop-types
-          props.onLoadFinished as MeasurementsPortalProps["onLoadFinished"];
-
-        const handleOnLoadFinish = (...args: any[]) => {
-          if (args?.[0]?.error && isError(args[0].error)) {
-            log_debug(
-              "Component called onLoadFinish with an error, completing measurement process",
-              { args }
-            );
-
-            finalize();
-
-            return;
-          }
-
-          log_debug(
-            "Component called onLoadFinish, completing measurement process",
-            { args }
-          );
+    setMeasureComponentCallback(null);
+    setMeasuringInProgress(false);
+    onLoadFinishedIsCalled.current = false;
+  };
 
-          dispatch({
-            type: MEASUREMENT_ACTIONS.setOnLoadFinished,
-            payload: true,
-          });
+  const setComponentProps = (props) => {
+    const handleOnLoadFinish = (...args) => {
+      const error = R.path([0, "error"], args);
+
+      if (isError(error)) {
+        finalize({ width: 0, height: 0 });
+      } else {
+        onLoadFinishedIsCalled.current = true;
+        props.onLoadFinished(...args);
+      }
+    };
+
+    componentProps.current = {
+      ...props,
+      onLoadFinished: handleOnLoadFinish,
+    };
+  };
 
-          onLoadFinishedRef.current?.apply(null, args);
-        };
+  const measureComponent = React.useCallback(async (comp, props) => {
+    return new Promise((resolve) => {
+      setMeasureComponentCallback(resolve);
+      setMeasuringInProgress(true);
 
-        dispatch({
-          type: MEASUREMENT_ACTIONS.setComponentProps,
-          payload: { ...props, onLoadFinished: handleOnLoadFinish },
-        });
+      setComponentProps(props);
+      setComponent(comp);
+    });
+  }, []);
 
-        dispatch({ type: MEASUREMENT_ACTIONS.setComponent, payload: comp });
-      });
+  const onLayout = ({
+    nativeEvent: {
+      layout: { width, height },
     },
-    []
-  );
-
-  const contextValue = React.useMemo(
-    () => ({
-      measureComponent,
-      measuringInProgress: state.measuringInProgress,
-    }),
-    [measureComponent, state.measuringInProgress]
-  );
+  }) => {
+    if (measureComponentCallback.current && onLoadFinishedIsCalled.current) {
+      finalize({
+        width,
+        height,
+      });
+    }
+  };
 
   return (
     <>
       <MeasurementsPortal
-        Component={state.component}
-        componentProps={state.componentProps}
-        onLayout={onLayout(dispatch)}
+        Component={Component.current}
+        componentProps={componentProps.current}
+        onLayout={onLayout}
       />
-      <MeasurementPortalContext.Provider value={contextValue}>
+      <MeasurementPortalContext.Provider
+        value={{
+          measureComponent,
+          measuringInProgress,
+        }}
+      >
         {children}
       </MeasurementPortalContext.Provider>
     </>

package/Components/VideoModal/PlayerWrapper.tsx

@@ -37,6 +37,11 @@ type Props = {
 const defaultStyles = StyleSheet.create({
   playerContainer: { position: "relative", alignSelf: "center", zIndex: 200 },
   playerDetails: { flex: 1, paddingTop: 20 },
+  inlinePlayerContainerDimensions: {
+    aspectRatio: 16 / 9,
+    width: "100%",
+    height: undefined,
+  },
 });
 
 const orientationStyles = StyleSheet.create({
@@ -190,12 +195,9 @@ export const PlayerWrapper = (props: Props) => {
               defaultStyles.playerContainer,
               containerDimensions,
               containerStyle,
-              {
-                height:
-                  isInlineModal && !docked
-                    ? containerDimensions.height + 10
-                    : containerDimensions.height,
-              },
+              isInlineModal && !docked && !isTabletLandscape
+                ? defaultStyles.inlinePlayerContainerDimensions
+                : {},
               playerDimesionsHack,
             ]}
           >

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

@@ -40,7 +40,9 @@ exports[`PlayerWrapper renders inline 1`] = `
         },
         Object {},
         Object {
-          "height": 431.875,
+          "aspectRatio": 1.7777777777777777,
+          "height": undefined,
+          "width": "100%",
         },
         Object {},
       ]
@@ -109,9 +111,7 @@ exports[`PlayerWrapper renders inline and docked 1`] = `
           "width": 300,
         },
         Object {},
-        Object {
-          "height": 50,
-        },
+        Object {},
         Object {},
       ]
     }
@@ -167,9 +167,7 @@ exports[`PlayerWrapper renders inline on tablet in landscape orientation 1`] = `
           "width": 195,
         },
         Object {},
-        Object {
-          "height": 119.6875,
-        },
+        Object {},
         Object {},
       ]
     }
@@ -237,9 +235,7 @@ exports[`PlayerWrapper renders properly 1`] = `
           "width": 300,
         },
         Object {},
-        Object {
-          "height": 800,
-        },
+        Object {},
         Object {},
       ]
     }

package/package.json

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