stream-chat-react-native-core 5.11.1 → 5.11.2

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

@@ -278,6 +278,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
   (0, _react.useEffect)(function () {
     setAutoscrollToTop(hasNoMoreRecentMessagesToLoad);
   }, [messageList, hasNoMoreRecentMessagesToLoad]);
+  var shouldApplyAndroidWorkaround = inverted && _reactNative.Platform.OS === 'android';
   var renderItem = function renderItem(_ref2) {
     var _message$user;
     var index = _ref2.index,
@@ -291,7 +292,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       return _react["default"].createElement(_react["default"].Fragment, {
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 551,
+          lineNumber: 553,
           columnNumber: 9
         }
       }, _react["default"].createElement(_reactNative.View, {
@@ -299,7 +300,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 552,
+          lineNumber: 554,
           columnNumber: 11
         }
       }, _react["default"].createElement(MessageSystem, {
@@ -308,14 +309,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 553,
+          lineNumber: 555,
           columnNumber: 13
         }
       })), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
         __self: _this,
         __source: {
           fileName: _jsxFileName,
-          lineNumber: 555,
+          lineNumber: 557,
           columnNumber: 43
         }
       }));
@@ -324,15 +325,23 @@ var MessageListWithContext = function MessageListWithContext(props) {
     return wrapMessageInTheme ? _react["default"].createElement(_react["default"].Fragment, {
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 562,
+        lineNumber: 564,
         columnNumber: 7
       }
-    }, _react["default"].createElement(_ThemeContext.ThemeProvider, {
+    }, shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
+      date: message.dateSeparator,
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 567,
+        columnNumber: 36
+      }
+    }), _react["default"].createElement(_ThemeContext.ThemeProvider, {
       mergedStyle: modifiedTheme,
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 563,
+        lineNumber: 568,
         columnNumber: 9
       }
     }, _react["default"].createElement(_reactNative.View, {
@@ -340,7 +349,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 564,
+        lineNumber: 569,
         columnNumber: 11
       }
     }, _react["default"].createElement(Message, {
@@ -356,28 +365,28 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 565,
+        lineNumber: 570,
         columnNumber: 13
       }
-    }))), (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
+    }))), !shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
       date: message.dateSeparator,
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 581,
-        columnNumber: 11
+        lineNumber: 587,
+        columnNumber: 36
       }
     }), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 584,
+        lineNumber: 589,
         columnNumber: 41
       }
     })) : _react["default"].createElement(_react["default"].Fragment, {
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 587,
+        lineNumber: 592,
         columnNumber: 7
       }
     }, _react["default"].createElement(_reactNative.View, {
@@ -385,10 +394,18 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 588,
+        lineNumber: 593,
         columnNumber: 9
       }
-    }, _react["default"].createElement(Message, {
+    }, shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
+      date: message.dateSeparator,
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 596,
+        columnNumber: 38
+      }
+    }), _react["default"].createElement(Message, {
       goToMessage: goToMessage,
       groupStyles: (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) ? message.groupStyles : [],
       isTargetedMessage: targetedMessage === message.id,
@@ -401,22 +418,22 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 589,
+        lineNumber: 597,
         columnNumber: 11
       }
-    })), (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
+    })), !shouldApplyAndroidWorkaround && (0, _useMessageList.isMessageWithStylesReadByAndDateSeparator)(message) && message.dateSeparator && _react["default"].createElement(InlineDateSeparator, {
       date: message.dateSeparator,
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 608,
-        columnNumber: 11
+        lineNumber: 617,
+        columnNumber: 36
       }
     }), insertInlineUnreadIndicator && _react["default"].createElement(InlineUnreadIndicator, {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 611,
+        lineNumber: 619,
         columnNumber: 41
       }
     }));
@@ -704,7 +721,6 @@ var MessageListWithContext = function MessageListWithContext(props) {
       data: messageList
     });
   }
