@applicaster/zapp-react-native-utils 13.0.0-alpha.3003916059 → 13.0.0-alpha.3013095924

package/actionsExecutor/ActionExecutorContext.tsx

@@ -5,11 +5,9 @@ import {
   actionExecutor as _actionExecutor,
   ActionResult,
 } from "./ActionExecutor";
-import { batchSave } from "../zappFrameworkUtils/localStorageHelper";
-import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
-
-import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
+import { batchSaveToLocalStorage } from "../zappFrameworkUtils/localStorageHelper";
 import { QUICK_BRICK_EVENTS } from "@applicaster/zapp-react-native-bridge/QuickBrick";
+import * as QuickBrickManager from "@applicaster/zapp-react-native-bridge/QuickBrick";
 import { showConfirmationDialog } from "../alertUtils";
 import { createCloudEvent, sendCloudEvent } from "../cloudEventsUtils";
 import { createLogger } from "../logger";
@@ -94,15 +92,7 @@ async function onMaxTagsReached(data: MaxTagsReachedEvent) {
 const prepareDefaultActions = (actionExecutor) => {
   actionExecutor.registerAction("localStorageSet", async (action) => {
     const namespaces = action.options.content;
-    await batchSave(namespaces, localStorage);
-    // TODO: Add support for ownershipKey and ownershipNamespace
-
-    return ActionResult.Success;
-  });
-
-  actionExecutor.registerAction("sessionStorageSet", async (action) => {
-    const namespaces = action.options.content;
-    await batchSave(namespaces, sessionStorage);
+    await batchSaveToLocalStorage(namespaces);
     // TODO: Add support for ownershipKey and ownershipNamespace
 
     return ActionResult.Success;
@@ -159,13 +149,15 @@ const prepareDefaultActions = (actionExecutor) => {
   actionExecutor.registerAction("confirmDialog", async (action) => {
     log_info("handleAction: confirmDialog event");
 
-    return new Promise<ActionResult>((resolve) => {
+    const confirmationPromise = new Promise<ActionResult>((resolve) => {
       showConfirmationDialog({
         ...action.options,
         confirmCompletion: () => resolve(ActionResult.Success),
         cancelCompletion: () => resolve(ActionResult.Cancel),
       });
     });
+
+    return confirmationPromise;
   });
 
   actionExecutor.registerAction("sendCloudEvent", async (action, context) => {

package/manifestUtils/index.js

@@ -8,7 +8,6 @@ const {
 
 const { tvActionButtonsContainer } = require("./tvAction/container");
 const { tvActionButton } = require("./tvAction/button");
-const { compact } = require("./_internals");
 
 const { spacingKey, absolutePositionElement } = require("./containers");
 
@@ -47,5 +46,4 @@ module.exports = {
   tvProgressBar,
   secondaryImage,
   getUpdatedSecondaryImageKeys,
-  compact,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "13.0.0-alpha.3003916059",
+  "version": "13.0.0-alpha.3013095924",
   "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": "13.0.0-alpha.3003916059",
+    "@applicaster/applicaster-types": "13.0.0-alpha.3013095924",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",

package/reactHooks/navigation/useGetBottomTabBarHeight.ts

@@ -1,19 +1,12 @@
 import { useGetNavBarTopBorderWidth } from "./useGetNavBarTopBorderWidth";
-import { getTabBarHeight } from "./getTabBarHeight";
-import { useNavigation } from "./useNavigation";
+import { useGetTabBarHeight } from "./useGetTabBarHeight";
 import { MenuTypes, useNavigationType } from "./useNavigationType";
-import { useNavigationPluginData } from "./useNavigationPluginData";
 
 export const useGetBottomTabBarHeight = (): number => {
-  const { activeRiver } = useNavigation();
-
-  const navigationPluginData = useNavigationPluginData(activeRiver);
-  const navigationType = useNavigationType(navigationPluginData);
-
   const topBorderWidth = useGetNavBarTopBorderWidth();
-  const tabBarHeight = getTabBarHeight();
+  const tabBarHeight = useGetTabBarHeight();
 
-  const isBottomBarNavigation = navigationType === MenuTypes.bottomTabBar;
+  const isBottomBarNavigation = useNavigationType() === MenuTypes.bottomTabBar;
 
   return !isBottomBarNavigation ? 0 : tabBarHeight + topBorderWidth;
 };

package/reactHooks/navigation/{getTabBarHeight.ts → useGetTabBarHeight.ts}

@@ -3,7 +3,7 @@ import { platformSelect } from "../../reactUtils";
 const TAB_BAR_HEIGHT_IOS = 49;
 const TAB_BAR_HEIGHT_ANDROID = 56;
 
-export const getTabBarHeight = () =>
+export const useGetTabBarHeight = () =>
   platformSelect({
     ios: TAB_BAR_HEIGHT_IOS,
     android: TAB_BAR_HEIGHT_ANDROID,

package/reactHooks/navigation/useNavigationPluginData.ts

@@ -1,17 +1,13 @@
 import { useRoute } from "./useRoute";
 
-export const useNavigationPluginData = (
-  screenData?: LegacyNavigationScreenData | null
-): ZappNavigation | undefined => {
+export const useNavigationPluginData = (): ZappNavigation | undefined => {
   const {
     screenData: useRouteScreenData,
   }: { screenData: QuickBrickNavigationData | null } = useRoute();
 
-  const activeScreenData = screenData ?? useRouteScreenData;
-
-  const navigations = activeScreenData?.targetScreen
-    ? (activeScreenData.targetScreen as ZappRiver).navigations
-    : (activeScreenData as ZappRiver).navigations;
+  const navigations = useRouteScreenData?.targetScreen
+    ? (useRouteScreenData.targetScreen as ZappRiver).navigations
+    : (useRouteScreenData as ZappRiver).navigations;
 
   const navigationMenu = navigations?.find((nav) => nav.category === "menu");
 

package/reactHooks/navigation/useNavigationType.ts

@@ -5,10 +5,8 @@ export enum MenuTypes {
   bottomTabBar = "BOTTOM_TAB_BAR",
 }
 
-export const useNavigationType = (navigation?: ZappNavigation): MenuTypes => {
-  const navigationPluginData = useNavigationPluginData();
-
-  const navigationMenu = navigation ?? navigationPluginData;
+export const useNavigationType = (): MenuTypes => {
+  const navigationMenu = useNavigationPluginData();
 
   return !navigationMenu ||
     navigationMenu.navigation_type === "quick_brick_side_menu"

package/reactHooks/state/index.ts

@@ -1,5 +1,3 @@
 export { useRivers } from "./useRivers";
 
 export { useHomeRiver } from "./useHomeRiver";
-
-export { ZStoreProvider, useZStore } from "./ZStoreProvider";

package/utils/index.ts

@@ -2,4 +2,4 @@ export { chunk } from "./chunk";
 
 export { times } from "./times";
 
-export { cloneDeep as clone, flatten, drop, size, isNil } from "lodash";
+export { cloneDeep as clone, flatten, drop, size } from "lodash";

package/zappFrameworkUtils/localStorageHelper.ts

@@ -7,7 +7,6 @@ import {
   StorageValuesToRemove,
   StorageValuesToAdd,
 } from "./types";
-import { Storage } from "@applicaster/zapp-react-native-bridge/ZappStorage/Storage";
 
 const defaultOwnedKey = "owned_keys";
 const DEFAULT_NAMESPACE = "applicaster.v2";
@@ -51,9 +50,8 @@ function mapOwnedKeysToAdd(
   return mappedData;
 }
 
-export async function batchSave(
-  storageValues: StorageValuesToAdd,
-  storage: Storage
+export async function batchSaveToLocalStorage(
+  storageValues: StorageValuesToAdd
 ) {
   if (isNilOrEmpty(storageValues)) {
     return false;
@@ -66,18 +64,12 @@ export async function batchSave(
       const value = namespaceData[key];
 
       if (!isNilOrEmpty(value)) {
-        await storage.setItem(key, value, namespace);
+        await localStorage.setItem(key, value, namespace);
       }
     }
   }
 }
 
-export async function batchSaveToLocalStorage(
-  storageValues: StorageValuesToAdd
-) {
-  return await batchSave(storageValues, localStorage);
-}
-
 export async function batchRemoveFromLocalStorage(
   storageValues: StorageValuesToRemove
 ) {

package/reactHooks/state/README.md

@@ -1,79 +0,0 @@
-# ZStoreProvider and useZStore
-
-This module provides a React context-based solution for managing Zustand stores with named access.
-
-## Usage
-
-### ZStoreProvider
-
-The `ZStoreProvider` component creates a Zustand store from the provided value and makes it available to child components.
-
-```tsx
-import { ZStoreProvider } from "@applicaster/zapp-react-native-utils/reactHooks/state";
-
-// In your component
-<ZStoreProvider name="playerConfiguration" value={controller?.config}>
-  <YourComponent />
-</ZStoreProvider>
-```
-
-### useZStore
-
-The `useZStore` hook allows you to access a Zustand store by name from within a `ZStoreProvider`.
-
-```tsx
-import { useZStore } from "@applicaster/zapp-react-native-utils/reactHooks/state";
-import { useStore } from "zustand";
-
-// In your component
-const MyComponent = () => {
-  const store = useZStore("playerConfiguration");
-  const config = useStore(store, (state) => state.someProperty);
-  
-  return <Text>{config}</Text>;
-};
-```
-
-## Example
-
-```tsx
-import React from "react";
-import { ZStoreProvider, useZStore } from "@applicaster/zapp-react-native-utils/reactHooks/state";
-import { useStore } from "zustand";
-
-// Component that uses the store
-const PlayerConfigDisplay = () => {
-  const store = useZStore("playerConfiguration");
-  const config = useStore(store, (state) => state);
-  
-  return (
-    <View>
-      <Text>Player Config: {JSON.stringify(config)}</Text>
-    </View>
-  );
-};
-
-// Main component that provides the store
-const PlayerComponent = ({ controller }) => {
-  return (
-    <ZStoreProvider name="playerConfiguration" value={controller?.config}>
-      <PlayerConfigDisplay />
-    </ZStoreProvider>
-  );
-};
-```
-
-## Features
-
-- **Named Stores**: Access stores by name instead of importing them directly
-- **Context-based**: Uses React Context for store management
-- **Zustand Integration**: Seamlessly works with existing Zustand stores
-- **Type Safety**: Full TypeScript support
-- **Error Handling**: Clear error messages when stores are not found or used outside providers
-
-## Error Handling
-
-The `useZStore` hook will throw errors in the following cases:
-
-1. **Used outside provider**: "useZStore must be used within a ZStoreProvider"
-2. **Store not found**: "Store with name 'storeName' not found. Make sure it's provided by a ZStoreProvider" 

package/reactHooks/state/ZStoreProvider.tsx

@@ -1,71 +0,0 @@
-import React, { createContext, useContext, ReactNode, useMemo } from "react";
-import { create, UseBoundStore } from "zustand";
-
-interface ZStoreContextType {
-  stores: Map<string, UseBoundStore<any>>;
-  registerStore: (name: string, store: UseBoundStore<any>) => void;
-  getStore: (name: string) => UseBoundStore<any> | undefined;
-}
-
-const ZStoreContext = createContext<ZStoreContextType | null>(null);
-
-interface ZStoreProviderProps {
-  children: ReactNode;
-  name: string;
-  value: any;
-}
-
-export const ZStoreProvider: React.FC<ZStoreProviderProps> = ({
-  children,
-  name,
-  value,
-}) => {
-  const parentContext = useContext(ZStoreContext);
-
-  const context = useMemo(() => {
-    if (parentContext) {
-      // If parent context exists, create a new store and register it
-      const store = create(() => value);
-      parentContext.registerStore(name, store);
-
-      return parentContext;
-    }
-
-    // Create a new context if none exists
-    const stores = new Map<string, UseBoundStore<any>>();
-
-    // Create a store from the provided value
-    const store = create(() => value);
-    stores.set(name, store);
-
-    return {
-      stores,
-      registerStore: (storeName: string, storeInstance: UseBoundStore<any>) => {
-        stores.set(storeName, storeInstance);
-      },
-      getStore: (storeName: string) => stores.get(storeName),
-    };
-  }, [parentContext, name, value]);
-
-  return (
-    <ZStoreContext.Provider value={context}>{children}</ZStoreContext.Provider>
-  );
-};
-
-export const useZStore = (name: string): UseBoundStore<any> => {
-  const context = useContext(ZStoreContext);
-
-  if (!context) {
-    throw new Error("useZStore must be used within a ZStoreProvider");
-  }
-
-  const store = context.getStore(name);
-
-  if (!store) {
-    throw new Error(
-      `Store with name "${name}" not found. Make sure it's provided by a ZStoreProvider.`
-    );
-  }
-
-  return store;
-};

package/reactHooks/state/__tests__/ZStoreProvider.test.tsx

@@ -1,66 +0,0 @@
-import React from "react";
-import { render, screen } from "@testing-library/react-native";
-import { Text } from "react-native";
-import { ZStoreProvider, useZStore } from "../ZStoreProvider";
-import { useStore } from "zustand";
-
-interface TestState {
-  value: string;
-}
-
-// Test component that uses the store
-const TestComponent = ({ storeName }: { storeName: string }) => {
-  const store = useZStore(storeName);
-  const value = useStore(store, (state: any) => (state as TestState).value);
-
-  return <Text testID="test-value">{value}</Text>;
-};
-
-// Test component that provides a store
-const TestProvider = ({ children }: { children: React.ReactNode }) => {
-  return (
-    <ZStoreProvider name="testStore" value={{ value: "test-value" }}>
-      {children}
-    </ZStoreProvider>
-  );
-};
-
-describe("ZStoreProvider and useZStore", () => {
-  it("should provide a store and allow access via useZStore", () => {
-    render(
-      <TestProvider>
-        <TestComponent storeName="testStore" />
-      </TestProvider>
-    );
-
-    expect(screen.getByTestId("test-value").props.children).toBe("test-value");
-  });
-
-  it("should throw error when useZStore is used outside provider", () => {
-    // Suppress console.error for this test
-    const originalError = console.error;
-    console.error = jest.fn();
-
-    expect(() => {
-      render(<TestComponent storeName="testStore" />);
-    }).toThrow("useZStore must be used within a ZStoreProvider");
-
-    console.error = originalError;
-  });
-
-  it("should throw error when store name is not found", () => {
-    // Suppress console.error for this test
-    const originalError = console.error;
-    console.error = jest.fn();
-
-    expect(() => {
-      render(
-        <TestProvider>
-          <TestComponent storeName="nonExistentStore" />
-        </TestProvider>
-      );
-    }).toThrow('Store with name "nonExistentStore" not found');
-
-    console.error = originalError;
-  });
-});