@applicaster/zapp-react-native-ui-components 15.0.0-rc.13 → 15.0.0-rc.131

package/Components/MeasurmentsPortal/MeasurementsPortal.tsx

@@ -1,8 +1,12 @@
-/* eslint react/prop-types: off */
-
-import React from "react";
+import React, {
+  memo,
+  PropsWithChildren,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { View, StyleSheet } from "react-native";
-import * as R from "ramda";
 import { v4 } from "uuid";
 
 type Props = {
@@ -46,93 +50,104 @@ type MeasurementPortalContextType = {
 const MeasurementPortalContext =
   React.createContext<null | MeasurementPortalContextType>(null);
 
-const MeasurementsPortalContextProvider = ({ children }) => {
-  const Component = React.useRef(View);
-  const [measuringInProgress, setMeasuringInProgress] = React.useState(false);
-
-  const measureComponentCallback = React.useRef(null);
-  const componentProps = React.useRef(null);
-  const onLoadFinishedIsCalled = React.useRef(null);
-
-  const setComponent = (comp) => {
-    Component.current = comp;
-  };
-
-  const setMeasureComponentCallback = (cb) => {
-    measureComponentCallback.current = cb;
-  };
-
-  const finalize = ({ width, height }) => {
-    measureComponentCallback?.current?.({
-      width,
-      height,
-      index: componentProps.current.index,
-    });
-
-    setMeasureComponentCallback(null);
-    setMeasuringInProgress(false);
-    onLoadFinishedIsCalled.current = false;
-  };
-
-  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,
-    };
-  };
-
-  const measureComponent = React.useCallback(async (comp, props) => {
-    return new Promise((resolve) => {
-      setMeasureComponentCallback(resolve);
-      setMeasuringInProgress(true);
-
-      setComponentProps(props);
-      setComponent(comp);
-    });
-  }, []);
-
-  const onLayout = ({
-    nativeEvent: {
-      layout: { width, height },
-    },
-  }) => {
-    if (measureComponentCallback.current && onLoadFinishedIsCalled.current) {
-      finalize({
+const MeasurementsPortalContextProvider = memo(
+  ({ children }: PropsWithChildren) => {
+    const Component = useRef(View);
+    const [measuringInProgress, setMeasuringInProgress] = useState(false);
+
+    const measureComponentCallback = useRef(null);
+    const componentProps = useRef(null);
+    const onLoadFinishedIsCalled = useRef(null);
+
+    const setComponent = useCallback((comp) => {
+      Component.current = comp;
+    }, []);
+
+    const setMeasureComponentCallback = useCallback((cb) => {
+      measureComponentCallback.current = cb;
+    }, []);
+
+    const finalize = useCallback(({ width, height }) => {
+      measureComponentCallback?.current?.({
         width,
         height,
+        index: componentProps.current.index,
       });
-    }
-  };
 
-  return (
-    <>
-      <MeasurementsPortal
-        Component={Component.current}
-        componentProps={componentProps.current}
-        onLayout={onLayout}
-      />
-      <MeasurementPortalContext.Provider
-        value={{
-          measureComponent,
-          measuringInProgress,
-        }}
-      >
-        {children}
-      </MeasurementPortalContext.Provider>
-    </>
-  );
-};
+      setMeasureComponentCallback(null);
+      setMeasuringInProgress(false);
+      onLoadFinishedIsCalled.current = false;
+    }, []);
+
+    const setComponentProps = useCallback((props) => {
+      const handleOnLoadFinish = (...args) => {
+        const error = args[0]?.error;
+
+        if (isError(error)) {
+          finalize({ width: 0, height: 0 });
+        } else {
+          onLoadFinishedIsCalled.current = true;
+          props.onLoadFinished(...args);
+        }
+      };
+
+      componentProps.current = {
+        ...props,
+        onLoadFinished: handleOnLoadFinish,
+      };
+    }, []);
+
+    const measureComponent = useCallback(async (comp, props) => {
+      return new Promise((resolve) => {
+        setMeasureComponentCallback(resolve);
+        setMeasuringInProgress(true);
+
+        setComponentProps(props);
+        setComponent(comp);
+      });
+    }, []);
+
+    const onLayout = useCallback(
+      ({
+        nativeEvent: {
+          layout: { width, height },
+        },
+      }) => {
+        if (
+          measureComponentCallback.current &&
+          onLoadFinishedIsCalled.current
+        ) {
+          finalize({
+            width,
+            height,
+          });
+        }
+      },
+      []
+    );
+
+    const contextValue = useMemo(
+      () => ({
+        measureComponent,
+        measuringInProgress,
+      }),
+      [measuringInProgress]
+    );
+
+    return (
+      <>
+        <MeasurementsPortal
+          Component={Component.current}
+          componentProps={componentProps.current}
+          onLayout={onLayout}
+        />
+        <MeasurementPortalContext.Provider value={contextValue}>
+          {children}
+        </MeasurementPortalContext.Provider>
+      </>
+    );
+  }
+);
 
 export {
   MeasurementsPortal,

package/Components/MeasurmentsPortal/__tests__/MeasurementsPortal.test.tsx

@@ -0,0 +1,355 @@
+import React, { useContext } from "react";
+import { View, Text } from "react-native";
+import { render, fireEvent, waitFor, act } from "@testing-library/react-native";
+
+import {
+  MeasurementsPortal,
+  MeasurementsPortalContextProvider,
+  MeasurementPortalContext,
+} from "../MeasurementsPortal";
+
+// Mock uuid
+jest.mock("uuid", () => ({
+  v4: jest.fn(() => "mock-uuid-key"),
+}));
+
+describe("MeasurementsPortal", () => {
+  const mockOnLayout = jest.fn();
+  const MockComponent = jest.fn(() => <View testID="mock-component" />);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("renders with correct testID", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    expect(getByTestId("MeasurementsPortal")).toBeTruthy();
+  });
+
+  it("renders the passed Component", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    expect(getByTestId("mock-component")).toBeTruthy();
+    expect(MockComponent).toHaveBeenCalled();
+  });
+
+  it("passes componentProps to the Component", () => {
+    const componentProps = {
+      testProp: "test-value",
+      anotherProp: 123,
+    };
+
+    render(
+      <MeasurementsPortal
+        Component={MockComponent}
+        onLayout={mockOnLayout}
+        componentProps={componentProps}
+      />
+    );
+
+    expect(MockComponent).toHaveBeenCalledWith(componentProps, {});
+  });
+
+  it("calls onLayout when layout changes", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    const container = getByTestId("MeasurementsPortal");
+    const wrapper = container.children[0] as any;
+
+    const layoutEvent = {
+      nativeEvent: {
+        layout: { width: 100, height: 200 },
+      },
+    };
+
+    fireEvent(wrapper, "layout", layoutEvent);
+
+    expect(mockOnLayout).toHaveBeenCalledWith(layoutEvent);
+  });
+
+  it("applies correct container styles", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    const container = getByTestId("MeasurementsPortal");
+
+    expect(container.props.style).toEqual({
+      position: "absolute",
+      opacity: 0,
+      top: 0,
+      left: 0,
+      right: 0,
+      bottom: 0,
+    });
+  });
+
+  it("renders wrapper with onLayout", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    const container = getByTestId("MeasurementsPortal");
+    const wrapper = container.children[0] as any;
+
+    expect(wrapper.props.onLayout).toBe(mockOnLayout);
+  });
+
+  it("works with different Component types", () => {
+    const CustomComponent = ({ title }: { title: string }) => (
+      <Text testID="custom-text">{title}</Text>
+    );
+
+    const props = { title: "Test Title" };
+
+    const { getByTestId, getByText } = render(
+      <MeasurementsPortal
+        Component={CustomComponent}
+        onLayout={mockOnLayout}
+        componentProps={props}
+      />
+    );
+
+    expect(getByTestId("custom-text")).toBeTruthy();
+    expect(getByText("Test Title")).toBeTruthy();
+  });
+
+  it("handles component without componentProps", () => {
+    render(
+      <MeasurementsPortal Component={MockComponent} onLayout={mockOnLayout} />
+    );
+
+    expect(MockComponent).toHaveBeenCalledWith({}, {});
+  });
+});
+
+describe("MeasurementsPortalContextProvider", () => {
+  const TestConsumer = () => {
+    const context = useContext(MeasurementPortalContext);
+
+    return (
+      <View testID="test-consumer">
+        <Text testID="measuring-status">
+          {context?.measuringInProgress ? "measuring" : "idle"}
+        </Text>
+      </View>
+    );
+  };
+
+  it("provides context to children", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortalContextProvider>
+        <TestConsumer />
+      </MeasurementsPortalContextProvider>
+    );
+
+    expect(getByTestId("test-consumer")).toBeTruthy();
+    expect(getByTestId("measuring-status")).toBeTruthy();
+  });
+
+  it("initially sets measuringInProgress to false", () => {
+    const { getByText } = render(
+      <MeasurementsPortalContextProvider>
+        <TestConsumer />
+      </MeasurementsPortalContextProvider>
+    );
+
+    expect(getByText("idle")).toBeTruthy();
+  });
+
+  it("renders MeasurementsPortal with default View component", () => {
+    const { getByTestId } = render(
+      <MeasurementsPortalContextProvider>
+        <View />
+      </MeasurementsPortalContextProvider>
+    );
+
+    expect(getByTestId("MeasurementsPortal")).toBeTruthy();
+  });
+
+  describe("measureComponent function", () => {
+    const TestMeasureComponent = () => {
+      const context = useContext(MeasurementPortalContext);
+      const [result, setResult] = React.useState<any>(null);
+
+      const handleMeasure = async () => {
+        if (context?.measureComponent) {
+          const measurement = await context.measureComponent(View, {
+            index: 0,
+            onLoadFinished: () => {},
+          });
+
+          setResult(measurement);
+        }
+      };
+
+      return (
+        <View testID="measure-component">
+          <Text testID="measuring-status">
+            {context?.measuringInProgress ? "measuring" : "idle"}
+          </Text>
+          <Text testID="measure-button" onPress={handleMeasure}>
+            Measure
+          </Text>
+          {result ? (
+            <Text testID="result">
+              {result.width}x{result.height}
+            </Text>
+          ) : null}
+        </View>
+      );
+    };
+
+    it("sets measuringInProgress to true when measureComponent is called", async () => {
+      const { getByTestId, getByText } = render(
+        <MeasurementsPortalContextProvider>
+          <TestMeasureComponent />
+        </MeasurementsPortalContextProvider>
+      );
+
+      expect(getByText("idle")).toBeTruthy();
+
+      await act(async () => {
+        fireEvent.press(getByTestId("measure-button"));
+      });
+
+      expect(getByText("measuring")).toBeTruthy();
+    });
+
+    it("can measure a component through the context", async () => {
+      const TestMeasureComponent = () => {
+        const context = useContext(MeasurementPortalContext);
+        const [measured, setMeasured] = React.useState(false);
+
+        React.useEffect(() => {
+          if (context?.measureComponent) {
+            context
+              .measureComponent(View, {
+                index: 5,
+                onLoadFinished: () => {},
+              })
+              .then(() => {
+                setMeasured(true);
+              });
+          }
+        }, [context]);
+
+        return (
+          <View testID="measure-component">
+            <Text testID="measure-status">
+              {measured ? "measured" : "not-measured"}
+            </Text>
+          </View>
+        );
+      };
+
+      const { getByText } = render(
+        <MeasurementsPortalContextProvider>
+          <TestMeasureComponent />
+        </MeasurementsPortalContextProvider>
+      );
+
+      // Initially should be not measured
+      expect(getByText("not-measured")).toBeTruthy();
+    });
+
+    it("handles error in onLoadFinished", async () => {
+      const ErrorComponent = ({ onLoadFinished }: any) => {
+        React.useEffect(() => {
+          // Simulate error
+          setTimeout(
+            () => onLoadFinished({ error: new Error("Test error") }),
+            10
+          );
+        }, [onLoadFinished]);
+
+        return <View testID="error-component" />;
+      };
+
+      const TestErrorFlow = () => {
+        const context = useContext(MeasurementPortalContext);
+        const [result, setResult] = React.useState<any>(null);
+
+        const handleMeasure = React.useCallback(async () => {
+          if (context?.measureComponent) {
+            const measurement = await context.measureComponent(ErrorComponent, {
+              index: 1,
+              onLoadFinished: () => {},
+            });
+
+            setResult(measurement);
+          }
+        }, [context]);
+
+        React.useEffect(() => {
+          handleMeasure();
+        }, [handleMeasure]);
+
+        return (
+          <View testID="error-flow">
+            {result ? (
+              <Text testID="error-result">
+                {result.width}x{result.height}
+              </Text>
+            ) : null}
+          </View>
+        );
+      };
+
+      const { queryByText } = render(
+        <MeasurementsPortalContextProvider>
+          <TestErrorFlow />
+        </MeasurementsPortalContextProvider>
+      );
+
+      // Wait for error handling
+      await waitFor(() => {
+        expect(queryByText("0x0")).toBeTruthy();
+      });
+    });
+  });
+});
+
+describe("MeasurementPortalContext", () => {
+  it("returns null when used outside of provider", () => {
+    const TestComponent = () => {
+      const context = useContext(MeasurementPortalContext);
+
+      return (
+        <Text testID="context-value">
+          {context ? "has-context" : "no-context"}
+        </Text>
+      );
+    };
+
+    const { getByText } = render(<TestComponent />);
+    expect(getByText("no-context")).toBeTruthy();
+  });
+
+  it("returns context value when used inside provider", () => {
+    const TestComponent = () => {
+      const context = useContext(MeasurementPortalContext);
+
+      return (
+        <Text testID="context-value">
+          {context ? "has-context" : "no-context"}
+        </Text>
+      );
+    };
+
+    const { getByText } = render(
+      <MeasurementsPortalContextProvider>
+        <TestComponent />
+      </MeasurementsPortalContextProvider>
+    );
+
+    expect(getByText("has-context")).toBeTruthy();
+  });
+});

