@applicaster/zapp-react-native-utils 14.0.18-alpha.5740764222 → 14.0.18-rc.1

package/appUtils/focusManagerAux/utils/index.ts

@@ -13,7 +13,7 @@ import {
 
 import {
   getFocusableId,
-  SCREEN_PICKER_CONTAINER,
+  isTabsScreenContentContainerId,
 } from "@applicaster/zapp-react-native-utils/screenPickerUtils";
 
 // run check each 300 ms
@@ -24,8 +24,6 @@ const isTopMenu = (node) => startsWith(QUICK_BRICK_NAVBAR, node?.id);
 const isContent = (node) => startsWith(QUICK_BRICK_CONTENT, node?.id);
 const isRoot = (node) => node?.id === "root";
 
-const isScrenPicker = (node) => startsWith(SCREEN_PICKER_CONTAINER, node?.id);
-
 type Props = {
   maxTimeout: number;
   conditionFn: () => boolean;
@@ -136,7 +134,7 @@ export const isTabsScreenOnContentFocused = (node) => {
     return false;
   }
 
-  if (isScrenPicker(node)) {
+  if (isTabsScreenContentContainerId(node?.id)) {
     return true;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "14.0.18-alpha.5740764222",
+  "version": "14.0.18-rc.1",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "14.0.18-alpha.5740764222",
+    "@applicaster/applicaster-types": "14.0.18-rc.1",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/layout/__tests__/index.test.tsx

@@ -39,7 +39,6 @@ ReactNative.NativeModules.QuickBrickCommunicationModule =
 
 jest.mock("react-native-safe-area-context", () => ({
   useSafeAreaInsets: () => ({ top: 50 }),
-  useSafeAreaFrame: () => ({ x: 0, y: 0, width: 100, height: 100 }),
 }));
 
 jest.mock("../../../reactUtils", () => ({
@@ -50,22 +49,6 @@ jest.mock("../../../reactUtils", () => ({
 
 jest.mock("../../navigation", () => ({
   useIsScreenActive: () => true,
-  useRoute: () => ({
-    screenData: { general: { screen_orientation: "portrait" } },
-  }),
-}));
-
-jest.mock("../../screen", () => ({
-  useCurrentScreenData: () => null,
-}));
-
-jest.mock("../../device", () => ({
-  useIsTablet: () => false,
-}));
-
-jest.mock("../../../appUtils/orientationHelper", () => ({
-  getScreenOrientation: jest.fn(() => 1), // portrait
-  isOrientationCompatible: jest.fn(() => true),
 }));
 
 jest.mock("../../navigation/useNavigation");

package/reactHooks/layout/types/index.ts

@@ -22,12 +22,6 @@ export type Options = {
   rounded?: boolean;
   deviceInfo?: boolean;
   updateForInactiveScreens?: boolean;
-  /**
-   * When true, dimensions will only update when they match the screen's target orientation.
-   * Returns the last valid dimensions during orientation transitions.
-   * Requires updateForInactiveScreens: false to work properly.
-   */
-  waitForValidOrientation?: boolean;
 };
 
 export type Context = "window" | "screen";

package/reactHooks/layout/useDimensions/__tests__/useDimensions.test.ts

@@ -19,28 +19,6 @@ jest.mock(
   })
 );
 
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
-  useCurrentScreenData: jest.fn().mockReturnValue(null),
-}));
-
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/navigation", () => ({
-  useRoute: jest.fn().mockReturnValue({
-    screenData: { general: { screen_orientation: "portrait" } },
-  }),
-}));
-
-jest.mock("@applicaster/zapp-react-native-utils/reactHooks/device", () => ({
-  useIsTablet: jest.fn().mockReturnValue(false),
-}));
-
-jest.mock(
-  "@applicaster/zapp-react-native-utils/appUtils/orientationHelper",
-  () => ({
-    getScreenOrientation: jest.fn().mockReturnValue(1), // portrait
-    isOrientationCompatible: jest.fn().mockReturnValue(true),
-  })
-);
-
 jest.doMock("../helpers", () => ({
   getInitialDimensions: jest
     .fn()
@@ -151,20 +129,4 @@ describe("useDimensions", () => {
 
     consoleWarnSpy.mockRestore();
   });
-
-  it("accepts waitForValidOrientation option", () => {
-    // Smoke test to verify the option is accepted without errors
-    const { result } = renderHook(() =>
-      useDimensions("screen", {
-        updateForInactiveScreens: false,
-        waitForValidOrientation: true,
-      })
-    );
-
-    expect(result.current).toMatchObject({
-      width: expect.any(Number),
-      height: expect.any(Number),
-      statusBarHeight: expect.any(Number),
-    });
-  });
 });

package/reactHooks/layout/useDimensions/useDimensions.ts

@@ -11,13 +11,6 @@ import { Options, UseDimensions } from "../types";
 import { getDeviceInfo } from "../getDeviceInfo";
 import { getInitialDimensions } from "./helpers";
 import { useIsScreenActive } from "../../navigation/useIsScreenActive";
-import {
-  getScreenOrientation,
-  isOrientationCompatible,
-} from "../../../appUtils/orientationHelper";
-import { useCurrentScreenData } from "../../screen";
-import { useRoute } from "../../navigation";
-import { useIsTablet } from "../../device";
 
 function compensateForScaleIfNeeded(context) {
   return function () {
@@ -66,43 +59,9 @@ export const useDimensions: UseDimensions = (
     options.fullDimensions = false;
   }
 
-  if (options.waitForValidOrientation === undefined) {
-    options.waitForValidOrientation = false;
-  }
-
   const [dimensions, setDimensions] = useState(getInitialDimensions(context));
   const deviceInfo = useRef(getDeviceInfo(dimensions, appData));
 
-  // Orientation validation setup (only when waitForValidOrientation is enabled)
-  const currentScreenData = useCurrentScreenData();
-  const { screenData } = useRoute();
-  const isTablet = useIsTablet();
-  const isTabletPortrait = appData?.isTabletPortrait;
-
-  const targetScreenData =
-    currentScreenData || (screenData as any)?.targetScreen || screenData;
-
-  const orientation = options.waitForValidOrientation
-    ? getScreenOrientation({
-        screenData: targetScreenData,
-        layoutData: { isTablet, isTabletPortrait },
-      })
-    : null;
-
-  const isOrientationValid = options.waitForValidOrientation
-    ? isOrientationCompatible({
-        orientation,
-        layoutData: {
-          isTablet,
-          isTabletPortrait,
-          width: dimensions.width,
-          height: dimensions.height,
-        },
-      })
-    : true;
-
-  const lastValidDimensions = useRef(dimensions);
-
   const applyOptions = R.compose(
     R.when(() => options.deviceInfo, R.assoc("deviceInfo", deviceInfo.current)),
     R.when(
@@ -150,29 +109,13 @@ export const useDimensions: UseDimensions = (
     };
   }, [isActive]);
 
-  let dimensionsToUse;
-
-  // When waitForValidOrientation is enabled, freeze dimensions during invalid orientation
-  if (options.waitForValidOrientation) {
-    if (isOrientationValid) {
-      // Store last valid dimensions to return during orientation transitions
-      lastValidDimensions.current = dimensions;
-      dimensionsToUse = dimensions;
-    } else {
-      // Return last valid dimensions during orientation transitions
-      dimensionsToUse = lastValidDimensions.current;
-    }
-  } else {
-    dimensionsToUse = dimensions;
-  }
-
   const memoizedDimensions = useMemo(() => {
-    return { ...applyOptions(dimensionsToUse), statusBarHeight };
+    return { ...applyOptions(dimensions), statusBarHeight };
   }, [
-    dimensionsToUse.width,
-    dimensionsToUse.height,
-    dimensionsToUse.fontScale,
-    dimensionsToUse.scale,
+    dimensions.width,
+    dimensions.height,
+    dimensions.fontScale,
+    dimensions.scale,
   ]);
 
   return memoizedDimensions;

package/reactHooks/resolvers/__tests__/useCellResolver.test.tsx

@@ -1,7 +1,10 @@
 import * as React from "react";
 import { View } from "react-native";
-import { cleanup } from "@testing-library/react-native";
-import { renderWithProviders } from "../../../testUtils";
+import { cleanup, renderHook } from "@testing-library/react-hooks";
+import configureStore from "redux-mock-store";
+import { Provider } from "react-redux";
+
+const mockStore = configureStore([]);
 
 const mock_rtl_flag = false;
 
@@ -43,7 +46,12 @@ describe("cellResolver", () => {
     },
   };
 
-  const storeState = { cellStyles, styles, plugins };
+  const store = mockStore({ cellStyles, styles, plugins });
+
+  // eslint-disable-next-line react/prop-types
+  const wrapper = ({ children }) => (
+    <Provider store={store}>{children}</Provider>
+  );
 
   afterEach(() => {
     cleanup();
@@ -53,14 +61,8 @@ describe("cellResolver", () => {
     expect(useCellResolver).toBeDefined();
   });
 
-  it("resolves cell plugin", () => {
-    const TestComponent = () => {
-      const resolvedCell = useCellResolver({ component });
-
-      return <>{resolvedCell}</>;
-    };
-
-    renderWithProviders(<TestComponent />, storeState);
+  it("Resolves cell plugin", () => {
+    renderHook(() => useCellResolver({ component }), { wrapper });
 
     expect(testCellModule).toBeCalled();
   });

package/reactHooks/resolvers/useCellResolver.ts

@@ -51,7 +51,6 @@ export function useCellResolver({
 
   const { width, height } = useDimensions("screen", {
     updateForInactiveScreens: false,
-    waitForValidOrientation: true,
   });
 
   const { plugins, cellStyles } = usePickFromState(["plugins", "cellStyles"]);

package/screenPickerUtils/index.ts

@@ -1,3 +1,5 @@
+import { endsWith } from "@applicaster/zapp-react-native-utils/utils";
+
 export const getFocusableId = (id) => `PickerItem.${id}`;
 
 export const getPickerSelectorId = (id) => `PickerSelector.${id}`;
@@ -11,3 +13,6 @@ export const getScreenPickerSelectorContainerId = (id) =>
 
 export const getScreenPickerContentContainerId = (id) =>
   `${getScreenPickerId(id)}-screen-container`;
+
+export const isTabsScreenContentContainerId = (id) =>
+  endsWith("-screen-container", id);