@applicaster/zapp-react-native-utils 13.0.0-alpha.6714678893 → 13.0.0-alpha.7100577251

package/screenState/index.ts

@@ -1,6 +1,8 @@
 import { create } from "zustand";
 import { produce } from "immer";
 import { path } from "ramda";
+import React from "react";
+import { useShallow } from "zustand/react/shallow";
 
 type ScreenState = {
   selectedEntry: {
@@ -18,6 +20,8 @@ type ScreenStore = {
   setSelectedEntry: (screenId: string, entryId: string) => void;
 };
 
+type SetSelectedEntry = (screenId: string, entryId: string) => void;
+
 const useScreenStore = create<ScreenStore>((set) => ({
   screens: screensInitialState,
   setSelectedEntry: (screenId, entryId) =>
@@ -35,17 +39,27 @@ const useScreenStore = create<ScreenStore>((set) => ({
 export function useScreenState(
   screenId: ScreenId
 ): null | { screen: ScreenState; setSelectedEntry: (entryId: string) => void } {
-  // const state = useState(screenState);
-  const screenState = useScreenStore(
-    path(["screens", screenId])
-  ) as ScreenState;
+  const screenState = useScreenStore<ScreenState>(
+    useShallow(path(["screens", screenId]))
+  );
 
-  const setSelectedEntry = useScreenStore((state) => state.setSelectedEntry);
+  const setSelectedEntry = useScreenStore<SetSelectedEntry>(
+    useShallow(path(["setSelectedEntry"]))
+  );
 
-  if (!screenId) return null;
+  const memoizedSetSelectedEntry = React.useCallback(
+    (entryId) => setSelectedEntry(screenId, entryId),
+    [screenId, setSelectedEntry]
+  );
 
-  return {
-    screen: screenState,
-    setSelectedEntry: (entryId) => setSelectedEntry(screenId, entryId),
-  };
+  return React.useMemo(
+    () =>
+      !screenId
+        ? null
+        : {
+            screen: screenState,
+            setSelectedEntry: memoizedSetSelectedEntry,
+          },
+    [screenId, screenState]
+  );
 }

package/theme/__mocks__/index.ts

@@ -1,3 +1,5 @@
+import React from "react";
+
 export const themeMock = {
   screen_padding_top: 20,
   screen_padding_bottom: 48,
@@ -17,3 +19,5 @@ export const themeMock = {
 };
 
 export const useTheme = jest.fn().mockReturnValue(themeMock);
+
+export const ThemeContext = React.createContext(themeMock);

package/theme/index.ts

@@ -14,7 +14,7 @@ export const ThemeContext = React.createContext({
 export function useTheme<
   T extends Record<string, any> =
     | BaseThemePropertiesTV
-    | BaseThemePropertiesMobile
+    | BaseThemePropertiesMobile,
 >(): T {
   const { themes, selectedThemeId } = React.useContext(ThemeContext);
 

package/time/Timer.ts

@@ -3,8 +3,11 @@ export class Timer {
   private remaining: number;
   private timeoutId: NodeJS.Timeout | null;
 
-  constructor(private callback: () => void, private duration: number) {
-    this.remaining = duration;
+  constructor(
+    private callback: () => void,
+    private duration: number
+  ) {
+    this.remaining = this.duration;
     this.timeoutId = null;
   }
 

package/types.ts

@@ -8,4 +8,5 @@ export type ManifestField<T> = {
 
 export enum ENDPOINT_TAGS {
   allow_missing_keys = "allow_missing_keys",
+  observe_storage = "observe_storage",
 }

package/zappFrameworkUtils/presentPluginOneTime.ts

@@ -92,9 +92,8 @@ export const PresentHookPluginOneTime = (
       const presentOneTimeVersionName =
         await getLatestWatchedVersionNumberFromStorage(storageKey, namespace);
 
-      const applicationVersionName = await sessionStorage.getItem(
-        versionNameKey
-      );
+      const applicationVersionName =
+        await sessionStorage.getItem(versionNameKey);
 
       if (!presentOneTimeVersionName || !applicationVersionName) {
         log_info(

package/manifestUtils/sharedConfiguration/screenPicker/__tests__/utils.test.js

@@ -1,304 +0,0 @@
-// @ts-nocheck
-import utils from "../utils";
-
-describe("generateFontConfiguration", () => {
-  it("should generate default configuration for tvos", () => {
-    const expected = [
-      {
-        initial_value: 20,
-        label: "tvOS font Size",
-        key: "tvos_font_size",
-        type: "number_input",
-      },
-      {
-        initial_value: 40,
-        label: "tvOS line Height",
-        key: "tvos_line_height",
-        type: "number_input",
-      },
-      {
-        initial_value: 0.4,
-        label: "tvOS letter Spacing",
-        key: "tvos_letter_spacing",
-        type: "number_input",
-      },
-    ];
-
-    const platforms = {
-      tvos: "tvOS",
-    };
-
-    const generatedFontConfiguration =
-      utils.generateFontConfiguration(platforms);
-
-    expect(generatedFontConfiguration).toEqual(expected);
-  });
-
-  it("should generate default configuration for android_tv", () => {
-    const expected = [
-      {
-        initial_value: 20,
-        label: "Android TV font Size",
-        key: "android_tv_font_size",
-        type: "number_input",
-      },
-      {
-        initial_value: 40,
-        label: "Android TV line Height",
-        key: "android_tv_line_height",
-        type: "number_input",
-      },
-      {
-        initial_value: 0.4,
-        label: "Android TV letter Spacing",
-        key: "android_tv_letter_spacing",
-        type: "number_input",
-      },
-    ];
-
-    const platforms = {
-      android_tv: "Android TV",
-    };
-
-    const generatedFontConfiguration =
-      utils.generateFontConfiguration(platforms);
-
-    expect(generatedFontConfiguration).toEqual(expected);
-  });
-
-  it("should generate default configuration for lg_tv", () => {
-    const expected = [
-      {
-        initial_value: 20,
-        label: "LG TV font Size",
-        key: "lg_tv_font_size",
-        type: "number_input",
-      },
-      {
-        initial_value: 40,
-        label: "LG TV line Height",
-        key: "lg_tv_line_height",
-        type: "number_input",
-      },
-      {
-        initial_value: 0.4,
-        label: "LG TV letter Spacing",
-        key: "lg_tv_letter_spacing",
-        type: "number_input",
-      },
-    ];
-
-    const platforms = {
-      lg_tv: "LG TV",
-    };
-
-    const generatedFontConfiguration =
-      utils.generateFontConfiguration(platforms);
-
-    expect(generatedFontConfiguration).toEqual(expected);
-  });
-
-  it("should generate default configuration for samsung_tv", () => {
-    const expected = [
-      {
-        initial_value: 20,
-        label: "Samsung TV font Size",
-        key: "samsung_tv_font_size",
-        type: "number_input",
-      },
-      {
-        initial_value: 40,
-        label: "Samsung TV line Height",
-        key: "samsung_tv_line_height",
-        type: "number_input",
-      },
-      {
-        initial_value: 0.4,
-        label: "Samsung TV letter Spacing",
-        key: "samsung_tv_letter_spacing",
-        type: "number_input",
-      },
-    ];
-
-    const platforms = {
-      samsung_tv: "Samsung TV",
-    };
-
-    const generatedFontConfiguration =
-      utils.generateFontConfiguration(platforms);
-
-    expect(generatedFontConfiguration).toEqual(expected);
-  });
-});
-
-test("conditional_rule helper should return correct object", () => {
-  expect(utils.conditional_rule("a", "b")).toMatchObject({
-    key: "a",
-    condition_value: "b",
-  });
-});
-
-test("createConditionalConfig helper should return correct object", () => {
-  expect(
-    utils.createConditionalConfig([
-      ["a", "b"],
-      ["c", "d"],
-    ])
-  ).toEqual({
-    rules: "conditional",
-    conditional_fields: [
-      {
-        key: "a",
-        condition_value: "b",
-      },
-      {
-        key: "c",
-        condition_value: "d",
-      },
-    ],
-  });
-});
-
-test("conditional_horizontal_type should contain correct parameters", () => {
-  expect(
-    utils.conditional_horizontal_type_item_fixed.conditional_fields[0]
-  ).toMatchObject({
-    key: "styles/screen_picker_type",
-    condition_value: "horizontal",
-  });
-});
-
-test("conditional_vertical_type should contain correct parameters", () => {
-  expect(utils.conditional_vertical_type.conditional_fields[0]).toMatchObject({
-    key: "styles/screen_picker_type",
-    condition_value: "vertical",
-  });
-});
-
-test("conditional_horizontal_type_item_fixed should contain correct parameters", () => {
-  expect(
-    utils.conditional_horizontal_type_item_fixed.conditional_fields[0]
-  ).toMatchObject({
-    key: "styles/screen_picker_type",
-    condition_value: "horizontal",
-  });
-
-  expect(
-    utils.conditional_horizontal_type_item_fixed.conditional_fields[1]
-  ).toMatchObject({
-    key: "styles/screen_picker_item_size",
-    condition_value: "fixed",
-  });
-});
-
-test("conditional_horizontal_display_type_fixed should contain correct parameters", () => {
-  expect(
-    utils.conditional_horizontal_display_type_fixed.conditional_fields[0]
-  ).toMatchObject({
-    key: "styles/screen_picker_type",
-    condition_value: "horizontal",
-  });
-
-  expect(
-    utils.conditional_horizontal_display_type_fixed.conditional_fields[1]
-  ).toMatchObject({
-    key: "styles/screen_picker_horizontal_display_type",
-    condition_value: "fixed",
-  });
-});
-
-test("conditional_horizontal_display_type_fixed should contain correct parameters", () => {
-  expect(
-    utils.conditional_horizontal_asset_on.conditional_fields[0]
-  ).toMatchObject({
-    key: "styles/screen_picker_type",
-    condition_value: "horizontal",
-  });
-
-  expect(
-    utils.conditional_horizontal_asset_on.conditional_fields[1]
-  ).toMatchObject({
-    key: "styles/screen_picker_asset_switch",
-    condition_value: true,
-  });
-});
-
-describe("createVariationFields", () => {
-  const defaultInput = {
-    key: "somekey",
-    label: "default somekey label",
-    variants: [
-      {
-        initial_value: "a",
-      },
-      {
-        initial_value: "b",
-        label: "custom label",
-      },
-    ],
-  };
-
-  const config = utils.createVariationFields(defaultInput);
-
-  it("should return array containing object for conditional_vertical_type", () => {
-    expect(config[0].rules).toBe("conditional");
-
-    expect(config[0].conditional_fields).toEqual([
-      {
-        key: "styles/screen_picker_type",
-        condition_value: "vertical",
-      },
-    ]);
-
-    expect(config[0].type).toBe("number_input");
-    expect(config[0].key).toBe("screen_picker_vertical_somekey");
-    expect(config[0].label).toBe("default somekey label");
-    expect(config[0].initial_value).toBe("a");
-  });
-
-  it("should return array containing object for conditional_horizontal_type", () => {
-    expect(config[1].rules).toBe("conditional");
-
-    expect(config[1].conditional_fields).toEqual([
-      {
-        key: "styles/screen_picker_type",
-        condition_value: "horizontal",
-      },
-    ]);
-
-    expect(config[1].type).toBe("number_input");
-    expect(config[1].key).toBe("screen_picker_horizontal_somekey");
-    expect(config[1].label).toBe("custom label");
-    expect(config[1].initial_value).toBe("b");
-  });
-
-  it("should accept custom prefix (empty)", () => {
-    const config = utils.createVariationFields({
-      ...defaultInput,
-      prefix: "",
-    });
-
-    expect(config[0].key).toBe("vertical_somekey");
-    expect(config[1].key).toBe("horizontal_somekey");
-  });
-
-  it("should accept custom prefix (string)", () => {
-    const config = utils.createVariationFields({
-      ...defaultInput,
-      prefix: "string",
-    });
-
-    expect(config[0].key).toBe("string_vertical_somekey");
-    expect(config[1].key).toBe("string_horizontal_somekey");
-  });
-
-  it("should accept custom type (string)", () => {
-    const config = utils.createVariationFields({
-      ...defaultInput,
-      type: "text_input",
-    });
-
-    expect(config[0].type).toBe("text_input");
-    expect(config[1].type).toBe("text_input");
-  });
-});