@vendorflow/components 2.0.33 → 2.0.37

package/lib/components/InfiniteScroll/InfiniteScroll.js

@@ -77,14 +77,21 @@ var DefaultLoader = (0, react_2.forwardRef)(function (_a, ref) {
         (0, react_1.jsx)(material_1.CircularProgress, { size: "1.5rem", disableShrink: true })));
 });
 function useInfiniteScroll(_a) {
+    var _b, _c;
     var scrollParent = _a.scrollParent, scrollBody = _a.scrollBody, isLoading = _a.isLoading, isFetching = _a.isFetching, isReverse = _a.isReverse, hasNextPage = _a.hasNextPage, fetchNextPage = _a.fetchNextPage;
     var prevPosition = (0, react_2.useRef)();
     var observer = (0, react_2.useRef)();
+    var hasScrollbar = (0, react_2.useMemo)(function () {
+        if (scrollParent.current && scrollBody.current) {
+            return scrollBody.current.clientHeight > scrollParent.current.clientHeight;
+        }
+        return false;
+    }, [(_b = scrollParent.current) === null || _b === void 0 ? void 0 : _b.clientHeight, (_c = scrollBody.current) === null || _c === void 0 ? void 0 : _c.clientHeight]);
     (0, react_2.useEffect)(function () {
-        if (!isLoading) {
+        if (!isLoading && hasScrollbar) {
             scrollToStart();
         }
-    }, [isLoading]);
+    }, [isLoading, hasScrollbar]);
     function scrollToStart() {
         var _a;
         var scrollHeight = (scrollBody.current || { scrollHeight: 0 }).scrollHeight;
@@ -93,7 +100,7 @@ function useInfiniteScroll(_a) {
     }
     // this callback is used and fired based on the state of the element it is attached to
     return (0, react_2.useCallback)(function (node) {
-        if (isFetching) {
+        if (isLoading || isFetching) {
             return;
         }
         if (observer.current) {
@@ -120,6 +127,6 @@ function useInfiniteScroll(_a) {
             }
             observer.current.observe(node);
         }
-    }, [isFetching, isReverse, hasNextPage, fetchNextPage, scrollParent, scrollBody]);
+    }, [isLoading, isFetching, isReverse, hasNextPage, fetchNextPage, scrollParent, scrollBody]);
 }
 var templateObject_1, templateObject_2, templateObject_3, templateObject_4;

package/lib/components/material-ui/ChatInterface/ChatInterface.d.ts

@@ -15,7 +15,7 @@ export interface ChatInterfaceProps {
     submitting: boolean;
     placeholder?: string;
     hasNextPage?: boolean;
-    fetchNextPage?: () => Promise<void> | void;
+    fetchNextPage?: () => Promise<any> | any;
     /** Determines if the initial load is happening */
     isLoading: boolean;
     /** Determines if a data fetch is happening */

package/lib/components/material-ui/ChatInterface/ChatInterface.story.js

@@ -134,7 +134,7 @@ function ChatInterface() {
         setTimeout(function () {
             setMessages(__spreadArray(__spreadArray([], __read(messages), false), __read(generateMessagePage()), false));
             setFetching(false);
-        }, 2000);
+        }, 1000);
     }
     function handleSend(message) {
         setSubmitting(true);
@@ -154,7 +154,7 @@ function ChatInterface() {
             }, 500);
         });
     }
-    return ((0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        border: 1px solid #ededed;\n        height: 20rem;\n      "], ["\n        border: 1px solid #ededed;\n        height: 20rem;\n      "]))) },
+    return ((0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        border: 1px solid #ededed;\n        height: 40rem;\n      "], ["\n        border: 1px solid #ededed;\n        height: 40rem;\n      "]))) },
         (0, react_1.jsx)(ChatInterface_1.default, { userId: "user1", messages: messages, handleSend: handleSend, submitting: submitting, fetchNextPage: loadMore, hasNextPage: hasMore, isLoading: isLoading, isFetching: isFetching })));
 }
 exports.ChatInterface = ChatInterface;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendorflow/components",
-  "version": "2.0.33",
+  "version": "2.0.37",
   "description": "React components for vendorflow",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",