stream-chat-react-native-core 5.22.2-beta.4 → 5.22.2-beta.6

package/lib/module/components/MessageList/MessageList.js

@@ -182,6 +182,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
   var channelResyncScrollSet = (0, _react.useRef)(true);
   var scrollToDebounceTimeoutRef = (0, _react.useRef)();
   var initialScrollSettingTimeoutRef = (0, _react.useRef)();
+  var tempDisablePaginationTrackersTimeoutRef = (0, _react.useRef)();
   var messageIdToScrollToRef = (0, _react.useRef)();
   var messageIdLastScrolledToRef = (0, _react.useRef)();
   var _useState5 = (0, _react.useState)(false),
@@ -227,6 +228,15 @@ var MessageListWithContext = function MessageListWithContext(props) {
     onStartReachedTracker.current = {};
     onEndReachedTracker.current = {};
   });
+  var tempDisablePaginationTrackersRef = (0, _react.useRef)(function (messageListLength) {
+    clearTimeout(tempDisablePaginationTrackersTimeoutRef.current);
+    onStartReachedTracker.current[messageListLength] = true;
+    onEndReachedTracker.current[messageListLength] = true;
+    tempDisablePaginationTrackersTimeoutRef.current = setTimeout(function () {
+      onStartReachedTracker.current[messageListLength] = false;
+      onEndReachedTracker.current[messageListLength] = false;
+    }, 1000);
+  });
   (0, _react.useEffect)(function () {
     setScrollToBottomButtonVisible(false);
   }, [disabled]);
@@ -314,7 +324,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 563,
+          lineNumber: 584,
           columnNumber: 11
         }
       }, _react["default"].createElement(MessageSystem, {
@@ -325,14 +335,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 564,
+          lineNumber: 585,
           columnNumber: 13
         }
       })), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 569,
+          lineNumber: 590,
           columnNumber: 43
         }
       }));
@@ -343,7 +353,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 579,
+        lineNumber: 600,
         columnNumber: 36
       }
     }), _react["default"].createElement(_ThemeContext.ThemeProvider, {
@@ -351,7 +361,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 580,
+        lineNumber: 601,
         columnNumber: 9
       }
     }, _react["default"].createElement(_reactNative.View, {
@@ -359,7 +369,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 581,
+        lineNumber: 602,
         columnNumber: 11
       }
     }, _react["default"].createElement(Message, {
@@ -377,7 +387,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 582,
+        lineNumber: 603,
         columnNumber: 13
       }
     }))), !shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
@@ -385,14 +395,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 599,
+        lineNumber: 620,
         columnNumber: 36
       }
     }), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 601,
+        lineNumber: 622,
         columnNumber: 41
       }
     })) : _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_reactNative.View, {
@@ -400,7 +410,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 605,
+        lineNumber: 626,
         columnNumber: 9
       }
     }, shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
@@ -408,7 +418,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 608,
+        lineNumber: 629,
         columnNumber: 38
       }
     }), _react["default"].createElement(Message, {
@@ -426,7 +436,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 609,
+        lineNumber: 630,
         columnNumber: 11
       }
     })), !shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
@@ -434,14 +444,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 629,
+        lineNumber: 650,
         columnNumber: 36
       }
     }), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 631,
+        lineNumber: 652,
         columnNumber: 41
       }
     }));
