@tap-payments/os-micro-frontend-shared 0.0.309 → 0.0.311

package/build/components/ScrollLoader/ScrollLoader.d.ts

@@ -5,6 +5,7 @@ export type ScrollLoaderProps<IRootProps extends object = StackProps> = PropsWit
     loadMoreItems: () => Promise<unknown>;
     loading?: boolean;
     hasMore?: boolean;
+    isFetchingNextPage: boolean;
 }>;
 declare const ScrollLoader: <IRootProps extends object = StackProps>(props: ScrollLoaderProps<IRootProps>) => import("react/jsx-runtime").JSX.Element;
 export default ScrollLoader;

package/build/components/ScrollLoader/ScrollLoader.js

@@ -19,20 +19,24 @@ const isNearBottom = (el, offset = OFFSET) => {
     return scrollHeight - scrollBottom <= offset;
 };
 const ScrollLoader = (props) => {
-    const { component = Stack, loadMoreItems, hasMore, loading, children } = props, rootProps = __rest(props, ["component", "loadMoreItems", "hasMore", "loading", "children"]);
+    const { component = Stack, loadMoreItems, hasMore, loading, isFetchingNextPage, children } = props, rootProps = __rest(props, ["component", "loadMoreItems", "hasMore", "loading", "isFetchingNextPage", "children"]);
     const [initialChecked, setInitialChecked] = useState(false);
     const loadMoreItemsRef = useRef(loadMoreItems);
     const containerRef = useRef(null);
     loadMoreItemsRef.current = loadMoreItems;
     const Component = component;
+    const fetchMoreData = useCallback(() => {
+        if (hasMore && !isFetchingNextPage)
+            loadMoreItemsRef.current();
+    }, [hasMore, isFetchingNextPage]);
     const handleScroll = useCallback(() => {
         const el = containerRef.current;
-        if (!el || loading || !hasMore)
+        if (!el)
             return;
         const isBottom = isNearBottom(el);
         if (isBottom)
-            loadMoreItemsRef.current();
-    }, [loading, hasMore]);
+            fetchMoreData();
+    }, [fetchMoreData]);
     useEffect(() => {
         const el = containerRef.current;
         if (!el)
@@ -42,19 +46,19 @@ const ScrollLoader = (props) => {
     }, [handleScroll]);
     useEffect(() => {
         const el = containerRef.current;
-        if (!el || loading)
+        if (!el || loading || initialChecked)
             return;
         const timeout = setTimeout(() => {
+            setInitialChecked(true);
             const isBottom = isNearBottom(el);
-            if (isBottom && !initialChecked) {
-                loadMoreItemsRef.current();
-                setInitialChecked(true);
+            if (isBottom) {
+                fetchMoreData();
             }
-        }, 2000);
+        }, 1000);
         return () => {
             clearTimeout(timeout);
         };
-    }, [loading, initialChecked]);
+    }, [loading, fetchMoreData, initialChecked]);
     return (_jsx(Component, Object.assign({ overflow: "auto", ref: containerRef, style: {
             overflow: 'auto',
             height: '100%',

package/build/types/analytics.d.ts

@@ -29,5 +29,8 @@ export declare enum ChargeBreakDownType {
     PaymentCurrency = "PAYMENT_CURRENCY",
     PaymentScheme = "PAYMENT_SCHEME",
     PaymentType = "PAYMENT_TYPE",
-    PaymentLocation = "PAYMENT_LOCATION"
+    PaymentLocation = "PAYMENT_LOCATION",
+    PaymentIssuer = "PAYMENT_ISSUER",
+    PaymentAcquirer = "PAYMENT_ACQUIRER",
+    PaymentGateway = "PAYMENT_GATEWAY"
 }

package/build/types/analytics.js

@@ -5,4 +5,7 @@ export var ChargeBreakDownType;
     ChargeBreakDownType["PaymentScheme"] = "PAYMENT_SCHEME";
     ChargeBreakDownType["PaymentType"] = "PAYMENT_TYPE";
     ChargeBreakDownType["PaymentLocation"] = "PAYMENT_LOCATION";
+    ChargeBreakDownType["PaymentIssuer"] = "PAYMENT_ISSUER";
+    ChargeBreakDownType["PaymentAcquirer"] = "PAYMENT_ACQUIRER";
+    ChargeBreakDownType["PaymentGateway"] = "PAYMENT_GATEWAY";
 })(ChargeBreakDownType || (ChargeBreakDownType = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.0.309",
+  "version": "0.0.311",
   "testVersion": 0,
   "type": "module",
   "main": "build/index.js",