@vendorflow/components 2.0.40 → 2.0.44

package/lib/components/InfiniteScroll/InfiniteScroll.js

@@ -77,27 +77,45 @@ 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 _b, _c, _d, _e;
     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 _d = __read((0, react_2.useState)(false), 2), isScrollInit = _d[0], setScrollInit = _d[1];
+    var _f = __read((0, react_2.useState)(false), 2), isScrollInit = _f[0], setScrollInit = _f[1];
+    var _g = __read((0, react_2.useState)(false), 2), isScrollLoad = _g[0], setScrollLoad = _g[1];
     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]);
+    // Ensures that when the chat initializes, it will scroll to the bottom
     (0, react_2.useEffect)(function () {
-        var _a, _b;
         if (!isLoading && hasScrollbar) {
-            console.log('scrolling to start!');
-            console.log('scroll parent height: ', (_a = scrollParent.current) === null || _a === void 0 ? void 0 : _a.clientHeight);
-            console.log('scroll body height: ', (_b = scrollBody.current) === null || _b === void 0 ? void 0 : _b.clientHeight);
             prevPosition.current = null;
+            setScrollLoad(false);
             scrollToStart();
         }
     }, [isLoading, hasScrollbar]);
+    // If a fetch happens that was not started by a scroll action (aka fetchNextPage),
+    // then this will track the prevPosition
+    (0, react_2.useEffect)(function () {
+        if (!isScrollLoad && scrollBody.current && isFetching) {
+            prevPosition.current = scrollBody.current.clientHeight;
+        }
+    }, [isFetching, isScrollLoad, (_d = scrollBody.current) === null || _d === void 0 ? void 0 : _d.clientHeight]);
+    // This will potentially scroll the page to the start when the page loads new data that did not
+    // originate from a fetchNextPage action
+    (0, react_2.useEffect)(function () {
+        if (!isScrollLoad &&
+            isReverse &&
+            scrollBody.current &&
+            prevPosition.current != null &&
+            scrollBody.current.clientHeight - prevPosition.current <= 200) {
+            prevPosition.current = null;
+            scrollToStart();
+        }
+    }, [isScrollLoad, (_e = scrollBody.current) === null || _e === void 0 ? void 0 : _e.clientHeight]);
     function scrollToStart() {
         var _a;
         var scrollHeight = (scrollBody.current || { scrollHeight: 0 }).scrollHeight;
@@ -118,24 +136,24 @@ function useInfiniteScroll(_a) {
                 if (scrollBody.current && isReverse && isScrollInit) {
                     // save the last element, so that we can scroll to it after the new data loads in
                     prevPosition.current = scrollBody.current.clientHeight;
-                    console.log('saving prev position: ', prevPosition.current);
                 }
                 // load the next page
                 fetchNextPage();
+                setScrollLoad(true);
             }
         }, {
             root: (scrollParent === null || scrollParent === void 0 ? void 0 : scrollParent.current) || null,
             threshold: 1.0,
         });
         if (node) {
-            if (isReverse && scrollParent.current && prevPosition.current != null) {
-                console.log('scrolling to prev position: ', prevPosition.current);
+            if (isReverse && scrollParent.current && prevPosition.current != null && isScrollLoad) {
                 // If we had a prev position, then we want to scroll to it
                 scrollParent.current.scrollTo(0, scrollBody.current.clientHeight - prevPosition.current);
                 prevPosition.current = null;
+                setScrollLoad(false);
             }
             observer.current.observe(node);
         }
-    }, [isLoading, isFetching, isReverse, hasNextPage, fetchNextPage, scrollParent, scrollBody, isScrollInit]);
+    }, [isLoading, isFetching, isReverse, hasNextPage, fetchNextPage, scrollParent, scrollBody, isScrollInit, isScrollLoad]);
 }
 var templateObject_1, templateObject_2, templateObject_3, templateObject_4;

package/lib/components/index.d.ts

@@ -10,5 +10,4 @@ export { default as InputCheckboxGroup } from './material-ui/InputCheckboxGroup'
 export { default as InputRadioGroup } from './material-ui/InputRadioGroup';
 export { default as InputSearchDropdown } from './material-ui/InputSearchDropdown';
 export { default as InputTime } from './material-ui/InputTime';
-export { default as InfiniteScroll } from './InfiniteScroll';
 export { default as Modal } from './material-ui/Modal';