@@ -606,26 +616,30 @@ var MessageListWithContext = function MessageListWithContext(props) {
   var scrollToIndexFailedRetryCountRef = (0, _react.useRef)(0);
   var failScrollTimeoutId = (0, _react.useRef)();
   var onScrollToIndexFailedRef = (0, _react.useRef)(function (info) {
+    var _flatListRef$current$, _flatListRef$current$2;
     if (!flatListRef.current) return;
+    var dataLength = (_flatListRef$current$ = flatListRef.current.props) == null ? void 0 : (_flatListRef$current$2 = _flatListRef$current$.data) == null ? void 0 : _flatListRef$current$2.length;
+    if (dataLength) {
+      tempDisablePaginationTrackersRef.current(dataLength);
+    }
     flatListRef.current.scrollToOffset({
       animated: false,
       offset: info.averageItemLength * info.index
     });
-    var targetAgain = function targetAgain() {
-      if (messageIdLastScrolledToRef.current) {
-        setTargetedMessage(messageIdLastScrolledToRef.current);
-      }
-    };
-    targetAgain();
     failScrollTimeoutId.current = setTimeout(function () {
       try {
         var _flatListRef$current2;
+        if (dataLength) {
+          tempDisablePaginationTrackersRef.current(dataLength);
+        }
         (_flatListRef$current2 = flatListRef.current) == null ? void 0 : _flatListRef$current2.scrollToIndex({
           animated: false,
           index: info.index,
           viewPosition: 0.5
         });
-        targetAgain();
+        if (messageIdLastScrolledToRef.current) {
+          setTargetedMessage(messageIdLastScrolledToRef.current);
+        }
         scrollToIndexFailedRetryCountRef.current = 0;
       } catch (e) {
         if (!onScrollToIndexFailedRef.current || scrollToIndexFailedRetryCountRef.current > MAX_RETRIES_AFTER_SCROLL_FAILURE) {
@@ -645,6 +659,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     if (indexOfParentInMessageList !== -1 && flatListRef.current) {
       clearTimeout(failScrollTimeoutId.current);
       scrollToIndexFailedRetryCountRef.current = 0;
+      tempDisablePaginationTrackersRef.current(messageList.length);
       flatListRef.current.scrollToIndex({
         animated: true,
         index: indexOfParentInMessageList,
@@ -663,6 +678,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
   (0, _react.useEffect)(function () {
     scrollToDebounceTimeoutRef.current = setTimeout(function () {
       if (initialScrollToFirstUnreadMessage) {
+        clearTimeout(initialScrollSettingTimeoutRef.current);
         initialScrollSettingTimeoutRef.current = setTimeout(function () {
           setInitialScrollDone(true);
         }, 500);
@@ -676,7 +692,9 @@ var MessageListWithContext = function MessageListWithContext(props) {
         return (message == null ? void 0 : message.id) === messageIdToScroll;
       });
       if (indexOfParentInMessageList !== -1 && flatListRef.current) {
+        clearTimeout(scrollToDebounceTimeoutRef.current);
         clearTimeout(failScrollTimeoutId.current);
+        tempDisablePaginationTrackersRef.current(messageList.length);
         scrollToIndexFailedRetryCountRef.current = 0;
         flatListRef.current.scrollToIndex({
           animated: false,
@@ -753,7 +771,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1028,
+        lineNumber: 1063,
         columnNumber: 7
       }
     }, _react["default"].createElement(EmptyStateIndicator, {
@@ -761,7 +779,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1032,
+        lineNumber: 1067,
         columnNumber: 9
       }
     }));
@@ -772,14 +790,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1040,
+        lineNumber: 1075,
         columnNumber: 7
       }
     }, _react["default"].createElement(FooterComponent, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1041,
+        lineNumber: 1076,
         columnNumber: 9
       }
     }));
@@ -790,14 +808,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1049,
+        lineNumber: 1084,
         columnNumber: 7
       }
     }, _react["default"].createElement(HeaderComponent, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1050,
+        lineNumber: 1085,
         columnNumber: 9
       }
     }));
@@ -809,7 +827,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1060,
+        lineNumber: 1095,
         columnNumber: 7
       }
     }, _react["default"].createElement(LoadingIndicator, {
@@ -817,7 +835,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1061,
+        lineNumber: 1096,
         columnNumber: 9
       }
     }));
@@ -829,7 +847,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1068,
+        lineNumber: 1103,
         columnNumber: 30
       }
     });
@@ -838,7 +856,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 1069,
+        lineNumber: 1104,
         columnNumber: 46
       }
     });
@@ -859,7 +877,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1085,
+      lineNumber: 1120,
       columnNumber: 5
     }
   }, _react["default"].createElement(FlatList, (0, _extends2["default"])({
@@ -895,7 +913,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1089,
+      lineNumber: 1124,
       columnNumber: 7
     }
   })), !loading && _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement(_reactNative.View, {
@@ -903,28 +921,28 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1134,
+      lineNumber: 1169,
       columnNumber: 11
     }
   }, _react["default"].createElement(StickyHeaderComponent, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1135,
+      lineNumber: 1170,
       columnNumber: 13
     }
   })), !disableTypingIndicator && TypingIndicator && _react["default"].createElement(TypingIndicatorContainer, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1138,
+      lineNumber: 1173,
       columnNumber: 13
     }
   }, _react["default"].createElement(TypingIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1139,
+      lineNumber: 1174,
       columnNumber: 15
     }
   })), _react["default"].createElement(ScrollToBottomButton, {
@@ -934,14 +952,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1142,
+      lineNumber: 1177,
       columnNumber: 11
     }
   })), _react["default"].createElement(NetworkDownIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1149,
+      lineNumber: 1184,
       columnNumber: 7
     }
   }));
@@ -1048,7 +1066,7 @@ var MessageList = function MessageList(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1207,
+      lineNumber: 1242,
       columnNumber: 5
     }
   }));