stream-chat-react-native-core 5.42.1 → 5.42.2-beta.2

package/lib/commonjs/components/ChannelPreview/ChannelPreview.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChannelPreview = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _useChannelPreviewData = require("./hooks/useChannelPreviewData");
-var _useLatestMessagePreview = require("./hooks/useLatestMessagePreview");
 var _ChannelsContext = require("../../contexts/channelsContext/ChannelsContext");
 var _ChatContext = require("../../contexts/chatContext/ChatContext");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -19,16 +18,13 @@ var ChannelPreview = function ChannelPreview(props) {
   var _useChatContext = (0, _ChatContext.useChatContext)(),
     contextClient = _useChatContext.client;
   var _useChannelsContext = (0, _ChannelsContext.useChannelsContext)(),
-    contextForceUpdate = _useChannelsContext.forceUpdate,
     contextPreview = _useChannelsContext.Preview;
   var client = propClient || contextClient;
-  var forceUpdate = propForceUpdate || contextForceUpdate;
   var Preview = propPreview || contextPreview;
-  var _useChannelPreviewDat = (0, _useChannelPreviewData.useChannelPreviewData)(channel, client, forceUpdate),
-    lastMessage = _useChannelPreviewDat.lastMessage,
+  var _useChannelPreviewDat = (0, _useChannelPreviewData.useChannelPreviewData)(channel, client, propForceUpdate),
+    latestMessagePreview = _useChannelPreviewDat.latestMessagePreview,
     muted = _useChannelPreviewDat.muted,
     unread = _useChannelPreviewDat.unread;
-  var latestMessagePreview = (0, _useLatestMessagePreview.useLatestMessagePreview)(channel, forceUpdate, lastMessage);
   return (0, _jsxRuntime.jsx)(Preview, {
     channel: channel,
     latestMessagePreview: latestMessagePreview,

package/lib/commonjs/components/ChannelPreview/ChannelPreview.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_useChannelPreviewData","_useLatestMessagePreview","_ChannelsContext","_ChatContext","_jsxRuntime","_this","_jsxFileName","ChannelPreview","props","channel","propClient","client","propForceUpdate","forceUpdate","propPreview","Preview","_useChatContext","useChatContext","contextClient","_useChannelsContext","useChannelsContext","contextForceUpdate","contextPreview","_useChannelPreviewDat","useChannelPreviewData","lastMessage","muted","unread","latestMessagePreview","useLatestMessagePreview","jsx","exports"],"sourceRoot":"../../../../src","sources":["components/ChannelPreview/ChannelPreview.tsx"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAEA,IAAAG,gBAAA,GAAAH,OAAA;AAIA,IAAAI,YAAA,GAAAJ,OAAA;AAA0F,IAAAK,WAAA,GAAAL,OAAA;AAAA,IAAAM,KAAA;EAAAC,YAAA;AAcnF,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAGzBC,KAA8C,EAC3C;EACH,IAAQC,OAAO,GAA6ED,KAAK,CAAzFC,OAAO;IAAUC,UAAU,GAAyDF,KAAK,CAAhFG,MAAM;IAA2BC,eAAe,GAA2BJ,KAAK,CAA5DK,WAAW;IAA4BC,WAAW,GAAKN,KAAK,CAA9BO,OAAO;EAE1E,IAAAC,eAAA,GAAkC,IAAAC,2BAAc,EAAqB,CAAC;IAAtDC,aAAa,GAAAF,eAAA,CAArBL,MAAM;EACd,IAAAQ,mBAAA,GACE,IAAAC,mCAAkB,EAAqB,CAAC;IADrBC,kBAAkB,GAAAF,mBAAA,CAA/BN,WAAW;IAA+BS,cAAc,GAAAH,mBAAA,CAAvBJ,OAAO;EAGhD,IAAMJ,MAAM,GAAGD,UAAU,IAAIQ,aAAa;EAC1C,IAAML,WAAW,GAAGD,eAAe,IAAIS,kBAAkB;EACzD,IAAMN,OAAO,GAAGD,WAAW,IAAIQ,cAAc;EAE7C,IAAAC,qBAAA,GAAuC,IAAAC,4CAAqB,EAACf,OAAO,EAAEE,MAAM,EAAEE,WAAW,CAAC;IAAlFY,WAAW,GAAAF,qBAAA,CAAXE,WAAW;IAAEC,KAAK,GAAAH,qBAAA,CAALG,KAAK;IAAEC,MAAM,GAAAJ,qBAAA,CAANI,MAAM;EAClC,IAAMC,oBAAoB,GAAG,IAAAC,gDAAuB,EAACpB,OAAO,EAAEI,WAAW,EAAEY,WAAW,CAAC;EAEvF,OACE,IAAArB,WAAA,CAAA0B,GAAA,EAACf,OAAO;IACNN,OAAO,EAAEA,OAAQ;IACjBmB,oBAAoB,EAAEA,oBAAqB;IAC3CF,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAACI,OAAA,CAAAxB,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_useChannelPreviewData","_ChannelsContext","_ChatContext","_jsxRuntime","_this","_jsxFileName","ChannelPreview","props","channel","propClient","client","propForceUpdate","forceUpdate","propPreview","Preview","_useChatContext","useChatContext","contextClient","_useChannelsContext","useChannelsContext","contextPreview","_useChannelPreviewDat","useChannelPreviewData","latestMessagePreview","muted","unread","jsx","exports"],"sourceRoot":"../../../../src","sources":["components/ChannelPreview/ChannelPreview.tsx"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA,IAAAC,sBAAA,GAAAD,OAAA;AAEA,IAAAE,gBAAA,GAAAF,OAAA;AAIA,IAAAG,YAAA,GAAAH,OAAA;AAA0F,IAAAI,WAAA,GAAAJ,OAAA;AAAA,IAAAK,KAAA;EAAAC,YAAA;AAcnF,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAGzBC,KAA8C,EAC3C;EACH,IAAQC,OAAO,GAA6ED,KAAK,CAAzFC,OAAO;IAAUC,UAAU,GAAyDF,KAAK,CAAhFG,MAAM;IAA2BC,eAAe,GAA2BJ,KAAK,CAA5DK,WAAW;IAA4BC,WAAW,GAAKN,KAAK,CAA9BO,OAAO;EAE1E,IAAAC,eAAA,GAAkC,IAAAC,2BAAc,EAAqB,CAAC;IAAtDC,aAAa,GAAAF,eAAA,CAArBL,MAAM;EACd,IAAAQ,mBAAA,GAAoC,IAAAC,mCAAkB,EAAqB,CAAC;IAA3DC,cAAc,GAAAF,mBAAA,CAAvBJ,OAAO;EAEf,IAAMJ,MAAM,GAAGD,UAAU,IAAIQ,aAAa;EAC1C,IAAMH,OAAO,GAAGD,WAAW,IAAIO,cAAc;EAE7C,IAAAC,qBAAA,GAAgD,IAAAC,4CAAqB,EACnEd,OAAO,EACPE,MAAM,EACNC,eACF,CAAC;IAJOY,oBAAoB,GAAAF,qBAAA,CAApBE,oBAAoB;IAAEC,KAAK,GAAAH,qBAAA,CAALG,KAAK;IAAEC,MAAM,GAAAJ,qBAAA,CAANI,MAAM;EAM3C,OACE,IAAAtB,WAAA,CAAAuB,GAAA,EAACZ,OAAO;IACNN,OAAO,EAAEA,OAAQ;IACjBe,oBAAoB,EAAEA,oBAAqB;IAC3CC,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAACE,OAAA,CAAArB,cAAA,GAAAA,cAAA","ignoreList":[]}

package/lib/commonjs/components/ChannelPreview/hooks/useChannelPreviewData.js

@@ -7,36 +7,69 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _useIsChannelMuted2 = require("./useIsChannelMuted");
-var useChannelPreviewData = function useChannelPreviewData(channel, client, forceUpdate) {
-  var _useState = (0, _react.useState)(channel.state.messages[channel.state.messages.length - 1]),
+var _useLatestMessagePreview = require("./useLatestMessagePreview");
+var _contexts = require("../../../contexts");
+var useChannelPreviewData = function useChannelPreviewData(channel, client, forceUpdateOverride) {
+  var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    lastMessage = _useState2[0],
-    setLastMessage = _useState2[1];
-  var _useState3 = (0, _react.useState)(channel.countUnread()),
+    forceUpdate = _useState2[0],
+    setForceUpdate = _useState2[1];
+  var _useState3 = (0, _react.useState)(channel.state.messages[channel.state.messages.length - 1]),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    unread = _useState4[0],
-    setUnread = _useState4[1];
+    lastMessage = _useState4[0],
+    setLastMessage = _useState4[1];
+  var _useState5 = (0, _react.useState)(channel.countUnread()),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    unread = _useState6[0],
+    setUnread = _useState6[1];
   var _useIsChannelMuted = (0, _useIsChannelMuted2.useIsChannelMuted)(channel),
     muted = _useIsChannelMuted.muted;
+  var _useChannelsContext = (0, _contexts.useChannelsContext)(),
+    contextForceUpdate = _useChannelsContext.forceUpdate;
+  var channelListForceUpdate = forceUpdateOverride != null ? forceUpdateOverride : contextForceUpdate;
+  var channelLastMessage = channel.lastMessage();
+  var channelLastMessageString = "".concat(channelLastMessage == null ? void 0 : channelLastMessage.id).concat(channelLastMessage == null ? void 0 : channelLastMessage.updated_at);
+  (0, _react.useEffect)(function () {
+    var _client$on = client.on('notification.mark_read', function () {
+        setUnread(channel.countUnread());
+      }),
+      unsubscribe = _client$on.unsubscribe;
+    return unsubscribe;
+  }, [channel, client]);
+  (0, _react.useEffect)(function () {
+    if (channelLastMessage && (channelLastMessage.id !== (lastMessage == null ? void 0 : lastMessage.id) || channelLastMessage.updated_at !== (lastMessage == null ? void 0 : lastMessage.updated_at))) {
+      setLastMessage(channelLastMessage);
+    }
+    var newUnreadCount = channel.countUnread();
+    setUnread(newUnreadCount);
+  }, [channel, channelLastMessageString, channelListForceUpdate]);
   (0, _react.useEffect)(function () {
     var handleReadEvent = function handleReadEvent(event) {
+      var _event$user, _event$user2;
       if (!event.cid) return;
-      if (channel.cid === event.cid) setUnread(0);
+      if (channel.cid !== event.cid) return;
+      if ((event == null ? void 0 : (_event$user = event.user) == null ? void 0 : _event$user.id) === client.userID) {
+        setUnread(0);
+      } else if (event != null && (_event$user2 = event.user) != null && _event$user2.id) {
+        setForceUpdate(function (prev) {
+          return prev + 1;
+        });
+      }
     };
-    var _client$on = client.on('notification.mark_read', handleReadEvent),
-      unsubscribe = _client$on.unsubscribe;
+    var _client$on2 = client.on('message.read', handleReadEvent),
+      unsubscribe = _client$on2.unsubscribe;
     return unsubscribe;
   }, [client, channel]);
   (0, _react.useEffect)(function () {
     var handleUnreadEvent = function handleUnreadEvent(event) {
-      var _event$user, _client$user;
+      var _event$user3, _client$user;
       if (!event.cid) return;
       if (channel.cid !== event.cid) return;
-      if (((_event$user = event.user) == null ? void 0 : _event$user.id) !== ((_client$user = client.user) == null ? void 0 : _client$user.id)) return;
+      if (((_event$user3 = event.user) == null ? void 0 : _event$user3.id) !== ((_client$user = client.user) == null ? void 0 : _client$user.id)) return;
       setUnread(channel.countUnread());
     };
-    var _client$on2 = client.on('notification.mark_unread', handleUnreadEvent),
-      unsubscribe = _client$on2.unsubscribe;
+    var _client$on3 = client.on('notification.mark_unread', handleUnreadEvent),
+      unsubscribe = _client$on3.unsubscribe;
     return unsubscribe;
   }, [client, channel]);
   var refreshUnreadCount = (0, _react.useMemo)(function () {
@@ -54,15 +87,32 @@ var useChannelPreviewData = function useChannelPreviewData(channel, client, forc
       setLastMessage(channel.state.latestMessages[channel.state.latestMessages.length - 1]);
       refreshUnreadCount();
     };
-    var listeners = [channel.on('message.new', handleEvent), channel.on('message.updated', handleEvent), channel.on('message.deleted', handleEvent), channel.on('message.undeleted', handleEvent), channel.on('channel.truncated', handleEvent)];
+    var handleNewMessageEvent = function handleNewMessageEvent(event) {
+      var message = event.message;
+      if (message && (!message.parent_id || message.show_in_channel)) {
+        setLastMessage(message);
+        setUnread(channel.countUnread());
+      }
+    };
+    var handleUpdatedOrDeletedMessage = function handleUpdatedOrDeletedMessage(event) {
+      setLastMessage(function (prevLastMessage) {
+        var _event$message;
+        if ((prevLastMessage == null ? void 0 : prevLastMessage.id) === ((_event$message = event.message) == null ? void 0 : _event$message.id)) {
+          return event.message;
+        }
+        return prevLastMessage;
+      });
+    };
+    var listeners = [channel.on('message.new', handleNewMessageEvent), channel.on('message.updated', handleUpdatedOrDeletedMessage), channel.on('message.deleted', handleUpdatedOrDeletedMessage), channel.on('message.undeleted', handleEvent), channel.on('channel.truncated', handleEvent)];
     return function () {
       return listeners.forEach(function (l) {
         return l.unsubscribe();
       });
     };
-  }, [channel, refreshUnreadCount, forceUpdate]);
+  }, [channel, refreshUnreadCount, forceUpdate, channelListForceUpdate]);
+  var latestMessagePreview = (0, _useLatestMessagePreview.useLatestMessagePreview)(channel, forceUpdate, lastMessage);
   return {
-    lastMessage: lastMessage,
+    latestMessagePreview: latestMessagePreview,
     muted: muted,
     unread: unread
   };

package/lib/commonjs/components/ChannelPreview/hooks/useChannelPreviewData.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_throttle","_interopRequireDefault","_useIsChannelMuted2","useChannelPreviewData","channel","client","forceUpdate","_useState","useState","state","messages","length","_useState2","_slicedToArray2","lastMessage","setLastMessage","_useState3","countUnread","_useState4","unread","setUnread","_useIsChannelMuted","useIsChannelMuted","muted","useEffect","handleReadEvent","event","cid","_client$on","on","unsubscribe","handleUnreadEvent","_event$user","_client$user","user","id","_client$on2","refreshUnreadCount","useMemo","throttle","handleEvent","latestMessages","listeners","forEach","l","exports"],"sourceRoot":"../../../../../src","sources":["components/ChannelPreview/hooks/useChannelPreviewData.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_throttle","_interopRequireDefault","_useIsChannelMuted2","_useLatestMessagePreview","_contexts","useChannelPreviewData","channel","client","forceUpdateOverride","_useState","useState","_useState2","_slicedToArray2","forceUpdate","setForceUpdate","_useState3","state","messages","length","_useState4","lastMessage","setLastMessage","_useState5","countUnread","_useState6","unread","setUnread","_useIsChannelMuted","useIsChannelMuted","muted","_useChannelsContext","useChannelsContext","contextForceUpdate","channelListForceUpdate","channelLastMessage","channelLastMessageString","concat","id","updated_at","useEffect","_client$on","on","unsubscribe","newUnreadCount","handleReadEvent","event","_event$user","_event$user2","cid","user","userID","prev","_client$on2","handleUnreadEvent","_event$user3","_client$user","_client$on3","refreshUnreadCount","useMemo","throttle","handleEvent","latestMessages","handleNewMessageEvent","message","parent_id","show_in_channel","handleUpdatedOrDeletedMessage","prevLastMessage","_event$message","listeners","forEach","l","latestMessagePreview","useLatestMessagePreview","exports"],"sourceRoot":"../../../../../src","sources":["components/ChannelPreview/hooks/useChannelPreviewData.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/Message/MessageSimple/utils/generateMarkdownText.js

@@ -34,6 +34,10 @@ var generateMarkdownText = function generateMarkdownText(text) {
     _iterator.f();
   }
   resultText = resultText.replace(/[<"'>]/g, '\\$&');
+  resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, function (_, code) {
+    if (code) return code;
+    return '\n';
+  });
   return resultText;
 };
 exports.generateMarkdownText = generateMarkdownText;

package/lib/commonjs/components/Message/MessageSimple/utils/generateMarkdownText.js.map

@@ -1 +1 @@
-{"version":3,"names":["_truncate","_interopRequireDefault","require","_parseLinks","_utils","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","generateMarkdownText","text","resultText","trim","linkInfos","parseLinksFromText","_iterator","_step","linkInfo","displayLink","truncate","raw","omission","normalRegEx","RegExp","escapeRegExp","markdown","concat","url","replace","mentionsRegex","exports"],"sourceRoot":"../../../../../../src","sources":["components/Message/MessageSimple/utils/generateMarkdownText.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_truncate","_interopRequireDefault","require","_parseLinks","_utils","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","generateMarkdownText","text","resultText","trim","linkInfos","parseLinksFromText","_iterator","_step","linkInfo","displayLink","truncate","raw","omission","normalRegEx","RegExp","escapeRegExp","markdown","concat","url","replace","mentionsRegex","_","code","exports"],"sourceRoot":"../../../../../../src","sources":["components/Message/MessageSimple/utils/generateMarkdownText.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.42.1"
+  "version": "5.42.2-beta.2"
 }

package/lib/module/components/ChannelPreview/ChannelPreview.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChannelPreview = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _useChannelPreviewData = require("./hooks/useChannelPreviewData");
-var _useLatestMessagePreview = require("./hooks/useLatestMessagePreview");
 var _ChannelsContext = require("../../contexts/channelsContext/ChannelsContext");
 var _ChatContext = require("../../contexts/chatContext/ChatContext");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -19,16 +18,13 @@ var ChannelPreview = function ChannelPreview(props) {
   var _useChatContext = (0, _ChatContext.useChatContext)(),
     contextClient = _useChatContext.client;
   var _useChannelsContext = (0, _ChannelsContext.useChannelsContext)(),
-    contextForceUpdate = _useChannelsContext.forceUpdate,
     contextPreview = _useChannelsContext.Preview;
   var client = propClient || contextClient;
-  var forceUpdate = propForceUpdate || contextForceUpdate;
   var Preview = propPreview || contextPreview;
-  var _useChannelPreviewDat = (0, _useChannelPreviewData.useChannelPreviewData)(channel, client, forceUpdate),
-    lastMessage = _useChannelPreviewDat.lastMessage,
+  var _useChannelPreviewDat = (0, _useChannelPreviewData.useChannelPreviewData)(channel, client, propForceUpdate),
+    latestMessagePreview = _useChannelPreviewDat.latestMessagePreview,
     muted = _useChannelPreviewDat.muted,
     unread = _useChannelPreviewDat.unread;
-  var latestMessagePreview = (0, _useLatestMessagePreview.useLatestMessagePreview)(channel, forceUpdate, lastMessage);
   return (0, _jsxRuntime.jsx)(Preview, {
     channel: channel,
     latestMessagePreview: latestMessagePreview,

package/lib/module/components/ChannelPreview/ChannelPreview.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_useChannelPreviewData","_useLatestMessagePreview","_ChannelsContext","_ChatContext","_jsxRuntime","_this","_jsxFileName","ChannelPreview","props","channel","propClient","client","propForceUpdate","forceUpdate","propPreview","Preview","_useChatContext","useChatContext","contextClient","_useChannelsContext","useChannelsContext","contextForceUpdate","contextPreview","_useChannelPreviewDat","useChannelPreviewData","lastMessage","muted","unread","latestMessagePreview","useLatestMessagePreview","jsx","exports"],"sourceRoot":"../../../../src","sources":["components/ChannelPreview/ChannelPreview.tsx"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA,IAAAC,sBAAA,GAAAD,OAAA;AACA,IAAAE,wBAAA,GAAAF,OAAA;AAEA,IAAAG,gBAAA,GAAAH,OAAA;AAIA,IAAAI,YAAA,GAAAJ,OAAA;AAA0F,IAAAK,WAAA,GAAAL,OAAA;AAAA,IAAAM,KAAA;EAAAC,YAAA;AAcnF,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAGzBC,KAA8C,EAC3C;EACH,IAAQC,OAAO,GAA6ED,KAAK,CAAzFC,OAAO;IAAUC,UAAU,GAAyDF,KAAK,CAAhFG,MAAM;IAA2BC,eAAe,GAA2BJ,KAAK,CAA5DK,WAAW;IAA4BC,WAAW,GAAKN,KAAK,CAA9BO,OAAO;EAE1E,IAAAC,eAAA,GAAkC,IAAAC,2BAAc,EAAqB,CAAC;IAAtDC,aAAa,GAAAF,eAAA,CAArBL,MAAM;EACd,IAAAQ,mBAAA,GACE,IAAAC,mCAAkB,EAAqB,CAAC;IADrBC,kBAAkB,GAAAF,mBAAA,CAA/BN,WAAW;IAA+BS,cAAc,GAAAH,mBAAA,CAAvBJ,OAAO;EAGhD,IAAMJ,MAAM,GAAGD,UAAU,IAAIQ,aAAa;EAC1C,IAAML,WAAW,GAAGD,eAAe,IAAIS,kBAAkB;EACzD,IAAMN,OAAO,GAAGD,WAAW,IAAIQ,cAAc;EAE7C,IAAAC,qBAAA,GAAuC,IAAAC,4CAAqB,EAACf,OAAO,EAAEE,MAAM,EAAEE,WAAW,CAAC;IAAlFY,WAAW,GAAAF,qBAAA,CAAXE,WAAW;IAAEC,KAAK,GAAAH,qBAAA,CAALG,KAAK;IAAEC,MAAM,GAAAJ,qBAAA,CAANI,MAAM;EAClC,IAAMC,oBAAoB,GAAG,IAAAC,gDAAuB,EAACpB,OAAO,EAAEI,WAAW,EAAEY,WAAW,CAAC;EAEvF,OACE,IAAArB,WAAA,CAAA0B,GAAA,EAACf,OAAO;IACNN,OAAO,EAAEA,OAAQ;IACjBmB,oBAAoB,EAAEA,oBAAqB;IAC3CF,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAACI,OAAA,CAAAxB,cAAA,GAAAA,cAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_useChannelPreviewData","_ChannelsContext","_ChatContext","_jsxRuntime","_this","_jsxFileName","ChannelPreview","props","channel","propClient","client","propForceUpdate","forceUpdate","propPreview","Preview","_useChatContext","useChatContext","contextClient","_useChannelsContext","useChannelsContext","contextPreview","_useChannelPreviewDat","useChannelPreviewData","latestMessagePreview","muted","unread","jsx","exports"],"sourceRoot":"../../../../src","sources":["components/ChannelPreview/ChannelPreview.tsx"],"mappings":";;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA,IAAAC,sBAAA,GAAAD,OAAA;AAEA,IAAAE,gBAAA,GAAAF,OAAA;AAIA,IAAAG,YAAA,GAAAH,OAAA;AAA0F,IAAAI,WAAA,GAAAJ,OAAA;AAAA,IAAAK,KAAA;EAAAC,YAAA;AAcnF,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAGzBC,KAA8C,EAC3C;EACH,IAAQC,OAAO,GAA6ED,KAAK,CAAzFC,OAAO;IAAUC,UAAU,GAAyDF,KAAK,CAAhFG,MAAM;IAA2BC,eAAe,GAA2BJ,KAAK,CAA5DK,WAAW;IAA4BC,WAAW,GAAKN,KAAK,CAA9BO,OAAO;EAE1E,IAAAC,eAAA,GAAkC,IAAAC,2BAAc,EAAqB,CAAC;IAAtDC,aAAa,GAAAF,eAAA,CAArBL,MAAM;EACd,IAAAQ,mBAAA,GAAoC,IAAAC,mCAAkB,EAAqB,CAAC;IAA3DC,cAAc,GAAAF,mBAAA,CAAvBJ,OAAO;EAEf,IAAMJ,MAAM,GAAGD,UAAU,IAAIQ,aAAa;EAC1C,IAAMH,OAAO,GAAGD,WAAW,IAAIO,cAAc;EAE7C,IAAAC,qBAAA,GAAgD,IAAAC,4CAAqB,EACnEd,OAAO,EACPE,MAAM,EACNC,eACF,CAAC;IAJOY,oBAAoB,GAAAF,qBAAA,CAApBE,oBAAoB;IAAEC,KAAK,GAAAH,qBAAA,CAALG,KAAK;IAAEC,MAAM,GAAAJ,qBAAA,CAANI,MAAM;EAM3C,OACE,IAAAtB,WAAA,CAAAuB,GAAA,EAACZ,OAAO;IACNN,OAAO,EAAEA,OAAQ;IACjBe,oBAAoB,EAAEA,oBAAqB;IAC3CC,KAAK,EAAEA,KAAM;IACbC,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAACE,OAAA,CAAArB,cAAA,GAAAA,cAAA","ignoreList":[]}

package/lib/module/components/ChannelPreview/hooks/useChannelPreviewData.js

@@ -7,36 +7,69 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _useIsChannelMuted2 = require("./useIsChannelMuted");
-var useChannelPreviewData = function useChannelPreviewData(channel, client, forceUpdate) {
-  var _useState = (0, _react.useState)(channel.state.messages[channel.state.messages.length - 1]),
+var _useLatestMessagePreview = require("./useLatestMessagePreview");
+var _contexts = require("../../../contexts");
+var useChannelPreviewData = function useChannelPreviewData(channel, client, forceUpdateOverride) {
+  var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    lastMessage = _useState2[0],
-    setLastMessage = _useState2[1];
-  var _useState3 = (0, _react.useState)(channel.countUnread()),
+    forceUpdate = _useState2[0],
+    setForceUpdate = _useState2[1];
+  var _useState3 = (0, _react.useState)(channel.state.messages[channel.state.messages.length - 1]),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    unread = _useState4[0],
-    setUnread = _useState4[1];
+    lastMessage = _useState4[0],
+    setLastMessage = _useState4[1];
+  var _useState5 = (0, _react.useState)(channel.countUnread()),
+    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+    unread = _useState6[0],
+    setUnread = _useState6[1];
   var _useIsChannelMuted = (0, _useIsChannelMuted2.useIsChannelMuted)(channel),
     muted = _useIsChannelMuted.muted;
+  var _useChannelsContext = (0, _contexts.useChannelsContext)(),
+    contextForceUpdate = _useChannelsContext.forceUpdate;
+  var channelListForceUpdate = forceUpdateOverride != null ? forceUpdateOverride : contextForceUpdate;
+  var channelLastMessage = channel.lastMessage();
+  var channelLastMessageString = "".concat(channelLastMessage == null ? void 0 : channelLastMessage.id).concat(channelLastMessage == null ? void 0 : channelLastMessage.updated_at);
+  (0, _react.useEffect)(function () {
+    var _client$on = client.on('notification.mark_read', function () {
+        setUnread(channel.countUnread());
+      }),
+      unsubscribe = _client$on.unsubscribe;
+    return unsubscribe;
+  }, [channel, client]);
+  (0, _react.useEffect)(function () {
+    if (channelLastMessage && (channelLastMessage.id !== (lastMessage == null ? void 0 : lastMessage.id) || channelLastMessage.updated_at !== (lastMessage == null ? void 0 : lastMessage.updated_at))) {
+      setLastMessage(channelLastMessage);
+    }
+    var newUnreadCount = channel.countUnread();
+    setUnread(newUnreadCount);
+  }, [channel, channelLastMessageString, channelListForceUpdate]);
   (0, _react.useEffect)(function () {
     var handleReadEvent = function handleReadEvent(event) {
+      var _event$user, _event$user2;
       if (!event.cid) return;
-      if (channel.cid === event.cid) setUnread(0);
+      if (channel.cid !== event.cid) return;
+      if ((event == null ? void 0 : (_event$user = event.user) == null ? void 0 : _event$user.id) === client.userID) {
+        setUnread(0);
+      } else if (event != null && (_event$user2 = event.user) != null && _event$user2.id) {
+        setForceUpdate(function (prev) {
+          return prev + 1;
+        });
+      }
     };
-    var _client$on = client.on('notification.mark_read', handleReadEvent),
-      unsubscribe = _client$on.unsubscribe;
+    var _client$on2 = client.on('message.read', handleReadEvent),
+      unsubscribe = _client$on2.unsubscribe;
     return unsubscribe;
   }, [client, channel]);
   (0, _react.useEffect)(function () {
     var handleUnreadEvent = function handleUnreadEvent(event) {
-      var _event$user, _client$user;
+      var _event$user3, _client$user;
       if (!event.cid) return;
       if (channel.cid !== event.cid) return;
-      if (((_event$user = event.user) == null ? void 0 : _event$user.id) !== ((_client$user = client.user) == null ? void 0 : _client$user.id)) return;
+      if (((_event$user3 = event.user) == null ? void 0 : _event$user3.id) !== ((_client$user = client.user) == null ? void 0 : _client$user.id)) return;
       setUnread(channel.countUnread());
     };
-    var _client$on2 = client.on('notification.mark_unread', handleUnreadEvent),
-      unsubscribe = _client$on2.unsubscribe;
+    var _client$on3 = client.on('notification.mark_unread', handleUnreadEvent),
+      unsubscribe = _client$on3.unsubscribe;
     return unsubscribe;
   }, [client, channel]);
   var refreshUnreadCount = (0, _react.useMemo)(function () {
@@ -54,15 +87,32 @@ var useChannelPreviewData = function useChannelPreviewData(channel, client, forc
       setLastMessage(channel.state.latestMessages[channel.state.latestMessages.length - 1]);
       refreshUnreadCount();
     };
-    var listeners = [channel.on('message.new', handleEvent), channel.on('message.updated', handleEvent), channel.on('message.deleted', handleEvent), channel.on('message.undeleted', handleEvent), channel.on('channel.truncated', handleEvent)];
+    var handleNewMessageEvent = function handleNewMessageEvent(event) {
+      var message = event.message;
+      if (message && (!message.parent_id || message.show_in_channel)) {
+        setLastMessage(message);
+        setUnread(channel.countUnread());
+      }
+    };
+    var handleUpdatedOrDeletedMessage = function handleUpdatedOrDeletedMessage(event) {
+      setLastMessage(function (prevLastMessage) {
+        var _event$message;
+        if ((prevLastMessage == null ? void 0 : prevLastMessage.id) === ((_event$message = event.message) == null ? void 0 : _event$message.id)) {
+          return event.message;
+        }
+        return prevLastMessage;
+      });
+    };
+    var listeners = [channel.on('message.new', handleNewMessageEvent), channel.on('message.updated', handleUpdatedOrDeletedMessage), channel.on('message.deleted', handleUpdatedOrDeletedMessage), channel.on('message.undeleted', handleEvent), channel.on('channel.truncated', handleEvent)];
     return function () {
       return listeners.forEach(function (l) {
         return l.unsubscribe();
       });
     };
-  }, [channel, refreshUnreadCount, forceUpdate]);
+  }, [channel, refreshUnreadCount, forceUpdate, channelListForceUpdate]);
+  var latestMessagePreview = (0, _useLatestMessagePreview.useLatestMessagePreview)(channel, forceUpdate, lastMessage);
   return {
-    lastMessage: lastMessage,
+    latestMessagePreview: latestMessagePreview,
     muted: muted,
     unread: unread
   };

package/lib/module/components/ChannelPreview/hooks/useChannelPreviewData.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_throttle","_interopRequireDefault","_useIsChannelMuted2","useChannelPreviewData","channel","client","forceUpdate","_useState","useState","state","messages","length","_useState2","_slicedToArray2","lastMessage","setLastMessage","_useState3","countUnread","_useState4","unread","setUnread","_useIsChannelMuted","useIsChannelMuted","muted","useEffect","handleReadEvent","event","cid","_client$on","on","unsubscribe","handleUnreadEvent","_event$user","_client$user","user","id","_client$on2","refreshUnreadCount","useMemo","throttle","handleEvent","latestMessages","listeners","forEach","l","exports"],"sourceRoot":"../../../../../src","sources":["components/ChannelPreview/hooks/useChannelPreviewData.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_throttle","_interopRequireDefault","_useIsChannelMuted2","_useLatestMessagePreview","_contexts","useChannelPreviewData","channel","client","forceUpdateOverride","_useState","useState","_useState2","_slicedToArray2","forceUpdate","setForceUpdate","_useState3","state","messages","length","_useState4","lastMessage","setLastMessage","_useState5","countUnread","_useState6","unread","setUnread","_useIsChannelMuted","useIsChannelMuted","muted","_useChannelsContext","useChannelsContext","contextForceUpdate","channelListForceUpdate","channelLastMessage","channelLastMessageString","concat","id","updated_at","useEffect","_client$on","on","unsubscribe","newUnreadCount","handleReadEvent","event","_event$user","_event$user2","cid","user","userID","prev","_client$on2","handleUnreadEvent","_event$user3","_client$user","_client$on3","refreshUnreadCount","useMemo","throttle","handleEvent","latestMessages","handleNewMessageEvent","message","parent_id","show_in_channel","handleUpdatedOrDeletedMessage","prevLastMessage","_event$message","listeners","forEach","l","latestMessagePreview","useLatestMessagePreview","exports"],"sourceRoot":"../../../../../src","sources":["components/ChannelPreview/hooks/useChannelPreviewData.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/components/Message/MessageSimple/utils/generateMarkdownText.js

@@ -34,6 +34,10 @@ var generateMarkdownText = function generateMarkdownText(text) {
     _iterator.f();
   }
   resultText = resultText.replace(/[<"'>]/g, '\\$&');
+  resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, function (_, code) {
+    if (code) return code;
+    return '\n';
+  });
   return resultText;
 };
 exports.generateMarkdownText = generateMarkdownText;

package/lib/module/components/Message/MessageSimple/utils/generateMarkdownText.js.map

@@ -1 +1 @@
-{"version":3,"names":["_truncate","_interopRequireDefault","require","_parseLinks","_utils","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","generateMarkdownText","text","resultText","trim","linkInfos","parseLinksFromText","_iterator","_step","linkInfo","displayLink","truncate","raw","omission","normalRegEx","RegExp","escapeRegExp","markdown","concat","url","replace","mentionsRegex","exports"],"sourceRoot":"../../../../../../src","sources":["components/Message/MessageSimple/utils/generateMarkdownText.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_truncate","_interopRequireDefault","require","_parseLinks","_utils","_createForOfIteratorHelper","o","allowArrayLike","it","Symbol","iterator","Array","isArray","_unsupportedIterableToArray","length","i","F","s","n","done","value","e","_e","f","TypeError","normalCompletion","didErr","err","call","step","next","_e2","minLen","_arrayLikeToArray","Object","prototype","toString","slice","constructor","name","from","test","arr","len","arr2","generateMarkdownText","text","resultText","trim","linkInfos","parseLinksFromText","_iterator","_step","linkInfo","displayLink","truncate","raw","omission","normalRegEx","RegExp","escapeRegExp","markdown","concat","url","replace","mentionsRegex","_","code","exports"],"sourceRoot":"../../../../../../src","sources":["components/Message/MessageSimple/utils/generateMarkdownText.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.42.1"
+  "version": "5.42.2-beta.2"
 }

package/lib/typescript/components/ChannelPreview/ChannelPreview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChannelPreview.d.ts","sourceRoot":"","sources":["../../../../src/components/ChannelPreview/ChannelPreview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAK3C,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,wCAAwC,CAAC;AAE1F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,MAAM,mBAAmB,CAC7B,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,EAAE,SAAS,GAAG,aAAa,CAAC,CAAC,GAAG;IACnF;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACtC,CAAC;AAEJ,eAAO,MAAM,cAAc,yJA0B1B,CAAC"}
+{"version":3,"file":"ChannelPreview.d.ts","sourceRoot":"","sources":["../../../../src/components/ChannelPreview/ChannelPreview.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAI3C,OAAO,EACL,oBAAoB,EAErB,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,wCAAwC,CAAC;AAE1F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,MAAM,mBAAmB,CAC7B,kBAAkB,SAAS,yBAAyB,GAAG,yBAAyB,IAC9E,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,EAAE,SAAS,GAAG,aAAa,CAAC,CAAC,GAAG;IACnF;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;CACtC,CAAC;AAEJ,eAAO,MAAM,cAAc,yJA2B1B,CAAC"}

package/lib/typescript/components/ChannelPreview/hooks/useChannelPreviewData.d.ts

@@ -1,7 +1,7 @@
-import type { Channel, MessageResponse, StreamChat } from 'stream-chat';
+import type { Channel, StreamChat } from 'stream-chat';
 import type { DefaultStreamChatGenerics } from '../../../types/types';
-export declare const useChannelPreviewData: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>, client: StreamChat<StreamChatGenerics>, forceUpdate?: number) => {
-    lastMessage: MessageResponse<StreamChatGenerics> | import("stream-chat").FormatMessageResponse<StreamChatGenerics>;
+export declare const useChannelPreviewData: <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(channel: Channel<StreamChatGenerics>, client: StreamChat<StreamChatGenerics>, forceUpdateOverride?: number) => {
+    latestMessagePreview: import("./useLatestMessagePreview").LatestMessagePreview<StreamChatGenerics>;
     muted: boolean;
     unread: number;
 };

package/lib/typescript/components/ChannelPreview/hooks/useChannelPreviewData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useChannelPreviewData.d.ts","sourceRoot":"","sources":["../../../../../src/components/ChannelPreview/hooks/useChannelPreviewData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAuB,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAI7F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEtE,eAAO,MAAM,qBAAqB,iLAKlB,MAAM;;;;CAsErB,CAAC"}
+{"version":3,"file":"useChannelPreviewData.d.ts","sourceRoot":"","sources":["../../../../../src/components/ChannelPreview/hooks/useChannelPreviewData.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAwC,UAAU,EAAE,MAAM,aAAa,CAAC;AAO7F,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEtE,eAAO,MAAM,qBAAqB,yLAKV,MAAM;;;;CAwH7B,CAAC"}

package/lib/typescript/components/Message/MessageSimple/utils/generateMarkdownText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateMarkdownText.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Message/MessageSimple/utils/generateMarkdownText.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,UAAW,MAAM,kBAgCjD,CAAC"}
+{"version":3,"file":"generateMarkdownText.d.ts","sourceRoot":"","sources":["../../../../../../src/components/Message/MessageSimple/utils/generateMarkdownText.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,UAAW,MAAM,kBAsCjD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stream-chat-react-native-core",
   "description": "The official React Native and Expo components for Stream Chat, a service for building chat applications",
-  "version": "5.42.1",
+  "version": "5.42.2-beta.2",
   "author": {
     "company": "Stream.io Inc",
     "name": "Stream.io Inc"

package/src/components/ChannelPreview/ChannelPreview.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 import type { Channel } from 'stream-chat';
 
 import { useChannelPreviewData } from './hooks/useChannelPreviewData';
-import { useLatestMessagePreview } from './hooks/useLatestMessagePreview';
 
 import {
   ChannelsContextValue,
@@ -31,15 +30,16 @@ export const ChannelPreview = <
   const { channel, client: propClient, forceUpdate: propForceUpdate, Preview: propPreview } = props;
 
   const { client: contextClient } = useChatContext<StreamChatGenerics>();
-  const { forceUpdate: contextForceUpdate, Preview: contextPreview } =
-    useChannelsContext<StreamChatGenerics>();
+  const { Preview: contextPreview } = useChannelsContext<StreamChatGenerics>();
 
   const client = propClient || contextClient;
-  const forceUpdate = propForceUpdate || contextForceUpdate;
   const Preview = propPreview || contextPreview;
 
-  const { lastMessage, muted, unread } = useChannelPreviewData(channel, client, forceUpdate);
-  const latestMessagePreview = useLatestMessagePreview(channel, forceUpdate, lastMessage);
+  const { latestMessagePreview, muted, unread } = useChannelPreviewData(
+    channel,
+    client,
+    propForceUpdate,
+  );
 
   return (
     <Preview

package/src/components/ChannelPreview/__tests__/ChannelPreview.test.tsx

@@ -69,6 +69,15 @@ describe('ChannelPreview', () => {
     );
   };
 
+  const generateChannelWrapper = (overrides: Record<string, unknown>) =>
+    generateChannel({
+      countUnread: jest.fn().mockReturnValue(0),
+      initialized: true,
+      lastMessage: jest.fn().mockReturnValue(generateMessage()),
+      muteStatus: jest.fn().mockReturnValue({ muted: false }),
+      ...overrides,
+    });
+
   const useInitializeChannel = async (c: GetOrCreateChannelApiParams) => {
     useMockedApis(chatClient, [getOrCreateChannelApi(c)]);
 
@@ -89,9 +98,8 @@ describe('ChannelPreview', () => {
     it("should not update the unread count if the event's cid does not match the channel's cid", async () => {
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const c = generateChannel({
+      const c = generateChannelWrapper({
         countUnread: jest.fn().mockReturnValue(10),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
         on: channelOnMock,
       });
 
@@ -117,9 +125,8 @@ describe('ChannelPreview', () => {
     it('should update the unread count to 0', async () => {
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const c = generateChannel({
+      const c = generateChannelWrapper({
         countUnread: jest.fn().mockReturnValue(10),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
         on: channelOnMock,
       });
 
@@ -147,9 +154,7 @@ describe('ChannelPreview', () => {
     it("should not update the unread count if the event's cid is undefined", async () => {
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const c = generateChannel({
-        countUnread: jest.fn().mockReturnValue(0),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
+      const c = generateChannelWrapper({
         on: channelOnMock,
       });
 
@@ -182,9 +187,7 @@ describe('ChannelPreview', () => {
     it("should not update the unread count if the event's cid does not match the channel's cid", async () => {
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const c = generateChannel({
-        countUnread: jest.fn().mockReturnValue(0),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
+      const c = generateChannelWrapper({
         on: channelOnMock,
       });
 
@@ -217,9 +220,7 @@ describe('ChannelPreview', () => {
     it("should not update the unread count if the event's user id does not match the client's user id", async () => {
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const c = generateChannel({
-        countUnread: jest.fn().mockReturnValue(0),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
+      const c = generateChannelWrapper({
         on: channelOnMock,
       });
 
@@ -255,12 +256,10 @@ describe('ChannelPreview', () => {
       await useInitializeChannel(c);
       const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-      const testChannel = {
+      const testChannel = generateChannelWrapper({
         ...channel,
-        countUnread: jest.fn().mockReturnValue(0),
-        muteStatus: jest.fn().mockReturnValue({ muted: false }),
         on: channelOnMock,
-      };
+      });
 
       const { getByTestId } = render(<TestComponent />);
 
@@ -291,9 +290,9 @@ describe('ChannelPreview', () => {
   it('should update the unread count to 0 if the channel is muted', async () => {
     const channelOnMock = jest.fn().mockReturnValue({ unsubscribe: jest.fn() });
 
-    const c = generateChannel({
+    const c = generateChannelWrapper({
       countUnread: jest.fn().mockReturnValue(10),
-      muteStatus: jest.fn().mockReturnValue({ muted: false }),
+      muteStatus: jest.fn().mockReturnValue({ muted: true }),
       on: channelOnMock,
     });
 
@@ -304,7 +303,7 @@ describe('ChannelPreview', () => {
     await waitFor(() => getByTestId('channel-id'));
 
     await waitFor(() => {
-      expect(getByTestId('unread-count')).toHaveTextContent('10');
+      expect(getByTestId('unread-count')).toHaveTextContent('0');
     });
 
     act(() => {

package/src/components/ChannelPreview/hooks/useChannelPreviewData.ts

@@ -5,6 +5,9 @@ import type { Channel, ChannelState, Event, MessageResponse, StreamChat } from '
 
 import { useIsChannelMuted } from './useIsChannelMuted';
 
+import { useLatestMessagePreview } from './useLatestMessagePreview';
+
+import { useChannelsContext } from '../../../contexts';
 import type { DefaultStreamChatGenerics } from '../../../types/types';
 
 export const useChannelPreviewData = <
@@ -12,14 +15,40 @@ export const useChannelPreviewData = <
 >(
   channel: Channel<StreamChatGenerics>,
   client: StreamChat<StreamChatGenerics>,
-  forceUpdate?: number,
+  forceUpdateOverride?: number,
 ) => {
+  const [forceUpdate, setForceUpdate] = useState(0);
   const [lastMessage, setLastMessage] = useState<
     | ReturnType<ChannelState<StreamChatGenerics>['formatMessage']>
     | MessageResponse<StreamChatGenerics>
   >(channel.state.messages[channel.state.messages.length - 1]);
   const [unread, setUnread] = useState(channel.countUnread());
   const { muted } = useIsChannelMuted(channel);
+  const { forceUpdate: contextForceUpdate } = useChannelsContext<StreamChatGenerics>();
+  const channelListForceUpdate = forceUpdateOverride ?? contextForceUpdate;
+
+  const channelLastMessage = channel.lastMessage();
+  const channelLastMessageString = `${channelLastMessage?.id}${channelLastMessage?.updated_at}`;
+
+  useEffect(() => {
+    const { unsubscribe } = client.on('notification.mark_read', () => {
+      setUnread(channel.countUnread());
+    });
+    return unsubscribe;
+  }, [channel, client]);
+
+  useEffect(() => {
+    if (
+      channelLastMessage &&
+      (channelLastMessage.id !== lastMessage?.id ||
+        channelLastMessage.updated_at !== lastMessage?.updated_at)
+    ) {
+      setLastMessage(channelLastMessage);
+    }
+    const newUnreadCount = channel.countUnread();
+    setUnread(newUnreadCount);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [channel, channelLastMessageString, channelListForceUpdate]);
 
   /**
    * This effect listens for the `notification.mark_read` event and sets the unread count to 0
@@ -27,9 +56,14 @@ export const useChannelPreviewData = <
   useEffect(() => {
     const handleReadEvent = (event: Event) => {
       if (!event.cid) return;
-      if (channel.cid === event.cid) setUnread(0);
+      if (channel.cid !== event.cid) return;
+      if (event?.user?.id === client.userID) {
+        setUnread(0);
+      } else if (event?.user?.id) {
+        setForceUpdate((prev) => prev + 1);
+      }
     };
-    const { unsubscribe } = client.on('notification.mark_read', handleReadEvent);
+    const { unsubscribe } = client.on('message.read', handleReadEvent);
     return unsubscribe;
   }, [client, channel]);
 
@@ -70,16 +104,35 @@ export const useChannelPreviewData = <
       refreshUnreadCount();
     };
 
+    const handleNewMessageEvent = (event: Event<StreamChatGenerics>) => {
+      const message = event.message;
+      if (message && (!message.parent_id || message.show_in_channel)) {
+        setLastMessage(message);
+        setUnread(channel.countUnread());
+      }
+    };
+
+    const handleUpdatedOrDeletedMessage = (event: Event<StreamChatGenerics>) => {
+      setLastMessage((prevLastMessage) => {
+        if (prevLastMessage?.id === event.message?.id) {
+          return event.message;
+        }
+        return prevLastMessage;
+      });
+    };
+
     const listeners = [
-      channel.on('message.new', handleEvent),
-      channel.on('message.updated', handleEvent),
-      channel.on('message.deleted', handleEvent),
+      channel.on('message.new', handleNewMessageEvent),
+      channel.on('message.updated', handleUpdatedOrDeletedMessage),
+      channel.on('message.deleted', handleUpdatedOrDeletedMessage),
       channel.on('message.undeleted', handleEvent),
       channel.on('channel.truncated', handleEvent),
     ];
 
     return () => listeners.forEach((l) => l.unsubscribe());
-  }, [channel, refreshUnreadCount, forceUpdate]);
+  }, [channel, refreshUnreadCount, forceUpdate, channelListForceUpdate]);
+
+  const latestMessagePreview = useLatestMessagePreview(channel, forceUpdate, lastMessage);
 
-  return { lastMessage, muted, unread };
+  return { latestMessagePreview, muted, unread };
 };

package/src/components/Message/MessageSimple/utils/generateMarkdownText.ts

@@ -35,5 +35,11 @@ export const generateMarkdownText = (text?: string) => {
 
   resultText = resultText.replace(/[<"'>]/g, '\\$&');
 
+  // Remove whitespaces that come directly after newlines except in code blocks where we deem this allowed.
+  resultText = resultText.replace(/(```[\s\S]*?```|`.*?`)|\n[ ]{2,}/g, (_, code) => {
+    if (code) return code;
+    return '\n';
+  });
+
   return resultText;
 };

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "5.42.1"
+  "version": "5.42.2-beta.2"
 }