@applicaster/zapp-react-native-ui-components 16.0.0-alpha.1529223058 → 16.0.0-alpha.1803625751

package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/placement.test.ts

@@ -6,28 +6,54 @@ import {
 describe("ActionButtonsCore placement", () => {
   const buttons = { type: "View", name: "buttons" };
 
-  const above_labels = [
-    { name: "above_label_1" },
-    { name: "above_label_2" },
-    { name: "above_label_3" },
+  const slots = [
+    { name: "text_label_1", element: { type: "View", id: "label_1" } },
+    { name: "text_label_2", element: { type: "View", id: "label_2" } },
+    { name: "text_label_3", element: { type: "View", id: "label_3" } },
   ];
 
-  const below_labels = [
-    { name: "below_label_1" },
-    { name: "below_label_2" },
-    { name: "below_label_3" },
-  ];
+  const labels = slots.map((slot) => slot.element);
 
   it("inserts buttons after the matching label", () => {
     expect(
-      insertBetweenLabels({ position: "below_label_2" }, buttons, below_labels)
-    ).toEqual([below_labels[0], below_labels[1], buttons, below_labels[2]]);
+      insertBetweenLabels({ position: "below_text_label_2" }, buttons, slots)
+    ).toEqual([labels[0], labels[1], buttons, labels[2]]);
   });
 
   it("inserts buttons before the matching label", () => {
     expect(
-      insertBetweenLabels({ position: "above_label_2" }, buttons, above_labels)
-    ).toEqual([above_labels[0], buttons, above_labels[1], above_labels[2]]);
+      insertBetweenLabels({ position: "above_text_label_2" }, buttons, slots)
+    ).toEqual([labels[0], buttons, labels[1], labels[2]]);
+  });
+
+  it("inserts buttons after the matching label on a plain name match", () => {
+    expect(
+      insertBetweenLabels({ position: "text_label_2" }, buttons, slots)
+    ).toEqual([labels[0], labels[1], buttons, labels[2]]);
+  });
+
+  it("keeps the slot when its label is empty (null element)", () => {
+    const slotsWithEmpty = [
+      { name: "text_label_1", element: { id: "label_1" } },
+      { name: "text_label_2", element: null },
+      { name: "text_label_3", element: { id: "label_3" } },
+    ];
+
+    expect(
+      insertBetweenLabels(
+        { position: "above_text_label_2" },
+        buttons,
+        slotsWithEmpty
+      )
+    ).toEqual([{ id: "label_1" }, buttons, { id: "label_3" }]);
+
+    expect(
+      insertBetweenLabels(
+        { position: "below_text_label_2" },
+        buttons,
+        slotsWithEmpty
+      )
+    ).toEqual([{ id: "label_1" }, buttons, { id: "label_3" }]);
   });
 
   it("prepends buttons only when on_top is allowed", () => {
@@ -35,17 +61,17 @@ describe("ActionButtonsCore placement", () => {
       insertBetweenLabels(
         { position: "on_top", allowOnTop: true },
         buttons,
-        below_labels
+        slots
       )
-    ).toEqual([buttons, ...below_labels]);
+    ).toEqual([buttons, ...labels]);
 
     expect(
       insertBetweenLabels(
         { position: "on_top", allowOnTop: false },
         buttons,
-        below_labels
+        slots
       )
-    ).toEqual(below_labels);
+    ).toEqual(labels);
   });
 
   it("appends buttons when appendWhenMissing is enabled", () => {
@@ -53,9 +79,9 @@ describe("ActionButtonsCore placement", () => {
       insertBetweenLabels(
         { position: "unknown", appendWhenMissing: true },
         buttons,
-        below_labels
+        slots
       )
-    ).toEqual([...below_labels, buttons]);
+    ).toEqual([...labels, buttons]);
   });
 
   it("returns labels unchanged when appendWhenMissing is disabled", () => {
@@ -63,9 +89,9 @@ describe("ActionButtonsCore placement", () => {
       insertBetweenLabels(
         { position: "unknown", appendWhenMissing: false },
         buttons,
-        below_labels
+        slots
       )
-    ).toEqual(below_labels);
+    ).toEqual(labels);
   });
 
   const labelContainers = [

package/Components/MasterCell/DefaultComponents/ActionButtonsCore/placement.ts

@@ -17,6 +17,11 @@ type InsertOptions = {
   appendWhenMissing?: boolean;
 };
 
+type Slot = {
+  name: string;
+  element?: unknown;
+};
+
 const hasLabelName = (value: unknown): value is Label =>
   !!value &&
   typeof value === "object" &&
@@ -100,8 +105,14 @@ const containsNestedLabel = (
 export const insertBetweenLabels = (
   { position, allowOnTop = false, appendWhenMissing = false }: InsertOptions,
   buttons: unknown,
-  labels: Label[] = []
+  slots: Slot[] = []
 ) => {
+  // Slots are defined by the canonical label list, so an empty (null) label
+  // still keeps its position — buttons placed above/below it survive.
+  const labels = slots
+    .map((slot) => slot.element)
+    .filter((element) => element != null);
+
   if (buttons == null) {
     return labels;
   }
@@ -110,14 +121,31 @@ export const insertBetweenLabels = (
     return [buttons, ...labels];
   }
 
-  const labelsWithButtons = withButtons(position, buttons, labels);
-  const inserted = labelsWithButtons.length !== labels.length;
+  let inserted = false;
+  const result: unknown[] = [];
+
+  for (const { name, element } of slots) {
+    if (position === `above_${name}`) {
+      result.push(buttons);
+      inserted = true;
+    }
+
+    if (element != null) {
+      result.push(element);
+    }
+
+    // Insert after on `below_*` or a plain label-name match.
+    if (position === `below_${name}` || position === name) {
+      result.push(buttons);
+      inserted = true;
+    }
+  }
 
-  if (!inserted && appendWhenMissing) {
-    return [...labels, buttons];
+  if (!inserted) {
+    return appendWhenMissing ? [...labels, buttons] : labels;
   }
 
-  return inserted ? labelsWithButtons : [...labels];
+  return result;
 };
 
 export const insertBetweenLabelContainers = (

package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx

@@ -1,13 +1,14 @@
-import React from "react";
+import React, { PropsWithChildren } from "react";
 import { isVideoPreviewEnabled } from "@applicaster/zapp-react-native-ui-components/Components/MasterCell/utils";
 import { LiveImage } from "../LiveImage";
 import PureImage from "../Image";
 import { useIsScreenActive } from "@applicaster/zapp-react-native-utils/reactHooks";
 
-type Props = {
+type Props = PropsWithChildren<{
   enable_video_preview: boolean;
   player_screen_id: string;
-};
+  uri?: string;
+}>;
 
 export const ImageContainer = (props: Props) => {
   const isActive = useIsScreenActive();

package/Components/MasterCell/DefaultComponents/PressableView.tsx

@@ -1,9 +1,9 @@
 import React from "react";
-import { TouchableOpacity } from "react-native";
+import { TouchableOpacity, ViewStyle } from "react-native";
 
 type Props = {
   children?: React.ReactNode;
-  style?: Record<string, unknown>;
+  style?: ViewStyle | ViewStyle[];
   testID?: string;
   accessibilityLabel?: string;
   accessibilityHint?: string;
@@ -12,7 +12,7 @@ type Props = {
 
 export function PressableView({
   children,
-  style = {},
+  style,
   testID,
   accessibilityLabel,
   accessibilityHint,

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ActionButton.tsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { StyleSheet, View, ViewStyle } from "react-native";
 import { PressableView } from "../../PressableView";
 
 import { ActionButtonController } from "../../ActionButtonsCore/components";
@@ -15,6 +16,22 @@ type ChildElementProps = {
   entry?: any;
 };
 
+const styles = StyleSheet.create({
+  pressableView: {
+    overflow: "hidden",
+    flexDirection: "row",
+  },
+  maxWidthFull: {
+    width: "100%",
+  },
+  innerWrapper: {
+    flexDirection: "row",
+    flexGrow: 0,
+    flexShrink: 1,
+    overflow: "hidden",
+  },
+});
+
 const isValidElement = (
   child: React.ReactNode
 ): child is React.ReactElement<ChildElementProps> =>
@@ -121,12 +138,31 @@ export const ActionButton = ({ style, children, action, entry, ...props }) => {
         return (
           <PressableView
             testID={props.testID || `${entry?.id}`}
-            style={isActive ? { ...style, ...props.focusedStyles } : style}
+            style={[
+              isActive
+                ? {
+                    ...(style as ViewStyle),
+                    ...(props.focusedStyles as ViewStyle),
+                  }
+                : (style as ViewStyle),
+              styles.pressableView,
+            ]}
             onPress={onPress}
             accessibilityLabel={props.accessibilityLabel || `${entry?.id}`}
             accessibilityHint={props.accessibilityHint}
           >
-            {_cloneChildrenWithState(children)}
+            <View
+              style={{
+                maxWidth: (style as ViewStyle).maxWidth,
+                ...((style as ViewStyle).maxWidth
+                  ? styles.maxWidthFull
+                  : undefined),
+              }}
+            >
+              <View style={[styles.innerWrapper, props.alignment]}>
+                {_cloneChildrenWithState(children)}
+              </View>
+            </View>
           </PressableView>
         );
       }}

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/AssetComponent.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { View } from "react-native";
+import { StyleSheet, View } from "react-native";
 import { ImageContainer } from "../../ImageContainer";
 
 type Props = {
@@ -10,13 +10,24 @@ type Props = {
   cellUUID?: string;
 };
 
+const styles = StyleSheet.create({
+  assetContainer: {
+    flexShrink: 0,
+    justifyContent: "center",
+    alignItems: "center",
+  },
+});
+
 export const AssetComponent = (props: Props & Record<string, unknown>) => {
   return props.asset && React.isValidElement(props.asset) ? (
-    <View style={props.style} testID={props.testID}>
+    <View style={[styles.assetContainer, props.style]} testID={props.testID}>
       {React.cloneElement(props.asset, { cellUUID: props.cellUUID })}
     </View>
   ) : (
-    // @ts-ignore
-    <ImageContainer {...props} uri={props.uri} />
+    <ImageContainer
+      style={[styles.assetContainer, props.style]}
+      {...(props as any)}
+      uri={props.uri}
+    />
   );
 };

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Button.ts

@@ -10,23 +10,33 @@ import {
   getPressableStyles,
   getTextLabelStyles,
 } from "./utils";
+import { ViewStyle } from "react-native";
 
 const displayModeStyle = (value) => {
   const mode = value("display_mode") || "dynamic";
 
-  if (mode === "fixed") {
-    return {
-      width: toNumberWithDefault(140, value("width")),
-    };
-  }
+  const defaultStyle = {
+    flexShrink: 1,
+  };
 
-  if (mode === "fill") {
-    return {
-      flex: 1,
-    };
+  switch (mode) {
+    case "fixed":
+      return {
+        ...defaultStyle,
+        width: toNumberWithDefault(140, value("width")),
+        maxWidth: toNumberWithDefault(140, value("width")),
+      };
+    case "fill":
+      return {
+        ...defaultStyle,
+        flex: 1,
+      };
+    case "dynamic":
+    default:
+      return {
+        ...defaultStyle,
+      };
   }
-
-  return {};
 };
 
 type Props = {
@@ -34,7 +44,7 @@ type Props = {
   value: Function;
   stylePrefix: string;
   specificPrefix: string;
-  spacingStyle: Record<string, unknown>;
+  spacingStyle: ViewStyle;
 };
 
 export const Button = ({
@@ -75,14 +85,17 @@ export const Button = ({
     type: "MobileActionButton",
     style: {
       flexDirection: getContentDirection(assetAlignment),
-      alignContent: "center",
-      alignItems: getContentsAlignment(contentsAlignment, assetAlignment),
-      justifyContent: getContentsAlignment(contentsAlignment, assetAlignment),
+      // alignContent: "center", Why do we need this?
       ...getPressableStyles(getValue),
       ...displayModeStyle(getValue),
       ...spacingStyle,
     },
     additionalProps: {
+      alignment: {
+        alignContent: "center",
+        alignItems: getContentsAlignment(contentsAlignment, assetAlignment),
+        justifyContent: getContentsAlignment(contentsAlignment, assetAlignment),
+      },
       action: {
         identifier: actionIdentifier,
         flavour: actionAssetFlavour,
@@ -114,7 +127,8 @@ export const Button = ({
                 color: getValue("focused_font_color"),
               },
               transformText: getValue("text_transform") || "default",
-              numberOfLines: getValue("number_of_lines"),
+              numberOfLines: getValue("number_of_lines") || 1,
+              ellipseMode: "tail",
             },
             actionIdentifier,
             testID,

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabelsContainer.ts

@@ -14,6 +14,9 @@ export const TextLabelsContainer = ({
 }: Props) => {
   return {
     type: "View",
+    style: {
+      flexShrink: 1,
+    },
     additionalProps: {
       mobileActionRole: "label_container",
     },

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/index.ts

@@ -6,6 +6,7 @@ import {
 } from "./utils";
 import { Button } from "./Button";
 import { buildActionButtonsModel } from "../../ActionButtonsCore/model";
+import { ViewStyle } from "react-native";
 
 const CONTAINER_PREFIX = "mobile_buttons_container";
 const BUTTON_PREFIX = "mobile_button";
@@ -81,7 +82,7 @@ export const MobileActionButtons = ({
       const isVertical = stacking === "vertical";
       const gutter = isVertical ? verticalGutter : horizontalGutter;
 
-      const spacingStyle = {
+      const spacingStyle: ViewStyle = {
         [isVertical ? "marginBottom" : "marginRight"]: isNotLast ? gutter : 0,
       };
 

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/__tests__/insertButtons.test.ts

@@ -5,14 +5,19 @@ import {
 } from "..";
 
 describe("mobile action insertion helpers", () => {
-  const labels = [{ name: "text_label_1" }, { name: "text_label_2" }];
+  const slots = [
+    { name: "text_label_1", element: { type: "View", id: "text_label_1" } },
+    { name: "text_label_2", element: { type: "View", id: "text_label_2" } },
+  ];
+
+  const labels = slots.map((slot) => slot.element);
   const buttons = { type: "View", name: "buttons" };
 
   it("inserts label buttons below target label", () => {
     const result = insertButtonsBetweenLabels(
       { mobile_buttons_container_position: "below_text_label_1" },
       buttons,
-      labels
+      slots
     );
 
     expect(result).toEqual([labels[0], buttons, labels[1]]);
@@ -22,7 +27,7 @@ describe("mobile action insertion helpers", () => {
     const result = insertButtonsBetweenLabels(
       { mobile_buttons_container_position: "unknown" },
       buttons,
-      labels
+      slots
     );
 
     expect(result).toEqual([labels[0], labels[1]]);

package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/index.ts

@@ -8,7 +8,7 @@ import { Platform } from "react-native";
 export const insertButtonsBetweenLabels = (
   configuration: Record<string, unknown>,
   buttons,
-  labels = []
+  slots = [] // { name, element } per canonical text label slot
 ) =>
   insertBetweenLabels(
     {
@@ -19,7 +19,7 @@ export const insertButtonsBetweenLabels = (
       appendWhenMissing: false,
     },
     buttons,
-    labels // "text_label_1", "text_label_2", "text_label_3", "text_label_4"
+    slots
   );
 
 export const insertButtonsBetweenLabelContainers = (

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/insertButtonsBetweenLabels.test.ts

@@ -3,18 +3,20 @@ import { insertButtonsBetweenLabels } from "..";
 describe("insertButtonsBetweenLabels - depthlevel 1", () => {
   const buttons = "buttons";
 
-  const labels = [
-    { name: "label_1" },
-    { name: "label_2" },
-    { name: "label_3" },
+  const slots = [
+    { name: "label_1", element: { id: "label_1" } },
+    { name: "label_2", element: { id: "label_2" } },
+    { name: "label_3", element: { id: "label_3" } },
   ];
 
+  const labels = slots.map((slot) => slot.element);
+
   it("put buttons on top", () => {
     const configuration = {
       tv_buttons_container_position: "on_top",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([buttons, ...labels]);
   });
@@ -24,7 +26,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "unknown_position",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([...labels, buttons]);
   });
@@ -34,7 +36,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_1",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], buttons, labels[1], labels[2]]);
   });
@@ -44,7 +46,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_2",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], buttons, labels[2]]);
   });
@@ -54,22 +56,52 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_3",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], labels[2], buttons]);
   });
 
-  it("put underneath all", () => {
+  it("put above label_2", () => {
+    const configuration = {
+      tv_buttons_container_position: "above_label_2",
+    };
+
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
+
+    expect(result).toEqual([labels[0], buttons, labels[1], labels[2]]);
+  });
+
+  it("keeps the slot when its label is empty (null element)", () => {
+    const slotsWithEmpty = [
+      { name: "label_1", element: { id: "label_1" } },
+      { name: "label_2", element: null },
+      { name: "label_3", element: { id: "label_3" } },
+    ];
+
+    const configuration = {
+      tv_buttons_container_position: "above_label_2",
+    };
+
+    const result = insertButtonsBetweenLabels(
+      configuration,
+      buttons,
+      slotsWithEmpty
+    );
+
+    expect(result).toEqual([{ id: "label_1" }, buttons, { id: "label_3" }]);
+  });
+
+  it("appends buttons when the target is unknown", () => {
     const configuration = {
       tv_buttons_container_position: "label_X",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, buttons, labels);
+    const result = insertButtonsBetweenLabels(configuration, buttons, slots);
 
     expect(result).toEqual([labels[0], labels[1], labels[2], buttons]);
   });
 
-  it("put underneath all", () => {
+  it("appends buttons when there are no slots", () => {
     const configuration = {
       tv_buttons_container_position: "label_X",
     };
@@ -88,7 +120,7 @@ describe("insertButtonsBetweenLabels - depthlevel 1", () => {
       tv_buttons_container_position: "label_X",
     };
 
-    const result = insertButtonsBetweenLabels(configuration, null, labels);
+    const result = insertButtonsBetweenLabels(configuration, null, slots);
 
     expect(result).toEqual(labels);
   });

package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts

@@ -34,7 +34,7 @@ export const memoizedGetPluginIdentifier = memoizee(getPluginIdentifier);
 export const insertButtonsBetweenLabels = (
   configuration: Record<string, unknown>,
   buttons,
-  labels = []
+  slots = [] // { name, element } per canonical text label slot
 ) =>
   insertBetweenLabels(
     {
@@ -45,7 +45,7 @@ export const insertButtonsBetweenLabels = (
       appendWhenMissing: true,
     },
     buttons,
-    labels
+    slots
   );
 
 export const insertButtonsBetweenLabelContainers = (

package/Helpers/ComponentCellSelectionHelper/index.js

@@ -1,4 +1,3 @@
-import { sendTapCellEvent, sendTapMenuItem } from "../Analytics";
 import { getItemType } from "@applicaster/zapp-react-native-utils/navigationUtils";
 import { SCREEN_TYPES } from "@applicaster/zapp-react-native-utils/navigationUtils/itemTypes";
 
@@ -12,7 +11,6 @@ export function onCellPress(
   itemIndex,
   layoutVersion = "v1"
 ) {
-  sendTapCellEvent(entry, component, headerTitle, itemIndex);
   const componentScreenType = screenTypeFromComponent(component);
   const entryScreenType = screenTypeFromEntry(entry);
   const itemType = getItemType(entry, layoutVersion);
@@ -37,7 +35,3 @@ function screenTypeFromComponent(component) {
 function screenTypeFromEntry(entry) {
   return entry && entry.screen_type;
 }
-
-export function onMenuItemFocus({ item, index, isHome }) {
-  sendTapMenuItem({ item, index, isHome });
-}

package/Helpers/index.js

@@ -7,42 +7,3 @@ export const ASSETS = {
     amazon: "tv_app_background",
   }),
 };
-
-export const ANALYTICS_CORE_EVENTS = {
-  TAP_CELL: "Tap Cell",
-  PLAY_VOD_ITEM: "Play VOD Item",
-  VOD_ITEM_PLAY_WAS_TRIGGERED: "VOD Item: Play Was Triggered",
-  CHANNEL_ITEM_PLAY_WAS_TRIGGERED: "Channel Item: Play Was Triggered",
-  PROGRAM_ITEM_PLAY_WAS_TRIGGERED: "Program Item: Play Was Triggered",
-  TAP_MENU_ICON: "Tap Menu Item",
-  HOME_SCREEN_VIEWED: "Home Screen: Viewed",
-  ITEM_NOT_AVAILABLE: "N/A",
-};
-
-export const ANALYTICS_ENTRY_EVENTS = {
-  ITEM_TYPE: "Item Type",
-  ITEM_TITLE: "Item Name",
-  ITEM_ID: "Item ID",
-  ITEM_LINK: "Item Link",
-  ITEM_INDEX: "Item Number",
-  ITEM_TIME_PLAYED: "Item Total Time Played",
-  ITEM_TOTAL_TIME_PLAYED: "Item Total Time Played",
-  ITEM_PLAY_COMPLETED: "Completed",
-  ITEM_CUSTOM_PROPERTY: "Custom Property",
-};
-
-export const ANALYTICS_COMPONENT_EVENTS = {
-  COMPONENT_ID: "Component ID",
-  COMPONENT_TYPE: "Component Type",
-  CELL_STYLE: "Cell Style",
-  HEADER_TITLE: "Header Name",
-  COMPONENT_SOURCE: "Component Source",
-};
-
-export const ANALYTICS_MENU_ITEM_EVENTS = {
-  ITEM_TYPE: "Item Type",
-  ITEM_TITLE: "Item Name",
-  ITEM_ID: "Item ID",
-  ITEM_HOME_SCREEN: "Home Screen",
-  ITEM_INDEX: "Item Number",
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-ui-components",
-  "version": "16.0.0-alpha.1529223058",
+  "version": "16.0.0-alpha.1803625751",
   "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": "16.0.0-alpha.1529223058",
-    "@applicaster/zapp-react-native-bridge": "16.0.0-alpha.1529223058",
-    "@applicaster/zapp-react-native-redux": "16.0.0-alpha.1529223058",
-    "@applicaster/zapp-react-native-utils": "16.0.0-alpha.1529223058",
+    "@applicaster/applicaster-types": "16.0.0-alpha.1803625751",
+    "@applicaster/zapp-react-native-bridge": "16.0.0-alpha.1803625751",
+    "@applicaster/zapp-react-native-redux": "16.0.0-alpha.1803625751",
+    "@applicaster/zapp-react-native-utils": "16.0.0-alpha.1803625751",
     "fast-json-stable-stringify": "^2.1.0",
     "promise": "^8.3.0",
     "url": "^0.11.0",

package/Helpers/Analytics/index.js

@@ -1,95 +0,0 @@
-import * as R from "ramda";
-import { postAnalyticEvent } from "@applicaster/zapp-react-native-tvos-app/AnalyticsManager";
-import { extensionsEvents } from "@applicaster/zapp-react-native-utils/analyticsUtils/AnalyticsEvents/helper";
-import {
-  ANALYTICS_CORE_EVENTS,
-  ANALYTICS_ENTRY_EVENTS,
-  ANALYTICS_COMPONENT_EVENTS,
-  ANALYTICS_MENU_ITEM_EVENTS,
-} from "../";
-
-export function sendTapCellEvent(item, component, headerTitle, itemIndex) {
-  const itemReadableIndex = itemIndex + 1;
-
-  const analyticsProperties = R.compose(
-    R.reject(R.isNil),
-    R.merge(eventForEntry(item, itemReadableIndex))
-  )(eventForComponent(component, headerTitle));
-
-  postEvent(ANALYTICS_CORE_EVENTS.TAP_CELL, analyticsProperties);
-}
-
-export function sendTapMenuItem({ item, index, isHome }) {
-  const analyticsProperties = R.compose(R.reject(R.isNil))(
-    eventForMenuItemEntry({ item, index, isHome })
-  );
-
-  postEvent(ANALYTICS_CORE_EVENTS.TAP_MENU_ICON, analyticsProperties);
-
-  if (isHome) {
-    postEvent(ANALYTICS_CORE_EVENTS.HOME_SCREEN_VIEWED, null);
-  }
-}
-
-function postEvent(event, properties) {
-  postAnalyticEvent(event, properties);
-}
-
-function eventForEntry(item, itemIndex) {
-  const {
-    title,
-    type: { value: valueType },
-    id,
-  } = item;
-
-  const analyticsCustomProperties = extensionsEvents(item.extensions);
-
-  const analyticsEvents = {
-    [ANALYTICS_ENTRY_EVENTS.ITEM_TYPE]: valueType,
-    [ANALYTICS_ENTRY_EVENTS.ITEM_TITLE]: title,
-    [ANALYTICS_ENTRY_EVENTS.ITEM_ID]: id,
-    [ANALYTICS_ENTRY_EVENTS.ITEM_INDEX]:
-      (itemIndex && itemIndex.toString()) || null,
-  };
-
-  if (analyticsCustomProperties) {
-    analyticsEvents.analyticsCustomProperties = analyticsCustomProperties;
-  }
-
-  return analyticsEvents;
-}
-
-function eventForComponent(
-  component,
-  headerTitle, // Zapp Pipes data passed for group components
-  zappPipesData = null
-) {
-  const { id, component_type, styles, data } = component;
-  const { cell_style } = styles;
-  const source = data?.source || zappPipesData?.data?.url || null;
-
-  return {
-    [ANALYTICS_COMPONENT_EVENTS.COMPONENT_ID]: id,
-    [ANALYTICS_COMPONENT_EVENTS.COMPONENT_TYPE]: component_type,
-    [ANALYTICS_COMPONENT_EVENTS.CELL_STYLE]:
-      cell_style || ANALYTICS_CORE_EVENTS.ITEM_NOT_AVAILABLE,
-    [ANALYTICS_COMPONENT_EVENTS.COMPONENT_SOURCE]:
-      (source && encodeURIComponent(source)) || null,
-    [ANALYTICS_COMPONENT_EVENTS.HEADER_TITLE]: headerTitle,
-  };
-}
-
-function eventForMenuItemEntry({ item, index, isHome }) {
-  const { title, type, id } = item;
-
-  const itemReadableIndex = index + 1;
-
-  return {
-    [ANALYTICS_MENU_ITEM_EVENTS.ITEM_INDEX]:
-      (itemReadableIndex && itemReadableIndex.toString()) || null,
-    [ANALYTICS_MENU_ITEM_EVENTS.ITEM_TYPE]: type,
-    [ANALYTICS_MENU_ITEM_EVENTS.ITEM_TITLE]: title,
-    [ANALYTICS_MENU_ITEM_EVENTS.ITEM_ID]: id,
-    [ANALYTICS_MENU_ITEM_EVENTS.ITEM_HOME_SCREEN]: isHome ? "YES" : "NO",
-  };
-}