package/lib/components/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Modal = exports.InfiniteScroll = exports.InputTime = exports.InputSearchDropdown = exports.InputRadioGroup = exports.InputCheckboxGroup = exports.InputGroup = exports.InputDateTime = exports.InputDate = exports.DataTable = exports.ColorPicker = exports.ChatInterface = exports.ButtonMenu = exports.Button = void 0;
+exports.Modal = exports.InputTime = exports.InputSearchDropdown = exports.InputRadioGroup = exports.InputCheckboxGroup = exports.InputGroup = exports.InputDateTime = exports.InputDate = exports.DataTable = exports.ColorPicker = exports.ChatInterface = exports.ButtonMenu = exports.Button = void 0;
 var Button_1 = require("./material-ui/Button");
 Object.defineProperty(exports, "Button", { enumerable: true, get: function () { return __importDefault(Button_1).default; } });
 var ButtonMenu_1 = require("./material-ui/ButtonMenu");
@@ -28,7 +28,5 @@ var InputSearchDropdown_1 = require("./material-ui/InputSearchDropdown");
 Object.defineProperty(exports, "InputSearchDropdown", { enumerable: true, get: function () { return __importDefault(InputSearchDropdown_1).default; } });
 var InputTime_1 = require("./material-ui/InputTime");
 Object.defineProperty(exports, "InputTime", { enumerable: true, get: function () { return __importDefault(InputTime_1).default; } });
-var InfiniteScroll_1 = require("./InfiniteScroll");
-Object.defineProperty(exports, "InfiniteScroll", { enumerable: true, get: function () { return __importDefault(InfiniteScroll_1).default; } });
 var Modal_1 = require("./material-ui/Modal");
 Object.defineProperty(exports, "Modal", { enumerable: true, get: function () { return __importDefault(Modal_1).default; } });

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

@@ -12,7 +12,6 @@ export interface ChatInterfaceProps {
     handleSend: (message: string) => Promise<boolean>;
     className?: string;
     style?: any;
-    submitting: boolean;
     placeholder?: string;
     hasNextPage?: boolean;
     fetchNextPage?: () => Promise<any> | any;
@@ -20,6 +19,8 @@ export interface ChatInterfaceProps {
     isLoading: boolean;
     /** Determines if a data fetch is happening */
     isFetching: boolean;
+    /** Determines if a message submission is happening */
+    isSubmitting: boolean;
     colors?: {
         user: string;
         others: string;
@@ -27,4 +28,4 @@ export interface ChatInterfaceProps {
     /** Needs to take a ref that is used to determine the height of the input component */
     renderInputComponent?: (ref: Ref<HTMLDivElement>) => ReactNode;
 }
-export default function ChatInterface({ userId, messages, fetchNextPage, handleSend, hasNextPage, className, style, submitting, placeholder, isLoading, isFetching, colors, renderInputComponent, }: ChatInterfaceProps): JSX.Element;
+export default function ChatInterface({ userId, messages, fetchNextPage, handleSend, hasNextPage, className, style, isSubmitting, placeholder, isLoading, isFetching, colors, renderInputComponent, }: ChatInterfaceProps): JSX.Element;

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

@@ -67,7 +67,7 @@ var react_measure_1 = __importDefault(require("react-measure"));
 var MessageInput_1 = __importDefault(require("./MessageInput"));
 var MessageThread_1 = __importDefault(require("./MessageThread"));
 function ChatInterface(_a) {
-    var userId = _a.userId, messages = _a.messages, fetchNextPage = _a.fetchNextPage, handleSend = _a.handleSend, hasNextPage = _a.hasNextPage, className = _a.className, style = _a.style, submitting = _a.submitting, placeholder = _a.placeholder, isLoading = _a.isLoading, isFetching = _a.isFetching, colors = _a.colors, renderInputComponent = _a.renderInputComponent;
+    var userId = _a.userId, messages = _a.messages, fetchNextPage = _a.fetchNextPage, handleSend = _a.handleSend, hasNextPage = _a.hasNextPage, className = _a.className, style = _a.style, isSubmitting = _a.isSubmitting, placeholder = _a.placeholder, isLoading = _a.isLoading, isFetching = _a.isFetching, colors = _a.colors, renderInputComponent = _a.renderInputComponent;
     var _b = __read((0, react_2.useState)(''), 2), message = _b[0], setMessage = _b[1];
     var _c = __read((0, react_2.useState)(-1), 2), inputHeight = _c[0], setInputHeight = _c[1];
     function handleClickSend() {
@@ -101,8 +101,8 @@ function ChatInterface(_a) {
             } }, function (_a) {
             var measureRef = _a.measureRef;
             return ((0, react_1.jsx)(react_2.Fragment, null,
-                (0, react_1.jsx)(MessageThread_1.default, { userId: userId, messages: messages, inputHeight: inputHeight, hasNextPage: hasNextPage, fetchNextPage: fetchNextPage, isLoading: isLoading, isFetching: isFetching, colors: colors }),
-                renderInputComponent ? (renderInputComponent(measureRef)) : ((0, react_1.jsx)(MessageInput_1.default, { ref: measureRef, handleClickSend: handleClickSend, message: message, setMessage: setMessage, submitting: submitting, placeholder: placeholder }))));
+                (0, react_1.jsx)(MessageThread_1.default, { userId: userId, messages: messages, inputHeight: inputHeight, hasNextPage: hasNextPage, fetchNextPage: fetchNextPage, isLoading: isLoading, isFetching: isFetching, isSubmitting: isSubmitting, colors: colors }),
+                renderInputComponent ? (renderInputComponent(measureRef)) : ((0, react_1.jsx)(MessageInput_1.default, { ref: measureRef, handleClickSend: handleClickSend, message: message, setMessage: setMessage, isSubmitting: isSubmitting, placeholder: placeholder }))));
         })));
 }
 exports.default = ChatInterface;

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