-  var shouldApplyAndroidWorkaround = inverted && _reactNative.Platform.OS === 'android' && _reactNative.Platform.Version >= 33;
   var renderListEmptyComponent = (0, _react.useCallback)(function () {
     return _react["default"].createElement(_reactNative.View, {
       style: [styles.flex, shouldApplyAndroidWorkaround ? styles.invertAndroid : styles.invert],
@@ -712,7 +728,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 964,
+        lineNumber: 969,
         columnNumber: 7
       }
     }, _react["default"].createElement(EmptyStateIndicator, {
@@ -720,11 +736,47 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 968,
+        lineNumber: 973,
         columnNumber: 9
       }
     }));
   }, [EmptyStateIndicator, shouldApplyAndroidWorkaround]);
+  var ListFooterComponent = (0, _react.useCallback)(function () {
+    return _react["default"].createElement(_reactNative.View, {
+      style: shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined,
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 981,
+        columnNumber: 7
+      }
+    }, _react["default"].createElement(FooterComponent, {
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 982,
+        columnNumber: 9
+      }
+    }));
+  }, [shouldApplyAndroidWorkaround, FooterComponent]);
+  var ListHeaderComponent = (0, _react.useCallback)(function () {
+    return _react["default"].createElement(_reactNative.View, {
+      style: shouldApplyAndroidWorkaround ? styles.invertAndroid : undefined,
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 990,
+        columnNumber: 7
+      }
+    }, _react["default"].createElement(HeaderComponent, {
+      __self: _this,
+      __source: {
+        fileName: _jsxFileName,
+        lineNumber: 991,
+        columnNumber: 9
+      }
+    }));
+  }, [shouldApplyAndroidWorkaround, HeaderComponent]);
   if (!FlatList) return null;
   if (loading) {
     return _react["default"].createElement(_reactNative.View, {
@@ -732,7 +784,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 978,
+        lineNumber: 1001,
         columnNumber: 7
       }
     }, _react["default"].createElement(LoadingIndicator, {
@@ -740,7 +792,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 979,
+        lineNumber: 1002,
         columnNumber: 9
       }
     }));
@@ -752,7 +804,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 986,
+        lineNumber: 1009,
         columnNumber: 30
       }
     });
@@ -761,7 +813,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 987,
+        lineNumber: 1010,
         columnNumber: 46
       }
     });
@@ -775,7 +827,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 992,
+      lineNumber: 1015,
       columnNumber: 5
     }
   }, _react["default"].createElement(FlatList, (0, _extends2["default"])({
@@ -787,8 +839,8 @@ var MessageListWithContext = function MessageListWithContext(props) {
     keyboardShouldPersistTaps: "handled",
     keyExtractor: keyExtractor,
     ListEmptyComponent: renderListEmptyComponent,
-    ListFooterComponent: FooterComponent,
-    ListHeaderComponent: HeaderComponent,
+    ListFooterComponent: ListFooterComponent,
+    ListHeaderComponent: ListHeaderComponent,
     maintainVisibleContentPosition: {
       autoscrollToTopThreshold: autoscrollToTop ? 10 : undefined,
       minIndexForVisible: 1
@@ -811,13 +863,13 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 996,
+      lineNumber: 1019,
       columnNumber: 7
     }
   })), !loading && _react["default"].createElement(_react["default"].Fragment, {
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1035,
+      lineNumber: 1058,
       columnNumber: 9
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -825,28 +877,28 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1036,
+      lineNumber: 1059,
       columnNumber: 11
     }
   }, _react["default"].createElement(StickyHeaderComponent, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1037,
+      lineNumber: 1060,
       columnNumber: 13
     }
   })), !disableTypingIndicator && TypingIndicator && _react["default"].createElement(TypingIndicatorContainer, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1040,
+      lineNumber: 1063,
       columnNumber: 13
     }
   }, _react["default"].createElement(TypingIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1041,
+      lineNumber: 1064,
       columnNumber: 15
     }
   })), _react["default"].createElement(ScrollToBottomButton, {
@@ -856,14 +908,14 @@ var MessageListWithContext = function MessageListWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1044,
+      lineNumber: 1067,
       columnNumber: 11
     }
   })), _react["default"].createElement(NetworkDownIndicator, {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1051,
+      lineNumber: 1074,
       columnNumber: 7
     }
   }));
@@ -970,7 +1022,7 @@ var MessageList = function MessageList(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 1109,
+      lineNumber: 1132,
       columnNumber: 5
     }
   }));