@applicaster/zapp-react-native-ui-components 15.1.4 → 16.0.0-alpha.1042942411

package/Decorators/ZappPipesDataConnector/__tests__/UrlFeedResolver.test.tsx

@@ -1,6 +1,5 @@
 import React from "react";
 import * as useFeedLoaderModule from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
-import * as useFeedRefreshModule from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedRefresh";
 import { favoritesListener } from "@applicaster/zapp-react-native-bridge/Favorites";
 import { UrlFeedResolver } from "../resolvers/UrlFeedResolver";
 import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
@@ -14,10 +13,6 @@ jest
 
 jest.mock("@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader");
 
-jest.mock(
-  "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedRefresh"
-);
-
 jest.mock("@applicaster/zapp-pipes-v2-client");
 
 jest.mock("@applicaster/zapp-react-native-bridge/Favorites", () => ({
@@ -62,6 +57,9 @@ describe("UrlFeedResolver", () => {
       component: { ...componentRequiredKeys } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -82,6 +80,9 @@ describe("UrlFeedResolver", () => {
       } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -103,6 +104,9 @@ describe("UrlFeedResolver", () => {
       } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -132,6 +136,9 @@ describe("UrlFeedResolver", () => {
       } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -155,6 +162,9 @@ describe("UrlFeedResolver", () => {
       children: mockChildren,
       riverId: "test-river",
       plugins: [],
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -173,6 +183,9 @@ describe("UrlFeedResolver", () => {
       component: { ...componentRequiredKeys } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -197,6 +210,9 @@ describe("UrlFeedResolver", () => {
           },
         },
       ] as any,
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -215,6 +231,9 @@ describe("UrlFeedResolver", () => {
       } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     (useFeedLoaderModule.useFeedLoader as jest.Mock).mockReturnValue({
@@ -250,6 +269,9 @@ describe("UrlFeedResolver", () => {
       children: mockChildren,
       riverId: "test-river",
       isLast: true,
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props1} />);
@@ -272,6 +294,9 @@ describe("UrlFeedResolver", () => {
       children: mockChildren,
       riverId: "test-river",
       isLast: false,
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props2} />);
@@ -294,6 +319,9 @@ describe("UrlFeedResolver", () => {
       children: mockChildren,
       riverId: "test-river",
       isLast: false,
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props3} />);
@@ -311,6 +339,9 @@ describe("UrlFeedResolver", () => {
       component: { ...componentRequiredKeys } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     renderWithProviders(<UrlFeedResolver {...props} />);
@@ -327,22 +358,6 @@ describe("UrlFeedResolver", () => {
     });
   });
 
-  it("should apply feed refresh hook", () => {
-    const props = {
-      feedUrl: "https://example.com/feed",
-      component: { ...componentRequiredKeys } as any,
-      children: mockChildren,
-      riverId: "test-river",
-    };
-
-    renderWithProviders(<UrlFeedResolver {...props} />);
-
-    expect(useFeedRefreshModule.useFeedRefresh).toHaveBeenCalledWith({
-      reloadData: mockReloadData,
-      component: props.component,
-    });
-  });
-
   it("should clean up listeners on unmount", () => {
     const props = {
       component: {
@@ -354,6 +369,9 @@ describe("UrlFeedResolver", () => {
       } as any,
       children: mockChildren,
       riverId: "test-river",
+      screenContext: {
+        id: "screenId",
+      },
     };
 
     const { unmount } = renderWithProviders(<UrlFeedResolver {...props} />);

package/Decorators/ZappPipesDataConnector/__tests__/zappPipesDataConnector.test.js

@@ -3,7 +3,7 @@ import { renderWithProviders } from "@applicaster/zapp-react-native-utils/testUt
 
 import * as zappPipesRedux from "@applicaster/zapp-react-native-redux/ZappPipes";
 import configureStore from "redux-mock-store";
-import thunk from "redux-thunk";
+import { thunk } from "redux-thunk";
 
 import { zappPipesDataConnector } from "../index";
 

package/Decorators/ZappPipesDataConnector/index.tsx

@@ -2,7 +2,7 @@
 /// <reference types="@applicaster/zapp-react-native-ui-components" />
 import React from "react";
 import { useRoute } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
-import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
+import { usePlugins } from "@applicaster/zapp-react-native-redux/hooks";
 import { ZappPipesSearchContext } from "@applicaster/zapp-react-native-ui-components/Contexts";
 import { useScreenContext } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
 import { ResolverSelector } from "./ResolverSelector";
@@ -23,7 +23,7 @@ export function zappPipesDataConnector(
 ) {
   return function WrappedWithZappPipesData(props: Props) {
     const { screenData } = useRoute();
-    const { plugins } = usePickFromState(["plugins"]);
+    const plugins = usePlugins();
     const screenContextData = useScreenContext();
 
     const {

package/Decorators/ZappPipesDataConnector/resolvers/StaticFeedResolver.tsx

@@ -76,7 +76,7 @@ export function StaticFeedResolver({
 
   const zappPipesDataProps = useMemo(
     () => ({
-      zappPipesData: { url, loading, data, error },
+      zappPipesData: { url, loading, data, error }, // todo: add applyItemLimit
       reloadData,
       loadNextData: undefined, // Static resolver doesn't support pagination
     }),

package/Decorators/ZappPipesDataConnector/resolvers/UrlFeedResolver.tsx

@@ -9,9 +9,9 @@ import {
   getInflatedDataSourceUrl,
   getSearchContext,
   useFeedLoader,
-  useFeedRefresh,
   useRoute,
 } from "@applicaster/zapp-react-native-utils/reactHooks";
+import { refreshCoordinator } from "@applicaster/zapp-react-native-utils/refreshUtils/RefreshCoordinator";
 
 import { ComponentDataSourceContext, ZappPipesDataProps } from "../types";
 import { useScreenStateStore } from "@applicaster/zapp-react-native-utils/reactHooks/navigation/useScreenStateStore";
@@ -199,6 +199,8 @@ export function UrlFeedResolver({
   const { pathname } = useRoute();
   const screenStateStore = useScreenStateStore();
 
+  const screenId = (screenContext?.id || "unknown_screen_id") as string;
+
   // Setup listeners for data source URL
   useEffect(() => {
     if (!reloadData) {
@@ -214,10 +216,19 @@ export function UrlFeedResolver({
         url: dataSourceUrl,
         pathname,
         screenStateStore,
+        component,
+        screenId,
         callback: reloadData,
       });
     }
-  }, [dataSourceUrl, reloadData, pathname, screenStateStore]);
+  }, [
+    dataSourceUrl,
+    reloadData,
+    pathname,
+    screenStateStore,
+    component,
+    screenId,
+  ]);
 
   // Setup favorites listener
   useEffect(() => {
@@ -230,11 +241,11 @@ export function UrlFeedResolver({
     }
   }, [type, reloadData]);
 
-  // Apply feed refresh hook
-  useFeedRefresh({
-    reloadData,
-    component,
-  });
+  useEffect(() => {
+    const unregister = refreshCoordinator.register(component, screenId);
+
+    return () => unregister();
+  }, [component, screenId]);
 
   const loadNextData = useMemo(
     () => (!isLast && isVerticalListOrGrid(component) ? undefined : loadNext),

package/Helpers/DataSourceHelper/__tests__/itemLimitForData.test.ts

@@ -0,0 +1,80 @@
+import { itemLimitForData } from "..";
+
+describe("itemLimitForData (no mocks)", () => {
+  test("returns full array when item_limit is undefined (default Infinity)", () => {
+    // @ts-ignore
+    const result = itemLimitForData([1, 2, 3], {
+      rules: { item_limit: undefined },
+    });
+
+    expect(result).toEqual([1, 2, 3]);
+  });
+
+  test("enforces positive numeric item_limit", () => {
+    // @ts-ignore
+    const result = itemLimitForData([1, 2, 3, 4], {
+      rules: { item_limit: 2 },
+    });
+
+    expect(result).toEqual([1, 2]);
+  });
+
+  test("returns empty array when entry is empty", () => {
+    const result = itemLimitForData([], {
+      rules: { item_limit: 3 },
+    });
+
+    expect(result).toEqual([]);
+  });
+
+  test("defaults entry to empty array when it is undefined", () => {
+    const result = itemLimitForData(undefined, {
+      rules: { item_limit: 5 },
+    });
+
+    expect(result).toEqual([]);
+  });
+
+  test("handles missing component", () => {
+    // @ts-ignore
+    const result = itemLimitForData([10, 20, 30], undefined);
+    // missing component → item_limit = undefined → fallback to Infinity
+    expect(result).toEqual([10, 20, 30]);
+  });
+
+  test("handles missing rules object", () => {
+    // @ts-ignore
+    const result = itemLimitForData([10, 20, 30], {});
+
+    expect(result).toEqual([10, 20, 30]);
+  });
+
+  test("non-positive item_limit should fall back to Infinity", () => {
+    // @ts-ignore
+    const result = itemLimitForData([1, 2, 3], {
+      rules: { item_limit: -10 },
+    });
+
+    // -10 → invalid → fallback to Infinity → no limit
+    expect(result).toEqual([1, 2, 3]);
+  });
+
+  test("zero item_limit should fall back to Infinity", () => {
+    // @ts-ignore
+    const result = itemLimitForData([1, 2, 3], {
+      rules: { item_limit: 0 },
+    });
+
+    // 0 → invalid → fallback to Infinity
+    expect(result).toEqual([1, 2, 3]);
+  });
+
+  test("NaN item_limit should fall back to Infinity", () => {
+    // @ts-ignore
+    const result = itemLimitForData([1, 2, 3], {
+      rules: { item_limit: NaN },
+    });
+
+    expect(result).toEqual([1, 2, 3]);
+  });
+});

package/Helpers/DataSourceHelper/index.ts

@@ -0,0 +1,19 @@
+import { toPositiveNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
+
+export function itemLimitForData(
+  entry: ZappEntry[],
+  component: {
+    rules?: { item_limit?: number | string };
+  }
+) {
+  if (!component?.rules?.item_limit) {
+    return entry;
+  }
+
+  const itemLimit = toPositiveNumberWithDefault(
+    Infinity,
+    component?.rules?.item_limit
+  );
+
+  return (entry || []).slice(0, itemLimit);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "15.1.4",
+  "version": "16.0.0-alpha.1042942411",
   "description": "Applicaster Zapp React Native ui components for the Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.4",
-    "@applicaster/zapp-react-native-bridge": "15.1.4",
-    "@applicaster/zapp-react-native-redux": "15.1.4",
-    "@applicaster/zapp-react-native-utils": "15.1.4",
+    "@applicaster/applicaster-types": "16.0.0-alpha.1042942411",
+    "@applicaster/zapp-react-native-bridge": "16.0.0-alpha.1042942411",
+    "@applicaster/zapp-react-native-redux": "16.0.0-alpha.1042942411",
+    "@applicaster/zapp-react-native-utils": "16.0.0-alpha.1042942411",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "url": "^0.11.0",

package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/index.android.tsx

@@ -1,135 +0,0 @@
-import React from "react";
-import { View, ButtonProps } from "react-native";
-import { Focusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable";
-import { useActions } from "@applicaster/zapp-react-native-utils/reactHooks/actions";
-import * as R from "ramda";
-import { useInitialFocus } from "@applicaster/zapp-react-native-utils/focusManager";
-import { getXray } from "@applicaster/zapp-react-native-utils/logger";
-import { useFocusable } from "@applicaster/zapp-react-native-ui-components/Components/Focusable/index.android";
-import {
-  useIsRTL,
-  applyRTLStylesIfNeeded,
-} from "@applicaster/zapp-react-native-utils/localizationUtils";
-
-const { Logger } = getXray();
-
-import {
-  cloneElementsWithIds,
-  insertBetween,
-  recursiveCloneElementsWithState,
-  useFilterChildren,
-} from "../../../utils";
-
-import type {
-  HorizontalSeparatorProps,
-  ContainerProps,
-  ContainerChildren,
-} from "./types";
-
-const logger = new Logger("plugin", "plugins/navigation-action");
-
-const generateId = (cellUUID, suffixId) => `${cellUUID}--${suffixId}`;
-
-const HorizontalSeparator = ({ width }: HorizontalSeparatorProps) => (
-  <View style={{ width }} />
-);
-
-export function ButtonContainerView({
-  style,
-  children,
-  ...otherProps
-}: ContainerProps) {
-  const isRTL = useIsRTL();
-
-  const horizontalGutter = R.pathOr(0, ["horizontalGutter"], otherProps);
-
-  const filteredChildren = useFilterChildren<ContainerChildren>(children);
-
-  const buttonIds = filteredChildren.map((child) => {
-    const { cellUUID, suffixId } = child.props;
-
-    return generateId(cellUUID, suffixId);
-  });
-
-  useInitialFocus(otherProps.state === "focused", R.head(buttonIds));
-
-  if (R.isEmpty(filteredChildren)) {
-    return null;
-  }
-
-  return (
-    <View style={applyRTLStylesIfNeeded(style, isRTL)}>
-      {insertBetween(
-        (index) => (
-          <HorizontalSeparator
-            key={`separator_${index}`}
-            width={horizontalGutter}
-          />
-        ),
-        cloneElementsWithIds(buttonIds, filteredChildren)
-      )}
-    </View>
-  );
-}
-
-export function FocusableViewComponent(
-  { style, children, item, ...otherProps }: ButtonProps,
-  ref
-) {
-  const {
-    cellUUID,
-    groupId,
-    suffixId,
-    normalStyles,
-    focusedStyles,
-    nextFocusLeft,
-    nextFocusRight,
-    pluginIdentifier,
-    disableFocus,
-  } = otherProps;
-
-  const parentFocus = useFocusable();
-
-  const actionContext = useActions(pluginIdentifier);
-
-  const onPress = () => {
-    if (!actionContext) {
-      logger.warning(
-        `Cannot resolve action context for ${pluginIdentifier} - please make sure the plugin is installed and up to date`
-      );
-
-      return;
-    }
-
-    actionContext?.invokeAction?.(item);
-  };
-
-  return (
-    <Focusable
-      id={generateId(cellUUID, suffixId)}
-      disableFocus={disableFocus}
-      groupId={groupId}
-      onPress={onPress}
-      nextFocusUp={parentFocus?.nextFocusUp}
-      nextFocusDown={parentFocus?.nextFocusDown}
-      nextFocusLeft={nextFocusLeft || parentFocus?.nextFocusLeft}
-      nextFocusRight={nextFocusRight || parentFocus?.nextFocusRight}
-      ref={ref}
-    >
-      {(isFocused) => {
-        const additionalStyles = isFocused ? focusedStyles : normalStyles;
-
-        return (
-          <View
-            style={{
-              ...style,
-              ...additionalStyles,
-            }}
-          >
-            {recursiveCloneElementsWithState(isFocused, children)}
-          </View>
-        );
-      }}
-    </Focusable>
-  );
-}

package/Components/MasterCell/DefaultComponents/tv/ButtonContainerView/types.ts

@@ -1,25 +0,0 @@
-import { ImageStyle } from "react-native";
-
-export type ContainerProps = Record<string, any> & {
-  buttonsToggleEnabled: boolean;
-  skipButtons: boolean;
-  style: ImageStyle;
-  children: ContainerChildren[];
-};
-
-export type ButtonProps = Record<string, any> & {
-  style: ImageStyle;
-};
-
-export type HorizontalSeparatorProps = {
-  width: number;
-};
-
-export type ContainerChildren = {
-  props: {
-    item: any;
-    pluginIdentifier: string;
-    cellUUID: string;
-    suffixId: string;
-  };
-};

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

@@ -1,112 +0,0 @@
-import * as React from "react";
-import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
-import { useNetworkStatusLocalizations } from "./utils";
-
-type Props = {
-  children?: React.ReactNode;
-  hidden?: boolean;
-  online?: boolean;
-  previousOnline?: boolean;
-  dismiss: () => void;
-};
-
-const NOTIF_DURATION = 4500;
-
-const styles: Record<any, React.CSSProperties> = {
-  body: {
-    position: "absolute",
-    bottom: 0,
-    width: 1920,
-    height: 200,
-    background:
-      "linear-gradient(180deg, rgba(17,17,17,0.9) 0%, rgba(17,17,17,1) 49%, rgba(0,0,0,0.85) 100%)",
-    display: "flex",
-    alignItems: "center",
-    justifyContent: "center",
-    flexDirection: "column",
-    color: "#fff",
-    paddingBottom: 15,
-  },
-  title: {
-    fontSize: 28,
-    margin: 0,
-    padding: 0,
-  },
-  subtitle: {
-    fontSize: 20,
-    margin: 0,
-    padding: 0,
-  },
-};
-
-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>();
-  const wentOnline = !previousOnline && props.online;
-
-  const onClose = () => {
-    setOpen(false);
-    dismiss();
-  };
-
-  const closeNotification = () => {
-    clearTimeout(timeout.current as NodeJS.Timeout);
-
-    timeout.current = setTimeout(() => {
-      setOpen(false);
-    }, NOTIF_DURATION);
-  };
-
-  const openNotification = () => {
-    if (!open && !hidden) {
-      setOpen(true);
-    }
-  };
-
-  const handleNotificationChange = () => {
-    if (open !== null) {
-      openNotification();
-    }
-
-    closeNotification();
-  };
-
-  React.useEffect(() => {
-    handleNotificationChange();
-  }, [hidden, online]);
-
-  const showOnlineMsg = wentOnline || online;
-
-  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}>
-      {children}
-      {open ? (
-        <div style={styles.body}>
-          <div style={styles.title}>
-            <h2>{MSG}</h2>
-          </div>
-
-          <h4 style={styles.subtitle}>{EXTRA_MSG}</h4>
-        </div>
-      ) : null}
-    </div>
-  );
-};