@moneylion/react-native-offer-carousel 1.4.0 → 1.5.0

package/src/components/Text/index.tsx

@@ -7,6 +7,7 @@ import {
 	type TextProps as RNTextProps,
 } from "react-native";
 import { useTheme, type ThemeColors } from "../../context/ThemeProvider";
+import withTestID from "../utils/withTestID";
 
 // Define the variant types
 export type Variant =
@@ -41,6 +42,10 @@ export interface TextProps extends Omit<RNTextProps, "style"> {
 	style?: StyleProp<TextStyle>;
 }
 
+export type TextRef = React.ElementRef<typeof RNText>;
+
+const TextWithTestID = withTestID<TextProps, TextRef>(RNText);
+
 const Text: React.FC<TextProps> = ({
 	variant,
 	weight,
@@ -85,9 +90,9 @@ const Text: React.FC<TextProps> = ({
 	}
 
 	return (
-		<RNText style={styleArray} ellipsizeMode={"tail"} {...restProps}>
+		<TextWithTestID style={styleArray} ellipsizeMode={"tail"} {...restProps}>
 			{children}
-		</RNText>
+		</TextWithTestID>
 	);
 };
 

package/src/components/Touchable/TouchableOpacity.tsx

@@ -0,0 +1,15 @@
+import { TouchableOpacity as RNTouchableOpacity } from "react-native";
+
+import withTestID from "../utils/withTestID";
+
+export type TouchableOpacityProps = React.ComponentProps<
+	typeof RNTouchableOpacity
+>;
+
+export type TouchableOpacityRef = React.ElementRef<typeof RNTouchableOpacity>;
+
+const TouchableOpacity = withTestID<TouchableOpacityProps, TouchableOpacityRef>(
+	RNTouchableOpacity
+);
+
+export default TouchableOpacity;

package/src/components/Touchable/index.ts

@@ -0,0 +1,2 @@
+export { default as TouchableOpacity } from "./TouchableOpacity";
+export * from "./TouchableOpacity";

package/src/components/utils/withTestID.tsx

@@ -0,0 +1,56 @@
+import React from "react";
+import { Platform } from "react-native";
+
+//#region generateAccessibilityLabel
+/**
+ * TestID would work on IOS, and accessibilityLabel would work on android
+ * However if both are available in the component, IOS won't work
+ * Workaround: https://stackoverflow.com/a/54844164
+ * There is a related fix on React native >0.65.x version https://github.com/facebook/react-native/commit/381fb395ad9d2d48717a5d082aaedbecdd804554
+ * Will revisit on new react native version if issue still persist
+ */
+const generateAccessibilityLabel = (accessibilityLabel?: string) => {
+	if (!accessibilityLabel) {
+		return;
+	}
+	return Platform.select({
+		ios: undefined,
+		android: accessibilityLabel,
+	});
+};
+//#endregion
+
+//#region testID prop types
+type AccessibilityProps = import("react-native").AccessibilityProps;
+type ViewProps = import("react-native").ViewProps;
+type TestIDProps = Pick<AccessibilityProps, "accessibilityLabel"> &
+	Pick<ViewProps, "testID">;
+//#endregion
+
+//#region withTestID wrapper
+function withTestID<P extends object, R = unknown>(
+	Component: React.ComponentType<P & React.RefAttributes<R>>
+) {
+	const WrappedComponent = React.forwardRef<R, P & TestIDProps>(
+		(props, ref) => {
+			const { accessibilityLabel, testID, ...rest } = props;
+			// In development, use testID as accessibilityLabel if not provided
+			const label =
+				__DEV__ && !accessibilityLabel ? testID : accessibilityLabel;
+
+			return (
+				<Component
+					{...(rest as P)}
+					ref={ref}
+					testID={testID}
+					accessibilityLabel={generateAccessibilityLabel(label)}
+				/>
+			);
+		}
+	);
+	WrappedComponent.displayName = `withTestID(${Component.displayName || Component.name || "Component"})`;
+	return WrappedComponent;
+}
+//#endregion
+
+export default withTestID;

package/src/pageData.ts

@@ -7,7 +7,6 @@ import { getDynamicOffers } from "./services/getDynamicOffers";
 // import { getDynamicOffers } from "./services/getDynamicOffers";
 import {
 	getDefaultProductType,
-	getLayout,
 	getProductTypesDefinition,
 	resolveProductTypes,
 } from "./utils";
@@ -28,7 +27,6 @@ export async function getPageData({
 		productType,
 		query,
 		tags,
-		displayLayout,
 		searchAPIToken,
 		showProductTypeLabel,
 		showCardBorder,
@@ -53,8 +51,6 @@ export async function getPageData({
 
 	const safeTags = encodeURI(resolvedTags);
 
-	const safeDisplayLayout = getLayout(displayLayout);
-
 	// Get product types and result type
 	const { productTypes, resultType } = await resolveProductTypes({
 		defaultProductType,
@@ -75,7 +71,6 @@ export async function getPageData({
 	const { offers, isError, leadUuid, rateTableUuid, errorCode } =
 		await getDynamicOffers({
 			tags: safeTags,
-			displayLayout: safeDisplayLayout,
 			productTypes,
 			resultType,
 			isCachedOffersRequest,
@@ -97,6 +92,5 @@ export async function getPageData({
 		showCardBorder,
 		// shouldHideFooter,
 		showProductTypeLabel,
-		displayLayout: safeDisplayLayout,
 	};
 }

package/src/services/getDynamicOffers.ts

@@ -3,7 +3,6 @@ import {
 	addClientTagsToOfferLinks,
 	getOffersByProductTypes,
 	selectDynamicOffers,
-	type Layout,
 } from "../utils";
 import type {
 	GetProductTypesProps,
@@ -12,7 +11,6 @@ import type {
 import { sortOffersByRecommendationScore } from "../utils/sortOffersByRecommendationScore";
 import { pipe } from "effect";
 import { formatOfferUrl } from "../utils/formatOfferUrl";
-import { getOffersBasedOnLayout } from "../utils/getOffersBasedOnLayout";
 import type {
 	PartnerOverride,
 	ProductTypeDefinition,
@@ -21,7 +19,6 @@ import type { CnfContext } from "../capabilities/core/src/system/cnfContext/CnfC
 
 export type GetDynamicOffersProps = {
 	tags: string;
-	displayLayout: Layout;
 	productTypes: string[];
 	resultType: ProductTypesResult["resultType"];
 	isCachedOffersRequest: boolean;
@@ -46,7 +43,6 @@ export type GetDynamicOffersProps = {
  */
 export const getDynamicOffers = async ({
 	tags,
-	displayLayout,
 	defaultProductType,
 	productTypes,
 	resultType,
@@ -92,7 +88,7 @@ export const getDynamicOffers = async ({
 			sortedOffers,
 			formatOfferUrl(productTypesDefinition, partnersOverrideDefinition),
 			addClientTagsToOfferLinks(isCachedOffersRequest, tags),
-			getOffersBasedOnLayout(displayLayout)
+			sortOffersByRecommendationScore
 		),
 		isError,
 		errorCode,

package/src/utils/index.ts

@@ -2,7 +2,6 @@ export * from "./addClientTagsToOfferLinks";
 export * from "./getDefaultProductType";
 export * from "./getOffersByProductTypes";
 export * from "./getProductTypesDefinition";
-export * from "./layouts";
 export * from "./resolveProductTypes";
 export * from "./selectDynamicOffers";
 export * from "./sortOffersByRecommendationScore";

package/lib/commonjs/utils/getOffersBasedOnLayout.js

@@ -1,48 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.sortFixedOffers = exports.getOffersByLayout = exports.getOffersBasedOnLayout = void 0;
-var _effect = require("effect");
-var _sortOffersByRecommendationScore = require("./sortOffersByRecommendationScore");
-const MAX_OFFERS_TO_DISPLAY = 3;
-
-/**
- * Sorts the offers based on the layout.
- *
- * @param offers - The offers to sort.
- * @returns The sorted offers.
- */
-const sortFixedOffers = offers => {
-  const resultOffers = Array.from({
-    length: offers.length >= MAX_OFFERS_TO_DISPLAY ? MAX_OFFERS_TO_DISPLAY : offers.length
-  }, (_, index) => offers[index % offers.length]).filter(offer => offer !== undefined);
-  return resultOffers;
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-exports.sortFixedOffers = sortFixedOffers;
-const getOffersByLayout = layout => offers => {
-  return layout === "carousel" ? (0, _sortOffersByRecommendationScore.sortOffersByRecommendationScore)(offers) : sortFixedOffers(offers);
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-exports.getOffersByLayout = getOffersByLayout;
-const getOffersBasedOnLayout = layout => offers => {
-  return (0, _effect.pipe)(offers, getOffersByLayout(layout));
-};
-exports.getOffersBasedOnLayout = getOffersBasedOnLayout;
-//# sourceMappingURL=getOffersBasedOnLayout.js.map

package/lib/commonjs/utils/getOffersBasedOnLayout.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_effect","require","_sortOffersByRecommendationScore","MAX_OFFERS_TO_DISPLAY","sortFixedOffers","offers","resultOffers","Array","from","length","_","index","filter","offer","undefined","exports","getOffersByLayout","layout","sortOffersByRecommendationScore","getOffersBasedOnLayout","pipe"],"sourceRoot":"../../../src","sources":["utils/getOffersBasedOnLayout.ts"],"mappings":";;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAEA,IAAAC,gCAAA,GAAAD,OAAA;AAGA,MAAME,qBAAqB,GAAG,CAAC;;AAE/B;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,eAAe,GAAIC,MAAmB,IAAkB;EACpE,MAAMC,YAAY,GAAGC,KAAK,CAACC,IAAI,CAC9B;IACCC,MAAM,EACLJ,MAAM,CAACI,MAAM,IAAIN,qBAAqB,GACnCA,qBAAqB,GACrBE,MAAM,CAACI;EACZ,CAAC,EACD,CAACC,CAAC,EAAEC,KAAK,KAAKN,MAAM,CAACM,KAAK,GAAGN,MAAM,CAACI,MAAM,CAC3C,CAAC,CAACG,MAAM,CAAEC,KAAK,IAAyBA,KAAK,KAAKC,SAAS,CAAC;EAE5D,OAAOR,YAAY;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AANAS,OAAA,CAAAX,eAAA,GAAAA,eAAA;AAOO,MAAMY,iBAAiB,GAAIC,MAAc,IAAMZ,MAAmB,IAAK;EAC7E,OAAOY,MAAM,KAAK,UAAU,GACzB,IAAAC,gEAA+B,EAACb,MAAM,CAAC,GACvCD,eAAe,CAACC,MAAM,CAAC;AAC3B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AANAU,OAAA,CAAAC,iBAAA,GAAAA,iBAAA;AAOO,MAAMG,sBAAsB,GACjCF,MAAc,IAAMZ,MAAmB,IAAK;EAC5C,OAAO,IAAAe,YAAI,EAACf,MAAM,EAAEW,iBAAiB,CAACC,MAAM,CAAC,CAAC;AAC/C,CAAC;AAACF,OAAA,CAAAI,sBAAA,GAAAA,sBAAA","ignoreList":[]}

package/lib/commonjs/utils/layouts.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.layouts = exports.getLayout = void 0;
-const layouts = exports.layouts = {
-  carousel: "carousel",
-  fixed: "fixed"
-};
-/**
- * Get layout based on the provided layout
- * @param layout {string | null} layout
- * @returns {Layout} layout or default layout
- *
- * @example
- * getLayout('fixed') // 'fixed'
- * getLayout('invalidLayout') // 'carousel'
- * getLayout(null) // 'carousel'
- * getLayout('') // 'carousel'
- * getLayout('carousel') // 'carousel'
- */
-const getLayout = layout => {
-  return layouts[layout] ?? layouts.carousel;
-};
-exports.getLayout = getLayout;
-//# sourceMappingURL=layouts.js.map

package/lib/commonjs/utils/layouts.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["layouts","exports","carousel","fixed","getLayout","layout"],"sourceRoot":"../../../src","sources":["utils/layouts.ts"],"mappings":";;;;;;AAAO,MAAMA,OAAO,GAAAC,OAAA,CAAAD,OAAA,GAAG;EACtBE,QAAQ,EAAE,UAAU;EACpBC,KAAK,EAAE;AACR,CAAU;AAIV;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,SAAS,GAAIC,MAAe,IAAa;EACrD,OAAOL,OAAO,CAACK,MAAM,CAAW,IAAIL,OAAO,CAACE,QAAQ;AACrD,CAAC;AAACD,OAAA,CAAAG,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/module/utils/getOffersBasedOnLayout.js

@@ -1,39 +0,0 @@
-import { pipe } from "effect";
-import { sortOffersByRecommendationScore } from "./sortOffersByRecommendationScore";
-const MAX_OFFERS_TO_DISPLAY = 3;
-
-/**
- * Sorts the offers based on the layout.
- *
- * @param offers - The offers to sort.
- * @returns The sorted offers.
- */
-export const sortFixedOffers = offers => {
-  const resultOffers = Array.from({
-    length: offers.length >= MAX_OFFERS_TO_DISPLAY ? MAX_OFFERS_TO_DISPLAY : offers.length
-  }, (_, index) => offers[index % offers.length]).filter(offer => offer !== undefined);
-  return resultOffers;
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export const getOffersByLayout = layout => offers => {
-  return layout === "carousel" ? sortOffersByRecommendationScore(offers) : sortFixedOffers(offers);
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export const getOffersBasedOnLayout = layout => offers => {
-  return pipe(offers, getOffersByLayout(layout));
-};
-//# sourceMappingURL=getOffersBasedOnLayout.js.map

package/lib/module/utils/getOffersBasedOnLayout.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["pipe","sortOffersByRecommendationScore","MAX_OFFERS_TO_DISPLAY","sortFixedOffers","offers","resultOffers","Array","from","length","_","index","filter","offer","undefined","getOffersByLayout","layout","getOffersBasedOnLayout"],"sourceRoot":"../../../src","sources":["utils/getOffersBasedOnLayout.ts"],"mappings":"AAAA,SAASA,IAAI,QAAQ,QAAQ;AAE7B,SAASC,+BAA+B,QAAQ,mCAAmC;AAGnF,MAAMC,qBAAqB,GAAG,CAAC;;AAE/B;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAAe,GAAIC,MAAmB,IAAkB;EACpE,MAAMC,YAAY,GAAGC,KAAK,CAACC,IAAI,CAC9B;IACCC,MAAM,EACLJ,MAAM,CAACI,MAAM,IAAIN,qBAAqB,GACnCA,qBAAqB,GACrBE,MAAM,CAACI;EACZ,CAAC,EACD,CAACC,CAAC,EAAEC,KAAK,KAAKN,MAAM,CAACM,KAAK,GAAGN,MAAM,CAACI,MAAM,CAC3C,CAAC,CAACG,MAAM,CAAEC,KAAK,IAAyBA,KAAK,KAAKC,SAAS,CAAC;EAE5D,OAAOR,YAAY;AACpB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMS,iBAAiB,GAAIC,MAAc,IAAMX,MAAmB,IAAK;EAC7E,OAAOW,MAAM,KAAK,UAAU,GACzBd,+BAA+B,CAACG,MAAM,CAAC,GACvCD,eAAe,CAACC,MAAM,CAAC;AAC3B,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMY,sBAAsB,GACjCD,MAAc,IAAMX,MAAmB,IAAK;EAC5C,OAAOJ,IAAI,CAACI,MAAM,EAAEU,iBAAiB,CAACC,MAAM,CAAC,CAAC;AAC/C,CAAC","ignoreList":[]}

package/lib/module/utils/layouts.js

@@ -1,20 +0,0 @@
-export const layouts = {
-  carousel: "carousel",
-  fixed: "fixed"
-};
-/**
- * Get layout based on the provided layout
- * @param layout {string | null} layout
- * @returns {Layout} layout or default layout
- *
- * @example
- * getLayout('fixed') // 'fixed'
- * getLayout('invalidLayout') // 'carousel'
- * getLayout(null) // 'carousel'
- * getLayout('') // 'carousel'
- * getLayout('carousel') // 'carousel'
- */
-export const getLayout = layout => {
-  return layouts[layout] ?? layouts.carousel;
-};
-//# sourceMappingURL=layouts.js.map

package/lib/module/utils/layouts.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["layouts","carousel","fixed","getLayout","layout"],"sourceRoot":"../../../src","sources":["utils/layouts.ts"],"mappings":"AAAA,OAAO,MAAMA,OAAO,GAAG;EACtBC,QAAQ,EAAE,UAAU;EACpBC,KAAK,EAAE;AACR,CAAU;AAIV;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,SAAS,GAAIC,MAAe,IAAa;EACrD,OAAOJ,OAAO,CAACI,MAAM,CAAW,IAAIJ,OAAO,CAACC,QAAQ;AACrD,CAAC","ignoreList":[]}

package/lib/typescript/src/utils/getOffersBasedOnLayout.d.ts

@@ -1,26 +0,0 @@
-import type { Layout } from "./layouts";
-import type { BaseOffer } from "../capabilities/offer-catalog/src";
-/**
- * Sorts the offers based on the layout.
- *
- * @param offers - The offers to sort.
- * @returns The sorted offers.
- */
-export declare const sortFixedOffers: (offers: BaseOffer[]) => BaseOffer[];
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export declare const getOffersByLayout: (layout: Layout) => (offers: BaseOffer[]) => BaseOffer[];
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export declare const getOffersBasedOnLayout: (layout: Layout) => (offers: BaseOffer[]) => BaseOffer[];
-//# sourceMappingURL=getOffersBasedOnLayout.d.ts.map

package/lib/typescript/src/utils/getOffersBasedOnLayout.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getOffersBasedOnLayout.d.ts","sourceRoot":"","sources":["../../../../src/utils/getOffersBasedOnLayout.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAInE;;;;;GAKG;AACH,eAAO,MAAM,eAAe,WAAY,SAAS,EAAE,KAAG,SAAS,EAY9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,WAAY,MAAM,cAAc,SAAS,EAAE,gBAIxE,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,WACzB,MAAM,cAAc,SAAS,EAAE,gBAEvC,CAAC"}

package/lib/typescript/src/utils/layouts.d.ts

@@ -1,19 +0,0 @@
-export declare const layouts: {
-    readonly carousel: "carousel";
-    readonly fixed: "fixed";
-};
-export type Layout = keyof typeof layouts;
-/**
- * Get layout based on the provided layout
- * @param layout {string | null} layout
- * @returns {Layout} layout or default layout
- *
- * @example
- * getLayout('fixed') // 'fixed'
- * getLayout('invalidLayout') // 'carousel'
- * getLayout(null) // 'carousel'
- * getLayout('') // 'carousel'
- * getLayout('carousel') // 'carousel'
- */
-export declare const getLayout: (layout?: string) => Layout;
-//# sourceMappingURL=layouts.d.ts.map

package/lib/typescript/src/utils/layouts.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"layouts.d.ts","sourceRoot":"","sources":["../../../../src/utils/layouts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO;;;CAGV,CAAC;AAEX,MAAM,MAAM,MAAM,GAAG,MAAM,OAAO,OAAO,CAAC;AAE1C;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,SAAS,YAAa,MAAM,KAAG,MAE3C,CAAC"}

package/src/utils/getOffersBasedOnLayout.ts

@@ -1,51 +0,0 @@
-import { pipe } from "effect";
-import type { Layout } from "./layouts";
-import { sortOffersByRecommendationScore } from "./sortOffersByRecommendationScore";
-import type { BaseOffer } from "../capabilities/offer-catalog/src";
-
-const MAX_OFFERS_TO_DISPLAY = 3;
-
-/**
- * Sorts the offers based on the layout.
- *
- * @param offers - The offers to sort.
- * @returns The sorted offers.
- */
-export const sortFixedOffers = (offers: BaseOffer[]): BaseOffer[] => {
-	const resultOffers = Array.from(
-		{
-			length:
-				offers.length >= MAX_OFFERS_TO_DISPLAY
-					? MAX_OFFERS_TO_DISPLAY
-					: offers.length,
-		},
-		(_, index) => offers[index % offers.length]
-	).filter((offer): offer is BaseOffer => offer !== undefined);
-
-	return resultOffers;
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export const getOffersByLayout = (layout: Layout) => (offers: BaseOffer[]) => {
-	return layout === "carousel"
-		? sortOffersByRecommendationScore(offers)
-		: sortFixedOffers(offers);
-};
-
-/**
- * Gets the offers based on the layout.
- *
- * @param layout - The layout to get the offers for.
- * @param offers - The offers to get.
- * @returns The offers.
- */
-export const getOffersBasedOnLayout =
-	(layout: Layout) => (offers: BaseOffer[]) => {
-		return pipe(offers, getOffersByLayout(layout));
-	};

package/src/utils/layouts.ts

@@ -1,22 +0,0 @@
-export const layouts = {
-	carousel: "carousel",
-	fixed: "fixed",
-} as const;
-
-export type Layout = keyof typeof layouts;
-
-/**
- * Get layout based on the provided layout
- * @param layout {string | null} layout
- * @returns {Layout} layout or default layout
- *
- * @example
- * getLayout('fixed') // 'fixed'
- * getLayout('invalidLayout') // 'carousel'
- * getLayout(null) // 'carousel'
- * getLayout('') // 'carousel'
- * getLayout('carousel') // 'carousel'
- */
-export const getLayout = (layout?: string): Layout => {
-	return layouts[layout as Layout] ?? layouts.carousel;
-};