package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx

@@ -1,4 +1,6 @@
 import * as React from "react";
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+import { useNetworkStatusLocalizations } from "./utils";
 
 type Props = {
   children?: React.ReactNode;
@@ -10,13 +12,6 @@ type Props = {
 
 const NOTIF_DURATION = 4500;
 
-export const ONLINE_MSG = "You are back online";
-
-export const OFFLINE_MSG = "No internet connection";
-
-const EXTRA_OFFLINE_MSG = "Please check your connection";
-const EXTRA_ONLINE_MSG = "Feel free to continue where you left off";
-
 const styles: Record<any, React.CSSProperties> = {
   body: {
     position: "absolute",
@@ -47,6 +42,9 @@ const styles: Record<any, React.CSSProperties> = {
 export const NotificationView = (props: Props) => {
   const { children, hidden, dismiss, previousOnline, online } = props;
 
+  const theme = useTheme<BaseThemePropertiesTV>();
+  const storedLocalizations = useNetworkStatusLocalizations();
+
   const [open, setOpen] = React.useState<boolean | null>(null);
 
   const timeout = React.useRef<NodeJS.Timeout>();
@@ -84,8 +82,18 @@ export const NotificationView = (props: Props) => {
   }, [hidden, online]);
 
   const showOnlineMsg = wentOnline || online;
-  const MSG = showOnlineMsg ? ONLINE_MSG : OFFLINE_MSG;
-  const EXTRA_MSG = showOnlineMsg ? EXTRA_ONLINE_MSG : EXTRA_OFFLINE_MSG;
+
+  const MSG = showOnlineMsg
+    ? (theme?.online_notification_title ??
+      storedLocalizations?.online_notification_title)
+    : (theme?.offline_notification_title ??
+      storedLocalizations?.offline_notification_title);
+
+  const EXTRA_MSG = showOnlineMsg
+    ? (theme?.online_notification_subtitle ??
+      storedLocalizations?.online_notification_subtitle)
+    : (theme?.offline_notification_subtitle ??
+      storedLocalizations?.offline_notification_subtitle);
 
   return (
     <div onClick={onClose}>

package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx

@@ -1,4 +1,6 @@
 import * as React from "react";
+import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
+import { useNetworkStatusLocalizations } from "./utils";
 
 type Props = {
   children?: React.ReactNode;
@@ -9,12 +11,6 @@ type Props = {
 
 const DURATION_TO_HIDE_AFTER_BACK_TO_ONLINE = 4500; // ms
 
-const ONLINE_TITLE = "You are back online";
-const ONLINE_SUBTITLE = "Feel free to continue where you left off";
-
-const OFFLINE_TITLE = "No internet connection";
-const OFFLINE_SUBTITLE = "Please check your connection";
-
 const styles: Record<any, React.CSSProperties> = {
   body: {
     position: "absolute",
@@ -47,6 +43,9 @@ let timer: NodeJS.Timeout;
 export const NotificationView = (props: Props) => {
   const { children, dismiss, previousOnline = true, online } = props;
 
+  const theme = useTheme<BaseThemePropertiesTV>();
+  const storedLocalizations = useNetworkStatusLocalizations();
+
   const [shown, setShown] = React.useState<boolean>(false);
 
   const onClose = () => {
@@ -79,8 +78,17 @@ export const NotificationView = (props: Props) => {
     }
   }, [online, previousOnline]);
 
-  const title = online ? ONLINE_TITLE : OFFLINE_TITLE;
-  const subtitle = online ? ONLINE_SUBTITLE : OFFLINE_SUBTITLE;
+  const title = online
+    ? (theme?.online_notification_title ??
+      storedLocalizations?.online_notification_title)
+    : (theme?.offline_notification_title ??
+      storedLocalizations?.offline_notification_title);
+
+  const subtitle = online
+    ? (theme?.online_notification_subtitle ??
+      storedLocalizations?.online_notification_subtitle)
+    : (theme?.offline_notification_subtitle ??
+      storedLocalizations?.offline_notification_subtitle);
 
   return (
     <div onClick={onClose}>

package/Components/OfflineHandler/NotificationView/NotificationView.tsx

@@ -8,7 +8,7 @@ import {
   TouchableWithoutFeedback,
 } from "react-native";
 
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { usePlugins } from "@applicaster/zapp-react-native-redux";
 import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { textTransform } from "@applicaster/zapp-react-native-utils/cellUtils";
 import { useNotificationHeight } from "../utils";
@@ -46,7 +46,7 @@ export const NotificationView = ({
   online = true,
   dismiss,
 }: Props) => {
-  const { plugins } = usePickFromState(["plugins"]);
+  const plugins = usePlugins();
   const { statusHeight, notificationHeight } = useNotificationHeight();
 
   const offlinePlugin = R.find(