@@ -44,7 +44,7 @@ var ChatInterface_1 = __importDefault(require("./ChatInterface"));
 function ChatInterface() {
     var _a = __read((0, react_2.useState)(true), 2), isLoading = _a[0], setLoading = _a[1];
     var _b = __read((0, react_2.useState)(true), 2), isFetching = _b[0], setFetching = _b[1];
-    var _c = __read((0, react_2.useState)(false), 2), submitting = _c[0], setSubmitting = _c[1];
+    var _c = __read((0, react_2.useState)(false), 2), isSubmitting = _c[0], setSubmitting = _c[1];
     var _d = __read((0, react_2.useState)([]), 2), messages = _d[0], setMessages = _d[1];
     var _e = __read((0, react_2.useState)(true), 2), hasMore = _e[0], setHasMore = _e[1];
     (0, react_2.useEffect)(function () {
@@ -80,15 +80,16 @@ function ChatInterface() {
     function generateMessagePage() {
         return new Array(10).fill(null).map(generateMessage);
     }
-    function loadMore() {
+    var fetchNextPage = (0, react_2.useCallback)(function () {
         setFetching(true);
         setTimeout(function () {
             setMessages(__spreadArray(__spreadArray([], __read(messages), false), __read(generateMessagePage()), false));
             setFetching(false);
         }, 100);
-    }
+    }, [messages, generateMessagePage, setMessages]);
     function handleSend(message) {
         setSubmitting(true);
+        setFetching(true);
         return new Promise(function (resolve) {
             setTimeout(function () {
                 setMessages(__spreadArray([
@@ -101,12 +102,13 @@ function ChatInterface() {
                     }
                 ], __read(messages), false));
                 setSubmitting(false);
+                setFetching(false);
                 resolve(true);
             }, 500);
         });
     }
-    return ((0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        border: 1px solid #ededed;\n        height: 50rem;\n      "], ["\n        border: 1px solid #ededed;\n        height: 50rem;\n      "]))) },
-        (0, react_1.jsx)(ChatInterface_1.default, { userId: "user1", messages: messages, handleSend: handleSend, submitting: submitting, fetchNextPage: loadMore, hasNextPage: hasMore, isLoading: isLoading, isFetching: isFetching })));
+    return ((0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        border: 1px solid #ededed;\n        height: 30rem;\n      "], ["\n        border: 1px solid #ededed;\n        height: 30rem;\n      "]))) },
+        (0, react_1.jsx)(ChatInterface_1.default, { userId: "user1", messages: messages, handleSend: handleSend, fetchNextPage: fetchNextPage, hasNextPage: hasMore, isLoading: isLoading, isFetching: isFetching, isSubmitting: isSubmitting })));
 }
 exports.ChatInterface = ChatInterface;
 var templateObject_1;

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

@@ -1,10 +1,9 @@
 import { Dispatch, SetStateAction } from 'react';
-interface Props {
+import { ChatInterfaceProps } from './ChatInterface';
+interface Props extends Pick<ChatInterfaceProps, 'isSubmitting' | 'placeholder'> {
     handleClickSend: () => Promise<void>;
     message: string;
-    placeholder?: string;
     setMessage: Dispatch<SetStateAction<string>>;
-    submitting: boolean;
 }
 declare const MessageInput: import("react").ForwardRefExoticComponent<Props & import("react").RefAttributes<HTMLDivElement>>;
 export default MessageInput;

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

@@ -15,7 +15,7 @@ var react_textarea_autosize_1 = __importDefault(require("react-textarea-autosize
 var material_1 = require("@mui/material");
 var icons_material_1 = require("@mui/icons-material");
 var MessageInput = (0, react_2.forwardRef)(function (_a, ref) {
-    var handleClickSend = _a.handleClickSend, message = _a.message, placeholder = _a.placeholder, setMessage = _a.setMessage, submitting = _a.submitting;
+    var handleClickSend = _a.handleClickSend, message = _a.message, placeholder = _a.placeholder, setMessage = _a.setMessage, isSubmitting = _a.isSubmitting;
     function handleOnChange(_a) {
         var value = _a.target.value;
         setMessage(value);
@@ -42,7 +42,7 @@ var MessageInput = (0, react_2.forwardRef)(function (_a, ref) {
                 var _a, _b;
                 return (0, react_1.css)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell',\n              'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;\n            -webkit-font-smoothing: antialiased;\n            -moz-osx-font-smoothing: grayscale;\n            resize: none;\n            width: calc(100% - 3.5rem);\n            outline: 0 none transparent;\n            font-size: 16px;\n            margin: 0.5rem;\n            padding: 0.5rem;\n            box-sizing: border-box;\n            border-radius: 5px;\n            border-color: ", ";\n          "], ["\n            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell',\n              'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;\n            -webkit-font-smoothing: antialiased;\n            -moz-osx-font-smoothing: grayscale;\n            resize: none;\n            width: calc(100% - 3.5rem);\n            outline: 0 none transparent;\n            font-size: 16px;\n            margin: 0.5rem;\n            padding: 0.5rem;\n            box-sizing: border-box;\n            border-radius: 5px;\n            border-color: ", ";\n          "])), ((_b = (_a = theme === null || theme === void 0 ? void 0 : theme.palette) === null || _a === void 0 ? void 0 : _a.primary) === null || _b === void 0 ? void 0 : _b.main) || 'hsl(0, 0%, 89%)');
             }, placeholder: placeholder || 'Type your message here...', value: message, onChange: handleOnChange, onKeyDown: handleOnKeyDown, minRows: 3, maxRows: 8 }),
-        (0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n            height: 2rem;\n            width: 2rem;\n            padding-right: ", ";\n          "], ["\n            height: 2rem;\n            width: 2rem;\n            padding-right: ", ";\n          "])), submitting ? '0.5rem' : '0.25rem') }, submitting ? ((0, react_1.jsx)(material_1.CircularProgress, { size: "2rem" })) : ((0, react_1.jsx)(material_1.IconButton, { css: (0, react_1.css)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n                height: 100%;\n                width: 100%;\n              "], ["\n                height: 100%;\n                width: 100%;\n              "]))), onClick: handleOnClickSend, disabled: submitting },
+        (0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n            height: 2rem;\n            width: 2rem;\n            padding-right: ", ";\n          "], ["\n            height: 2rem;\n            width: 2rem;\n            padding-right: ", ";\n          "])), isSubmitting ? '0.5rem' : '0.25rem') }, isSubmitting ? ((0, react_1.jsx)(material_1.CircularProgress, { size: "2rem" })) : ((0, react_1.jsx)(material_1.IconButton, { css: (0, react_1.css)(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n                height: 100%;\n                width: 100%;\n              "], ["\n                height: 100%;\n                width: 100%;\n              "]))), onClick: handleOnClickSend, disabled: isSubmitting },
             (0, react_1.jsx)(icons_material_1.Send, null))))));
 });
 exports.default = MessageInput;

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

