stream-chat-react-native-core 9.3.1-beta.5 → 9.3.1-beta.6

package/lib/commonjs/components/MessageList/MessageList.js

@@ -38,12 +38,11 @@ var _useIncomingMessageAnnouncements = require("../Accessibility/hooks/useIncomi
 var _MessageWrapper = require("../Message/MessageItemView/MessageWrapper");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["contentContainerStyle", "style"];
-var _this = this,
-  _jsxFileName = "/home/runner/work/stream-chat-react-native/stream-chat-react-native/package/src/components/MessageList/MessageList.tsx";
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var _jsxFileName = "/home/runner/work/stream-chat-react-native/stream-chat-react-native/package/src/components/MessageList/MessageList.tsx";
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var WAIT_FOR_SCROLL_TIMEOUT = 0;
 var MAX_RETRIES_AFTER_SCROLL_FAILURE = 10;
-var useStyles = function useStyles() {
+var useStyles = () => {
   var _useTheme = (0, _ThemeContext.useTheme)(),
     _useTheme$theme = _useTheme.theme,
     semantics = _useTheme$theme.semantics,
@@ -55,45 +54,49 @@ var useStyles = function useStyles() {
     scrollToBottomButtonContainer = _useTheme$theme$messa.scrollToBottomButtonContainer,
     unreadMessagesNotificationContainer = _useTheme$theme$messa.unreadMessagesNotificationContainer;
   var backgroundCoreApp = semantics.backgroundCoreApp;
-  return (0, _react.useMemo)(function () {
-    return _reactNative.StyleSheet.create({
-      container: Object.assign({
-        flex: 1,
-        width: '100%',
-        backgroundColor: backgroundCoreApp
-      }, container),
-      contentContainer: Object.assign({
-        paddingBottom: 4
-      }, contentContainer),
-      flex: {
-        flex: 1,
-        backgroundColor: backgroundCoreApp
-      },
-      listContainer: Object.assign({
-        flex: 1,
-        width: '100%'
-      }, listContainer),
-      scrollToBottomButtonContainer: Object.assign({
-        position: 'absolute',
-        right: 16
-      }, scrollToBottomButtonContainer),
-      stickyHeaderContainer: Object.assign({
-        left: 0,
-        position: 'absolute',
-        right: 0,
-        top: _theme.primitives.spacingMd
-      }, stickyHeaderContainer),
-      unreadMessagesNotificationContainer: Object.assign({
-        position: 'absolute',
-        top: _theme.primitives.spacingMd,
-        left: 0,
-        right: 0,
-        alignItems: 'center'
-      }, unreadMessagesNotificationContainer)
-    });
-  }, [backgroundCoreApp, container, contentContainer, listContainer, scrollToBottomButtonContainer, stickyHeaderContainer, unreadMessagesNotificationContainer]);
+  return (0, _react.useMemo)(() => _reactNative.StyleSheet.create({
+    container: {
+      flex: 1,
+      width: '100%',
+      backgroundColor: backgroundCoreApp,
+      ...container
+    },
+    contentContainer: {
+      paddingBottom: 4,
+      ...contentContainer
+    },
+    flex: {
+      flex: 1,
+      backgroundColor: backgroundCoreApp
+    },
+    listContainer: {
+      flex: 1,
+      width: '100%',
+      ...listContainer
+    },
+    scrollToBottomButtonContainer: {
+      position: 'absolute',
+      right: 16,
+      ...scrollToBottomButtonContainer
+    },
+    stickyHeaderContainer: {
+      left: 0,
+      position: 'absolute',
+      right: 0,
+      top: _theme.primitives.spacingMd,
+      ...stickyHeaderContainer
+    },
+    unreadMessagesNotificationContainer: {
+      position: 'absolute',
+      top: _theme.primitives.spacingMd,
+      left: 0,
+      right: 0,
+      alignItems: 'center',
+      ...unreadMessagesNotificationContainer
+    }
+  }), [backgroundCoreApp, container, contentContainer, listContainer, scrollToBottomButtonContainer, stickyHeaderContainer, unreadMessagesNotificationContainer]);
 };
-var keyExtractor = function keyExtractor(derivedItem) {
+var keyExtractor = derivedItem => {
   var item = derivedItem.message;
   if (item.id) {
     return item.id;
@@ -106,18 +109,17 @@ var keyExtractor = function keyExtractor(derivedItem) {
 var flatListViewabilityConfig = {
   viewAreaCoveragePercentThreshold: 1
 };
-var hasReadLastMessage = function hasReadLastMessage(channel, userId) {
-  var _channel$state$latest, _channel$state$read$u;
-  var latestMessageIdInChannel = (_channel$state$latest = channel.state.latestMessages.slice(-1)[0]) == null ? void 0 : _channel$state$latest.id;
-  var lastReadMessageIdServer = (_channel$state$read$u = channel.state.read[userId]) == null ? void 0 : _channel$state$read$u.last_read_message_id;
+var hasReadLastMessage = (channel, userId) => {
+  var latestMessageIdInChannel = channel.state.latestMessages.slice(-1)[0]?.id;
+  var lastReadMessageIdServer = channel.state.read[userId]?.last_read_message_id;
   return latestMessageIdInChannel === lastReadMessageIdServer;
 };
-var getPreviousLastMessage = function getPreviousLastMessage(messages, newMessage) {
+var getPreviousLastMessage = (messages, newMessage) => {
   if (!newMessage) return;
   var previousLastMessage;
   for (var i = messages.length - 1; i >= 0; i--) {
     var msg = messages[i];
-    if (!(msg != null && msg.id)) break;
+    if (!msg?.id) break;
     if (msg.id !== newMessage.id) {
       previousLastMessage = msg;
       break;
@@ -125,13 +127,10 @@ var getPreviousLastMessage = function getPreviousLastMessage(messages, newMessag
   }
   return previousLastMessage;
 };
-var messageInputHeightStoreSelector = function messageInputHeightStoreSelector(state) {
-  return {
-    height: state.height
-  };
-};
-var MessageListWithContext = function MessageListWithContext(props) {
-  var _client$user, _client$user5;
+var messageInputHeightStoreSelector = state => ({
+  height: state.height
+});
+var MessageListWithContext = props => {
   var LoadingMoreRecentIndicator = props.threadList ? _InlineLoadingMoreRecentThreadIndicator.InlineLoadingMoreRecentThreadIndicator : _InlineLoadingMoreRecentIndicator.InlineLoadingMoreRecentIndicator;
   var _props$animateLayout = props.animateLayout,
     animateLayout = _props$animateLayout === void 0 ? true : _props$animateLayout,
@@ -198,29 +197,25 @@ var MessageListWithContext = function MessageListWithContext(props) {
   var _useStateStore = (0, _useStateStore2.useStateStore)(messageInputHeightStore.store, messageInputHeightStoreSelector),
     messageInputHeight = _useStateStore.height;
   (0, _useIncomingMessageAnnouncements.useIncomingMessageAnnouncements)({
-    activeThreadId: thread == null ? void 0 : thread.id,
-    channel: channel,
-    ownUserId: (_client$user = client.user) == null ? void 0 : _client$user.id,
-    threadList: threadList
+    activeThreadId: thread?.id,
+    channel,
+    ownUserId: client.user?.id,
+    threadList
   });
-  var myMessageThemeString = (0, _react.useMemo)(function () {
-    return JSON.stringify(myMessageTheme);
-  }, [myMessageTheme]);
-  var modifiedTheme = (0, _react.useMemo)(function () {
-    return (0, _ThemeContext.mergeThemes)({
-      style: myMessageTheme,
-      theme: theme
-    });
-  }, [myMessageThemeString, theme]);
+  var myMessageThemeString = (0, _react.useMemo)(() => JSON.stringify(myMessageTheme), [myMessageTheme]);
+  var modifiedTheme = (0, _react.useMemo)(() => (0, _ThemeContext.mergeThemes)({
+    style: myMessageTheme,
+    theme
+  }), [myMessageThemeString, theme]);
   var _useMessageList = (0, _useMessageList2.useMessageList)({
-      isLiveStreaming: isLiveStreaming,
-      threadList: threadList
+      isLiveStreaming,
+      threadList
     }),
     processedMessageList = _useMessageList.processedMessageList,
     rawMessageList = _useMessageList.rawMessageList,
     viewabilityChangedCallback = _useMessageList.viewabilityChangedCallback;
   var previousDerivedItemsRef = (0, _react.useRef)(undefined);
-  var processedMessageListWithNeighbors = (0, _react.useMemo)(function () {
+  var processedMessageListWithNeighbors = (0, _react.useMemo)(() => {
     if (!previousDerivedItemsRef.current) {
       previousDerivedItemsRef.current = new Map();
     }
@@ -230,8 +225,9 @@ var MessageListWithContext = function MessageListWithContext(props) {
     previousDerivedItemsRef.current = nextDerivedItems;
     return items;
   }, [processedMessageList]);
-  var renderItem = (0, _hooks.useStableCallback)(function (_ref) {
-    var item = _ref.item;
+  var renderItem = (0, _hooks.useStableCallback)(({
+    item
+  }) => {
     var message = item.message,
       previousMessage = item.previousMessage,
       nextMessage = item.nextMessage;
@@ -254,12 +250,10 @@ var MessageListWithContext = function MessageListWithContext(props) {
   var minIndexForVisible = Math.min(1, processedMessageList.length);
   var isOverlayOpen = (0, _stateStore.useHasActiveId)();
   var autoscrollToTopThreshold = autoscrollToRecent && !isOverlayOpen ? isLiveStreaming ? 300 : 10 : undefined;
-  var maintainVisibleContentPosition = (0, _react.useMemo)(function () {
-    return {
-      autoscrollToTopThreshold: autoscrollToTopThreshold,
-      minIndexForVisible: minIndexForVisible
-    };
-  }, [autoscrollToTopThreshold, minIndexForVisible]);
+  var maintainVisibleContentPosition = (0, _react.useMemo)(() => ({
+    autoscrollToTopThreshold,
+    minIndexForVisible
+  }), [autoscrollToTopThreshold, minIndexForVisible]);
   var onStartReachedTracker = (0, _react.useRef)({});
   var onEndReachedTracker = (0, _react.useRef)({});
   var onStartReachedInPromise = (0, _react.useRef)(null);
@@ -284,41 +278,36 @@ var MessageListWithContext = function MessageListWithContext(props) {
   var stickyHeaderDateRef = (0, _react.useRef)(undefined);
   var channelRef = (0, _react.useRef)(channel);
   channelRef.current = channel;
-  var updateStickyHeaderDateIfNeeded = (0, _hooks.useStableCallback)(function (viewableItems) {
-    var _viewableItems$item;
+  var updateStickyHeaderDateIfNeeded = (0, _hooks.useStableCallback)(viewableItems => {
     if (!viewableItems.length) {
       return;
     }
-    var lastMessage = (_viewableItems$item = viewableItems[viewableItems.length - 1].item) == null ? void 0 : _viewableItems$item.message;
+    var lastMessage = viewableItems[viewableItems.length - 1].item?.message;
     if (lastMessage) {
-      var _stickyHeaderDateRef$;
       if (!channel.state.messagePagination.hasPrev && processedMessageList[processedMessageList.length - 1].id === lastMessage.id) {
         setStickyHeaderDate(undefined);
         return;
       }
       var isMessageTypeDeleted = lastMessage.type === 'deleted';
-      if (lastMessage != null && lastMessage.created_at && !isMessageTypeDeleted && typeof lastMessage.created_at !== 'string' && lastMessage.created_at.toDateString() !== ((_stickyHeaderDateRef$ = stickyHeaderDateRef.current) == null ? void 0 : _stickyHeaderDateRef$.toDateString())) {
+      if (lastMessage?.created_at && !isMessageTypeDeleted && typeof lastMessage.created_at !== 'string' && lastMessage.created_at.toDateString() !== stickyHeaderDateRef.current?.toDateString()) {
         stickyHeaderDateRef.current = lastMessage.created_at;
         setStickyHeaderDate(lastMessage.created_at);
       }
     }
   });
-  var updateStickyUnreadIndicator = (0, _hooks.useStableCallback)(function (viewableItems) {
+  var updateStickyUnreadIndicator = (0, _hooks.useStableCallback)(viewableItems => {
     var channelUnreadState = channelUnreadStateStore.channelUnreadState;
-    var lastReadMessageId = channelUnreadState == null ? void 0 : channelUnreadState.last_read_message_id;
-    var lastReadMessageVisible = viewableItems.some(function (item) {
-      return item.item.message.id === lastReadMessageId;
-    });
+    var lastReadMessageId = channelUnreadState?.last_read_message_id;
+    var lastReadMessageVisible = viewableItems.some(item => item.item.message.id === lastReadMessageId);
     if (!viewableItems.length || !readEvents || lastReadMessageVisible || attachmentPickerStore.state.getLatestValue().selectedPicker === 'images') {
       setIsUnreadNotificationOpen(false);
       return;
     }
     var lastItem = viewableItems[viewableItems.length - 1].item;
     if (lastItem) {
-      var _channelUnreadState$l;
       var lastItemMessage = lastItem.message;
       var lastItemCreatedAt = lastItemMessage.created_at;
-      var unreadIndicatorDate = channelUnreadState == null || (_channelUnreadState$l = channelUnreadState.last_read) == null ? void 0 : _channelUnreadState$l.getTime();
+      var unreadIndicatorDate = channelUnreadState?.last_read?.getTime();
       var lastItemDate = lastItemCreatedAt.getTime();
       if (!channel.state.messagePagination.hasPrev && processedMessageList[processedMessageList.length - 1].id === lastItemMessage.id) {
         setIsUnreadNotificationOpen(false);
@@ -335,11 +324,12 @@ var MessageListWithContext = function MessageListWithContext(props) {
       }
     }
   });
-  var unstableOnViewableItemsChanged = function unstableOnViewableItemsChanged(_ref2) {
-    var viewableItems = _ref2.viewableItems;
+  var unstableOnViewableItemsChanged = ({
+    viewableItems
+  }) => {
     viewabilityChangedCallback({
-      inverted: inverted,
-      viewableItems: viewableItems
+      inverted,
+      viewableItems
     });
     if (!viewableItems) {
       return;
@@ -351,72 +341,69 @@ var MessageListWithContext = function MessageListWithContext(props) {
   };
   var onViewableItemsChanged = (0, _react.useRef)(unstableOnViewableItemsChanged);
   onViewableItemsChanged.current = unstableOnViewableItemsChanged;
-  var stableOnViewableItemsChanged = (0, _react.useCallback)(function (_ref3) {
-    var viewableItems = _ref3.viewableItems;
+  var stableOnViewableItemsChanged = (0, _react.useCallback)(({
+    viewableItems
+  }) => {
     onViewableItemsChanged.current({
-      viewableItems: viewableItems
+      viewableItems
     });
   }, []);
-  var resetPaginationTrackersRef = (0, _react.useRef)(function () {
+  var resetPaginationTrackersRef = (0, _react.useRef)(() => {
     onStartReachedTracker.current = {};
     onEndReachedTracker.current = {};
   });
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (disabled) {
       setScrollToBottomButtonVisible(false);
     }
   }, [disabled]);
-  (0, _react.useEffect)(function () {
-    var shouldMarkRead = function shouldMarkRead() {
-      var _client$user2, _client$user3;
+  (0, _react.useEffect)(() => {
+    var shouldMarkRead = () => {
       var channelUnreadState = channelUnreadStateStore.channelUnreadState;
-      return !(channelUnreadState != null && channelUnreadState.first_unread_message_id) && !scrollToBottomButtonVisible && ((_client$user2 = client.user) == null ? void 0 : _client$user2.id) && !hasReadLastMessage(channel, (_client$user3 = client.user) == null ? void 0 : _client$user3.id);
+      return !channelUnreadState?.first_unread_message_id && !scrollToBottomButtonVisible && client.user?.id && !hasReadLastMessage(channel, client.user?.id);
     };
     var handleEvent = function () {
-      var _ref4 = (0, _asyncToGenerator2.default)(function* (event) {
-        var _event$message, _event$message2, _event$message3, _client$user4;
-        var mainChannelUpdated = !((_event$message = event.message) != null && _event$message.parent_id) || ((_event$message2 = event.message) == null ? void 0 : _event$message2.show_in_channel);
-        var isMyOwnMessage = ((_event$message3 = event.message) == null || (_event$message3 = _event$message3.user) == null ? void 0 : _event$message3.id) === ((_client$user4 = client.user) == null ? void 0 : _client$user4.id);
+      var _ref = (0, _asyncToGenerator2.default)(function* (event) {
+        var mainChannelUpdated = !event.message?.parent_id || event.message?.show_in_channel;
+        var isMyOwnMessage = event.message?.user?.id === client.user?.id;
         var channelUnreadState = channelUnreadStateStore.channelUnreadState;
-        if ((scrollToBottomButtonVisible || channelUnreadState != null && channelUnreadState.first_unread_message_id) && !isMyOwnMessage) {
-          var _channelUnreadState$u, _channelUnreadState$l2;
-          var previousUnreadCount = (_channelUnreadState$u = channelUnreadState == null ? void 0 : channelUnreadState.unread_messages) != null ? _channelUnreadState$u : 0;
+        if ((scrollToBottomButtonVisible || channelUnreadState?.first_unread_message_id) && !isMyOwnMessage) {
+          var previousUnreadCount = channelUnreadState?.unread_messages ?? 0;
           var previousLastMessage = getPreviousLastMessage(channel.state.messages, event.message);
-          setChannelUnreadState(Object.assign({}, channelUnreadState, {
-            last_read: (_channelUnreadState$l2 = channelUnreadState == null ? void 0 : channelUnreadState.last_read) != null ? _channelUnreadState$l2 : previousUnreadCount === 0 && previousLastMessage != null && previousLastMessage.created_at ? new Date(previousLastMessage.created_at) : new Date(0),
+          setChannelUnreadState({
+            ...channelUnreadState,
+            last_read: channelUnreadState?.last_read ?? (previousUnreadCount === 0 && previousLastMessage?.created_at ? new Date(previousLastMessage.created_at) : new Date(0)),
             unread_messages: previousUnreadCount + 1
-          }));
+          });
         } else if (mainChannelUpdated && shouldMarkRead()) {
           yield markRead();
         }
       });
       return function handleEvent(_x) {
-        return _ref4.apply(this, arguments);
+        return _ref.apply(this, arguments);
       };
     }();
     var listener = channel.on('message.new', handleEvent);
-    return function () {
-      listener == null || listener.unsubscribe();
+    return () => {
+      listener?.unsubscribe();
     };
-  }, [channel, channelUnreadStateStore, (_client$user5 = client.user) == null ? void 0 : _client$user5.id, markRead, scrollToBottomButtonVisible, setChannelUnreadState, threadList]);
-  (0, _react.useEffect)(function () {
+  }, [channel, channelUnreadStateStore, client.user?.id, markRead, scrollToBottomButtonVisible, setChannelUnreadState, threadList]);
+  (0, _react.useEffect)(() => {
     var isMessageRemovedFromMessageList = messageListLengthAfterUpdate < messageListLengthBeforeUpdate.current;
-    var scrollToBottomIfNeeded = function scrollToBottomIfNeeded() {
-      var _topMessageBeforeUpda;
+    var scrollToBottomIfNeeded = () => {
       if (!client || !channel || rawMessageList.length === 0) {
         return;
       }
-      if (isMessageRemovedFromMessageList || (_topMessageBeforeUpda = topMessageBeforeUpdate.current) != null && _topMessageBeforeUpda.created_at && topMessageAfterUpdate != null && topMessageAfterUpdate.created_at && topMessageBeforeUpdate.current.created_at < topMessageAfterUpdate.created_at) {
+      if (isMessageRemovedFromMessageList || topMessageBeforeUpdate.current?.created_at && topMessageAfterUpdate?.created_at && topMessageBeforeUpdate.current.created_at < topMessageAfterUpdate.created_at) {
         channelResyncScrollSet.current = false;
         setScrollToBottomButtonVisible(false);
         resetPaginationTrackersRef.current();
-        setTimeout(function () {
-          var _flatListRef$current;
-          (_flatListRef$current = flatListRef.current) == null || _flatListRef$current.scrollToOffset({
+        setTimeout(() => {
+          flatListRef.current?.scrollToOffset({
             offset: 0
           });
         }, WAIT_FOR_SCROLL_TIMEOUT);
-        setTimeout(function () {
+        setTimeout(() => {
           channelResyncScrollSet.current = true;
           if (channel.countUnread() > 0) {
             markRead();
@@ -433,8 +420,8 @@ var MessageListWithContext = function MessageListWithContext(props) {
     }
     messageListLengthBeforeUpdate.current = messageListLengthAfterUpdate;
     topMessageBeforeUpdate.current = topMessageAfterUpdate;
-  }, [threadList, messageListLengthAfterUpdate, topMessageAfterUpdate == null ? void 0 : topMessageAfterUpdate.id, maximumMessageLimit]);
-  (0, _react.useEffect)(function () {
+  }, [threadList, messageListLengthAfterUpdate, topMessageAfterUpdate?.id, maximumMessageLimit]);
+  (0, _react.useEffect)(() => {
     if (threadList) {
       setAutoscrollToRecent(true);
       return;
@@ -456,7 +443,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       setAutoscrollToRecent(true);
       return;
     }
-    var didMergeMessageSetsWithNoUpdates = (latestNonCurrentMessageBeforeUpdate == null ? void 0 : latestNonCurrentMessageBeforeUpdate.id) === latestCurrentMessageAfterUpdate.id;
+    var didMergeMessageSetsWithNoUpdates = latestNonCurrentMessageBeforeUpdate?.id === latestCurrentMessageAfterUpdate.id;
     var shouldForceScrollToRecent = !didMergeMessageSetsWithNoUpdates || processedMessageList.length - messageListLengthBeforeUpdate.current > 0;
     if (maximumMessageLimit && shouldForceScrollToRecent || !maximumMessageLimit) {
       setAutoscrollToRecent(shouldForceScrollToRecent);
@@ -464,9 +451,8 @@ var MessageListWithContext = function MessageListWithContext(props) {
     if (!didMergeMessageSetsWithNoUpdates) {
       var shouldScrollToRecentOnNewOwnMessage = shouldScrollToRecentOnNewOwnMessageRef.current();
       if (shouldScrollToRecentOnNewOwnMessage) {
-        setTimeout(function () {
-          var _flatListRef$current2;
-          (_flatListRef$current2 = flatListRef.current) == null || _flatListRef$current2.scrollToOffset({
+        setTimeout(() => {
+          flatListRef.current?.scrollToOffset({
             animated: true,
             offset: 0
           });
@@ -475,14 +461,12 @@ var MessageListWithContext = function MessageListWithContext(props) {
     }
   }, [channel, threadList, processedMessageList, shouldScrollToRecentOnNewOwnMessageRef, maximumMessageLimit]);
   var goToMessage = (0, _hooks.useStableCallback)(function () {
-    var _ref5 = (0, _asyncToGenerator2.default)(function* (messageId) {
-      var indexOfParentInMessageList = processedMessageList.findIndex(function (message) {
-        return (message == null ? void 0 : message.id) === messageId;
-      });
+    var _ref2 = (0, _asyncToGenerator2.default)(function* (messageId) {
+      var indexOfParentInMessageList = processedMessageList.findIndex(message => message?.id === messageId);
       try {
         if (indexOfParentInMessageList === -1) {
           yield loadChannelAroundMessage({
-            messageId: messageId
+            messageId
           });
           return;
         } else {
@@ -505,21 +489,19 @@ var MessageListWithContext = function MessageListWithContext(props) {
       }
     });
     return function (_x2) {
-      return _ref5.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }());
-  (0, _react.useEffect)(function () {
+  (0, _react.useEffect)(() => {
     if (!targetedMessage) {
       return;
     }
     scrollToDebounceTimeoutRef.current = setTimeout((0, _asyncToGenerator2.default)(function* () {
-      var indexOfParentInMessageList = processedMessageList.findIndex(function (message) {
-        return (message == null ? void 0 : message.id) === targetedMessage;
-      });
+      var indexOfParentInMessageList = processedMessageList.findIndex(message => message?.id === targetedMessage);
       if (indexOfParentInMessageList === -1) {
         yield loadChannelAroundMessage({
           messageId: targetedMessage,
-          setTargetedMessage: setTargetedMessage
+          setTargetedMessage
         });
       } else {
         if (!flatListRef.current) {
@@ -537,35 +519,33 @@ var MessageListWithContext = function MessageListWithContext(props) {
       }
     }), WAIT_FOR_SCROLL_TIMEOUT);
   }, [targetedMessage]);
-  var setNativeScrollability = (0, _hooks.useStableCallback)(function (value) {
+  var setNativeScrollability = (0, _hooks.useStableCallback)(value => {
     if (flatListRef.current) {
       flatListRef.current.setNativeProps({
         scrollEnabled: value
       });
     }
   });
-  var messageListItemContextValue = (0, _react.useMemo)(function () {
-    return {
-      goToMessage: goToMessage,
-      modifiedTheme: modifiedTheme,
-      noGroupByUser: noGroupByUser,
-      onThreadSelect: onThreadSelect,
-      setNativeScrollability: setNativeScrollability
-    };
-  }, [goToMessage, modifiedTheme, noGroupByUser, onThreadSelect, setNativeScrollability]);
+  var messageListItemContextValue = (0, _react.useMemo)(() => ({
+    goToMessage,
+    modifiedTheme,
+    noGroupByUser,
+    onThreadSelect,
+    setNativeScrollability
+  }), [goToMessage, modifiedTheme, noGroupByUser, onThreadSelect, setNativeScrollability]);
   var maybeCallOnStartReached = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
-    if (processedMessageList != null && processedMessageList.length && onStartReachedTracker.current[processedMessageList.length]) {
+    if (processedMessageList?.length && onStartReachedTracker.current[processedMessageList.length]) {
       return;
     }
-    if (processedMessageList != null && processedMessageList.length) {
+    if (processedMessageList?.length) {
       onStartReachedTracker.current[processedMessageList.length] = true;
     }
-    var callback = function callback() {
+    var callback = () => {
       onStartReachedInPromise.current = null;
       return Promise.resolve();
     };
-    var onError = function onError() {
-      setTimeout(function () {
+    var onError = () => {
+      setTimeout(() => {
         onStartReachedTracker.current = {};
       }, 2000);
     };
@@ -576,18 +556,18 @@ var MessageListWithContext = function MessageListWithContext(props) {
   }));
   var maybeCallOnEndReached = (0, _hooks.useStableCallback)((0, _asyncToGenerator2.default)(function* () {
     var shouldQuery = threadList && threadHasMore || !threadList && hasMore;
-    if (processedMessageList != null && processedMessageList.length && onEndReachedTracker.current[processedMessageList.length] || !shouldQuery) {
+    if (processedMessageList?.length && onEndReachedTracker.current[processedMessageList.length] || !shouldQuery) {
       return;
     }
-    if (processedMessageList != null && processedMessageList.length) {
+    if (processedMessageList?.length) {
       onEndReachedTracker.current[processedMessageList.length] = true;
     }
-    var callback = function callback() {
+    var callback = () => {
       onEndReachedInPromise.current = null;
       return Promise.resolve();
     };
-    var onError = function onError() {
-      setTimeout(function () {
+    var onError = () => {
+      setTimeout(() => {
         onEndReachedTracker.current = {};
       }, 2000);
     };
@@ -596,7 +576,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     }
     onEndReachedInPromise.current = (threadList ? loadMoreThread() : loadMore()).then(callback).catch(onError);
   }));
-  var onUserScrollEvent = (0, _hooks.useStableCallback)(function (event) {
+  var onUserScrollEvent = (0, _hooks.useStableCallback)(event => {
     var nativeEvent = event.nativeEvent;
     clearTimeout(onScrollEventTimeoutRef.current);
     var offset = nativeEvent.contentOffset.y;
@@ -614,7 +594,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       maybeCallOnEndReached();
     }
   });
-  var handleScroll = (0, _hooks.useStableCallback)(function (event) {
+  var handleScroll = (0, _hooks.useStableCallback)(event => {
     var messageListHasMessages = processedMessageList.length > 0;
     var offset = event.nativeEvent.contentOffset.y;
     var isScrollAtBottom = offset <= messageInputHeight;
@@ -641,10 +621,10 @@ var MessageListWithContext = function MessageListWithContext(props) {
       updateChannelUnreadState: false
     });
   }));
-  var scrollToBottomUnreadCount = scrollToBottomButtonVisible && !threadList ? channel == null ? void 0 : channel.countUnread() : undefined;
+  var scrollToBottomUnreadCount = scrollToBottomButtonVisible && !threadList ? channel?.countUnread() : undefined;
   var _useScrollToBottomAcc = (0, _useScrollToBottomAccessibilityAction.useScrollToBottomAccessibilityAction)({
-      accessibilityActions: additionalFlatListProps == null ? void 0 : additionalFlatListProps.accessibilityActions,
-      onAccessibilityAction: additionalFlatListProps == null ? void 0 : additionalFlatListProps.onAccessibilityAction,
+      accessibilityActions: additionalFlatListProps?.accessibilityActions,
+      onAccessibilityAction: additionalFlatListProps?.onAccessibilityAction,
       onScrollToBottom: goToNewMessages,
       unreadCount: scrollToBottomUnreadCount,
       visible: scrollToBottomButtonVisible
@@ -653,14 +633,13 @@ var MessageListWithContext = function MessageListWithContext(props) {
     messageListOnAccessibilityAction = _useScrollToBottomAcc.onAccessibilityAction;
   var scrollToIndexFailedRetryCountRef = (0, _react.useRef)(0);
   var failScrollTimeoutId = (0, _react.useRef)(undefined);
-  var onScrollToIndexFailedRef = (0, _react.useRef)(function (info) {
+  var onScrollToIndexFailedRef = (0, _react.useRef)(info => {
     if (!flatListRef.current) {
       return;
     }
-    failScrollTimeoutId.current = setTimeout(function () {
+    failScrollTimeoutId.current = setTimeout(() => {
       try {
-        var _flatListRef$current3;
-        (_flatListRef$current3 = flatListRef.current) == null || _flatListRef$current3.scrollToIndex({
+        flatListRef.current?.scrollToIndex({
           animated: true,
           index: info.index,
           viewPosition: 0.5
@@ -679,21 +658,21 @@ var MessageListWithContext = function MessageListWithContext(props) {
       }
     }, WAIT_FOR_SCROLL_TIMEOUT);
   });
-  var dismissImagePicker = (0, _hooks.useStableCallback)(function () {
+  var dismissImagePicker = (0, _hooks.useStableCallback)(() => {
     if (attachmentPickerStore.state.getLatestValue().selectedPicker) {
       attachmentPickerStore.setSelectedPicker(undefined);
       closePicker();
     }
   });
-  var onScrollBeginDrag = (0, _hooks.useStableCallback)(function (event) {
+  var onScrollBeginDrag = (0, _hooks.useStableCallback)(event => {
     !hasMoved && attachmentPickerStore.state.getLatestValue().selectedPicker && setHasMoved(true);
     onUserScrollEvent(event);
   });
-  var onScrollEndDrag = (0, _hooks.useStableCallback)(function (event) {
+  var onScrollEndDrag = (0, _hooks.useStableCallback)(event => {
     hasMoved && attachmentPickerStore.state.getLatestValue().selectedPicker && setHasMoved(false);
     onUserScrollEvent(event);
   });
-  var refCallback = (0, _hooks.useStableCallback)(function (ref) {
+  var refCallback = (0, _hooks.useStableCallback)(ref => {
     flatListRef.current = ref;
     if (setFlatListRef) {
       setFlatListRef(ref);
@@ -723,47 +702,39 @@ var MessageListWithContext = function MessageListWithContext(props) {
       rest = (0, _objectWithoutProperties2.default)(additionalFlatListProps, _excluded);
     additionalFlatListPropsExcludingStyle = rest;
   }
-  var flatListStyle = (0, _react.useMemo)(function () {
-    return [styles.listContainer, additionalFlatListProps == null ? void 0 : additionalFlatListProps.style];
-  }, [additionalFlatListProps == null ? void 0 : additionalFlatListProps.style, styles.listContainer]);
-  var flatListContentContainerStyle = (0, _react.useMemo)(function () {
-    return [{
-      paddingTop: messageInputFloating ? messageInputHeight : 0
-    }, styles.contentContainer, additionalFlatListProps == null ? void 0 : additionalFlatListProps.contentContainerStyle];
-  }, [additionalFlatListProps == null ? void 0 : additionalFlatListProps.contentContainerStyle, styles.contentContainer, messageInputHeight, messageInputFloating]);
+  var flatListStyle = (0, _react.useMemo)(() => [styles.listContainer, additionalFlatListProps?.style], [additionalFlatListProps?.style, styles.listContainer]);
+  var flatListContentContainerStyle = (0, _react.useMemo)(() => [{
+    paddingTop: messageInputFloating ? messageInputHeight : 0
+  }, styles.contentContainer, additionalFlatListProps?.contentContainerStyle], [additionalFlatListProps?.contentContainerStyle, styles.contentContainer, messageInputHeight, messageInputFloating]);
   var ListComponent = animateLayout ? AnimatedList : FlatList;
   var viewportHeightRef = (0, _react.useRef)(undefined);
-  var debouncedPrefillMessages = (0, _react.useMemo)(function () {
-    return (0, _debounce.default)(function (viewportHeight, contentHeight) {
-      if (viewportHeight >= contentHeight) {
-        maybeCallOnEndReached();
-      }
-    }, 500, {
-      leading: false,
-      trailing: true
-    });
-  }, [maybeCallOnEndReached]);
-  var onContentSizeChange = (0, _hooks.useStableCallback)(function (width, height) {
-    var _viewportHeightRef$cu;
-    if (additionalFlatListProps != null && additionalFlatListProps.onContentSizeChange) {
+  var debouncedPrefillMessages = (0, _react.useMemo)(() => (0, _debounce.default)((viewportHeight, contentHeight) => {
+    if (viewportHeight >= contentHeight) {
+      maybeCallOnEndReached();
+    }
+  }, 500, {
+    leading: false,
+    trailing: true
+  }), [maybeCallOnEndReached]);
+  var onContentSizeChange = (0, _hooks.useStableCallback)((width, height) => {
+    if (additionalFlatListProps?.onContentSizeChange) {
       additionalFlatListProps.onContentSizeChange(width, height);
     }
-    debouncedPrefillMessages((_viewportHeightRef$cu = viewportHeightRef.current) != null ? _viewportHeightRef$cu : 0, height);
+    debouncedPrefillMessages(viewportHeightRef.current ?? 0, height);
   });
-  var onLayout = (0, _hooks.useStableCallback)(function (event) {
-    if (additionalFlatListProps != null && additionalFlatListProps.onLayout) {
+  var onLayout = (0, _hooks.useStableCallback)(event => {
+    if (additionalFlatListProps?.onLayout) {
       additionalFlatListProps.onLayout(event);
     }
     var nextViewportHeight = event.nativeEvent.layout.height;
     if (viewportHeightRef.current !== nextViewportHeight) {
-      var _viewportHeightRef$cu2;
-      var previousViewportHeight = (_viewportHeightRef$cu2 = viewportHeightRef.current) != null ? _viewportHeightRef$cu2 : nextViewportHeight;
+      var previousViewportHeight = viewportHeightRef.current ?? nextViewportHeight;
       var closeCorrectionDeltaY = nextViewportHeight - previousViewportHeight;
       (0, _stateStore.bumpOverlayLayoutRevision)(closeCorrectionDeltaY);
     }
     viewportHeightRef.current = nextViewportHeight;
   });
-  var ListHeaderComponent = (0, _react.useCallback)(function () {
+  var ListHeaderComponent = (0, _react.useCallback)(() => {
     if (HeaderComponent) {
       return (0, _jsxRuntime.jsx)(HeaderComponent, {});
     }
@@ -795,7 +766,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
       }) : null
     }) : (0, _jsxRuntime.jsx)(_MessageListItemContext.MessageListItemProvider, {
       value: messageListItemContextValue,
-      children: (0, _jsxRuntime.jsx)(ListComponent, Object.assign({
+      children: (0, _jsxRuntime.jsx)(ListComponent, {
         layout: _transitions.transitions.layout200,
         contentContainerStyle: flatListContentContainerStyle,
         data: processedMessageListWithNeighbors,
@@ -823,11 +794,11 @@ var MessageListWithContext = function MessageListWithContext(props) {
         strictMode: isLiveStreaming,
         style: flatListStyle,
         testID: "message-flat-list",
-        viewabilityConfig: flatListViewabilityConfig
-      }, additionalFlatListPropsExcludingStyle, {
+        viewabilityConfig: flatListViewabilityConfig,
+        ...additionalFlatListPropsExcludingStyle,
         accessibilityActions: messageListAccessibilityActions,
         onAccessibilityAction: messageListOnAccessibilityAction
-      }))
+      })
     }), (0, _jsxRuntime.jsx)(_reactNative.View, {
       accessibilityElementsHidden: true,
       accessible: false,
@@ -857,7 +828,7 @@ var MessageListWithContext = function MessageListWithContext(props) {
     })]
   });
 };
-var MessageList = exports.MessageList = function MessageList(props) {
+var MessageList = props => {
   var _useAttachmentPickerC = (0, _AttachmentPickerContext.useAttachmentPickerContext)(),
     closePicker = _useAttachmentPickerC.closePicker,
     attachmentPickerStore = _useAttachmentPickerC.attachmentPickerStore;
@@ -901,45 +872,46 @@ var MessageList = exports.MessageList = function MessageList(props) {
     threadHasMore = _useThreadContext.threadHasMore,
     thread = _useThreadContext.thread,
     threadInstance = _useThreadContext.threadInstance;
-  return (0, _jsxRuntime.jsx)(MessageListWithContext, Object.assign({
-    attachmentPickerStore: attachmentPickerStore,
-    channel: channel,
-    channelUnreadStateStore: channelUnreadStateStore,
-    client: client,
-    closePicker: closePicker,
-    disabled: disabled,
-    disableTypingIndicator: disableTypingIndicator,
-    enableMessageGroupingByUser: enableMessageGroupingByUser,
-    error: error,
-    FlatList: FlatList,
-    hideStickyDateHeader: hideStickyDateHeader,
-    highlightedMessageId: highlightedMessageId,
-    loadChannelAroundMessage: loadChannelAroundMessage,
-    loading: loading,
-    loadMore: loadMore,
-    loadMoreRecent: loadMoreRecent,
-    loadMoreRecentThread: loadMoreRecentThread,
-    loadMoreThread: loadMoreThread,
-    markRead: markRead,
-    maximumMessageLimit: maximumMessageLimit,
-    messageInputFloating: messageInputFloating,
-    messageInputHeightStore: messageInputHeightStore,
-    myMessageTheme: myMessageTheme,
-    readEvents: readEvents,
-    reloadChannel: reloadChannel,
-    scrollToFirstUnreadThreshold: scrollToFirstUnreadThreshold,
-    setChannelUnreadState: setChannelUnreadState,
-    setTargetedMessage: setTargetedMessage,
-    shouldShowUnreadUnderlay: shouldShowUnreadUnderlay,
-    targetedMessage: targetedMessage,
-    thread: thread,
-    threadInstance: threadInstance,
-    threadList: threadList,
-    hasMore: hasMore,
-    threadHasMore: threadHasMore
-  }, props, {
+  return (0, _jsxRuntime.jsx)(MessageListWithContext, {
+    attachmentPickerStore,
+    channel,
+    channelUnreadStateStore,
+    client,
+    closePicker,
+    disabled,
+    disableTypingIndicator,
+    enableMessageGroupingByUser,
+    error,
+    FlatList,
+    hideStickyDateHeader,
+    highlightedMessageId,
+    loadChannelAroundMessage,
+    loading,
+    loadMore,
+    loadMoreRecent,
+    loadMoreRecentThread,
+    loadMoreThread,
+    markRead,
+    maximumMessageLimit,
+    messageInputFloating,
+    messageInputHeightStore,
+    myMessageTheme,
+    readEvents,
+    reloadChannel,
+    scrollToFirstUnreadThreshold,
+    setChannelUnreadState,
+    setTargetedMessage,
+    shouldShowUnreadUnderlay,
+    targetedMessage,
+    thread,
+    threadInstance,
+    threadList,
+    hasMore,
+    threadHasMore,
+    ...props,
     noGroupByUser: !enableMessageGroupingByUser || props.noGroupByUser
-  }));
+  });
 };
+exports.MessageList = MessageList;
 var AnimatedList = _react.default.memo(_reactNativeReanimated.default.createAnimatedComponent(_reactNative.FlatList));
 //# sourceMappingURL=MessageList.js.map