@@ -1,6 +1,6 @@
 import { ChatInterfaceProps } from './ChatInterface';
-interface Props extends Pick<ChatInterfaceProps, 'userId' | 'messages' | 'hasNextPage' | 'fetchNextPage' | 'isLoading' | 'isFetching' | 'colors'> {
+interface Props extends Pick<ChatInterfaceProps, 'userId' | 'messages' | 'hasNextPage' | 'fetchNextPage' | 'isLoading' | 'isFetching' | 'isSubmitting' | 'colors'> {
     inputHeight: number;
 }
-export default function MessageThread({ userId, messages, inputHeight, hasNextPage, fetchNextPage, isLoading, isFetching, colors, }: Props): JSX.Element;
+export default function MessageThread({ userId, messages, inputHeight, hasNextPage, fetchNextPage, isLoading, isFetching, isSubmitting, colors, }: Props): JSX.Element;
 export {};

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

@@ -12,12 +12,108 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("@emotion/react");
 var react_2 = require("react");
 var MessageItem_1 = __importDefault(require("./MessageItem"));
-var InfiniteScroll_1 = __importDefault(require("../../InfiniteScroll/InfiniteScroll"));
+var lodash_1 = require("lodash");
+var material_1 = require("@mui/material");
 function MessageThread(_a) {
-    var userId = _a.userId, messages = _a.messages, inputHeight = _a.inputHeight, hasNextPage = _a.hasNextPage, fetchNextPage = _a.fetchNextPage, isLoading = _a.isLoading, isFetching = _a.isFetching, colors = _a.colors;
+    var _b;
+    var userId = _a.userId, messages = _a.messages, inputHeight = _a.inputHeight, hasNextPage = _a.hasNextPage, fetchNextPage = _a.fetchNextPage, isLoading = _a.isLoading, isFetching = _a.isFetching, isSubmitting = _a.isSubmitting, colors = _a.colors;
+    var isInitialized = (0, react_2.useRef)(false);
+    var isScrollLoad = (0, react_2.useRef)(false);
+    var hasSubmitted = (0, react_2.useRef)(false);
+    var prevScrollTop = (0, react_2.useRef)(null);
+    var prevScrollHeight = (0, react_2.useRef)(null);
+    var shouldScrollToPrevPosition = (0, react_2.useRef)(false);
     var scrollParent = (0, react_2.useRef)(null);
+    var handleScrollEvent = (0, react_2.useCallback)((0, lodash_1.debounce)(function (evt) {
+        var parent = evt.target;
+        if (parent.scrollTop === 0 && hasNextPage && fetchNextPage && !isLoading && !isFetching) {
+            isScrollLoad.current = true;
+            prevScrollHeight.current = parent.scrollHeight;
+            fetchNextPage();
+        }
+    }, 300), [hasNextPage, fetchNextPage, isLoading, isFetching]);
+    (0, react_2.useEffect)(function () {
+        if (isSubmitting) {
+            hasSubmitted.current = true;
+        }
+    }, [isSubmitting]);
+    // This will handle the initial loading of messages, then scroll to bottom
+    (0, react_2.useEffect)(function () {
+        if (!isInitialized.current && !isFetching && scrollParent.current) {
+            var _a = scrollParent.current, clientHeight = _a.clientHeight, scrollHeight = _a.scrollHeight;
+            if (clientHeight >= scrollHeight && hasNextPage && fetchNextPage) {
+                fetchNextPage();
+                return;
+            }
+            isInitialized.current = true;
+            scrollParent.current.scrollTo(0, scrollHeight - clientHeight);
+        }
+    }, [isFetching, isInitialized.current, hasNextPage, fetchNextPage]);
+    // Sets up the scroll event listener
+    (0, react_2.useEffect)(function () {
+        if (scrollParent.current) {
+            scrollParent.current.addEventListener('scroll', handleScrollEvent);
+        }
+        return function () {
+            if (scrollParent.current) {
+                scrollParent.current.removeEventListener('scroll', handleScrollEvent);
+            }
+        };
+    }, [scrollParent.current, hasNextPage, fetchNextPage, isLoading, isFetching]);
+    // Handles the scroll position adjustment after fetching the next page
+    (0, react_2.useEffect)(function () {
+        if (!isFetching &&
+            isInitialized.current &&
+            scrollParent.current &&
+            isScrollLoad.current &&
+            prevScrollHeight.current &&
+            scrollParent.current.scrollHeight !== prevScrollHeight.current) {
+            var delta = scrollParent.current.scrollHeight - prevScrollHeight.current;
+            scrollParent.current.scrollTo(0, delta);
+            isScrollLoad.current = false;
+            prevScrollHeight.current = 0;
+        }
+    }, [isFetching, prevScrollHeight.current]);
+    // Manages scroll position for data changes that are triggered from anything other than the scroll event
+    (0, react_2.useEffect)(function () {
+        var _a;
+        if (scrollParent.current && !isScrollLoad.current && isInitialized.current) {
+            var _b = scrollParent.current, scrollHeight = _b.scrollHeight, scrollTop = _b.scrollTop, clientHeight = _b.clientHeight;
+            if (isFetching) {
+                // track the current position
+                prevScrollHeight.current = scrollHeight;
+                prevScrollTop.current = scrollTop;
+                var distanceFromBottom = scrollHeight - scrollTop - clientHeight;
+                if (!isSubmitting && distanceFromBottom > 200) {
+                    shouldScrollToPrevPosition.current = true;
+                }
+            }
+            else {
+                // init to scroll to bottom delta
+                var delta = scrollHeight - clientHeight;
+                if (hasSubmitted.current) {
+                    // scroll to bottom if this was triggered by the current user's sent message
+                    (_a = scrollParent.current) === null || _a === void 0 ? void 0 : _a.scrollTo(0, delta);
+                }
+                else if (!isFetching && prevScrollHeight.current !== null && prevScrollTop.current !== null) {
+                    if (shouldScrollToPrevPosition.current) {
+                        delta = prevScrollTop.current;
+                    }
+                    scrollParent.current.scrollTo(0, delta);
+                }
+                // clean up
+                prevScrollHeight.current = null;
+                prevScrollTop.current = null;
+                hasSubmitted.current = false;
+                shouldScrollToPrevPosition.current = false;
+            }
+        }
+    }, [isFetching, (_b = scrollParent.current) === null || _b === void 0 ? void 0 : _b.scrollHeight]);
     return ((0, react_1.jsx)("div", { ref: scrollParent, css: (0, react_1.css)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        box-sizing: border-box;\n        height: calc(100% - ", "px);\n        width: 100%;\n        padding: 0.5rem 1rem;\n        overflow-y: auto;\n      "], ["\n        box-sizing: border-box;\n        height: calc(100% - ", "px);\n        width: 100%;\n        padding: 0.5rem 1rem;\n        overflow-y: auto;\n      "])), inputHeight) },
-        (0, react_1.jsx)(InfiniteScroll_1.default, { scrollParent: scrollParent, isReverse: true, isLoading: isLoading, isFetching: isFetching, hasNextPage: hasNextPage, fetchNextPage: fetchNextPage }, messages.map(function (message) { return ((0, react_1.jsx)(MessageItem_1.default, { key: "" + message.id, message: message, userId: userId, colors: colors })); }))));
+        (0, react_1.jsx)("div", { css: (0, react_1.css)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n          display: flex;\n          flex-direction: column-reverse;\n          justify-content: flex-start;\n          align-items: flex-start;\n        "], ["\n          display: flex;\n          flex-direction: column-reverse;\n          justify-content: flex-start;\n          align-items: flex-start;\n        "]))) },
+            messages.map(function (message) { return ((0, react_1.jsx)(MessageItem_1.default, { key: "" + message.id, message: message, userId: userId, colors: colors })); }),
+            hasNextPage && ((0, react_1.jsx)("div", { key: "loader", css: (0, react_1.css)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n              width: 100%;\n              margin: 0.5rem 0;\n              height: auto;\n              display: flex;\n              justify-content: center;\n              align-items: center;\n\n              && {\n                visibility: ", ";\n              }\n            "], ["\n              width: 100%;\n              margin: 0.5rem 0;\n              height: auto;\n              display: flex;\n              justify-content: center;\n              align-items: center;\n\n              && {\n                visibility: ", ";\n              }\n            "])), isFetching && isScrollLoad ? 'visible' : 'hidden') },
+                (0, react_1.jsx)(material_1.CircularProgress, { size: "1.5rem", disableShrink: true }))))));
 }
 exports.default = MessageThread;
-var templateObject_1;
+var templateObject_1, templateObject_2, templateObject_3;

package/package.json

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