stream-chat-react-native-core 5.15.0-beta.7 → 5.15.1-beta.1

package/lib/commonjs/components/Channel/Channel.js

@@ -482,7 +482,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     } else {
       setThread(null);
     }
-  }, [threadPropsExists]);
+  }, [threadPropsExists, shouldSyncChannel]);
   var handleAppBackground = (0, _react.useCallback)(function () {
     var _channelData$own_capa;
     var channelData = channel.data;
@@ -533,61 +533,50 @@ var ChannelWithContext = function ChannelWithContext(props) {
       setWatchers((0, _extends2["default"])({}, channel.state.watchers));
     }
   }, stateUpdateThrottleInterval, throttleOptions)).current;
-  var connectionChangedHandler = function connectionChangedHandler() {
-    if (shouldSyncChannel) {
-      resyncChannel();
-    }
-  };
-  var handleEvent = function handleEvent(event) {
-    if (shouldSyncChannel) {
-      var _event$message;
-      if (thread) {
-        var updatedThreadMessages = thread.id && channel && channel.state.threads[thread.id] || threadMessages;
-        setThreadMessages(updatedThreadMessages);
-      }
-      if (channel && thread && ((_event$message = event.message) == null ? void 0 : _event$message.id) === thread.id) {
-        var updatedThread = channel.state.formatMessage(event.message);
-        setThread(updatedThread);
-      }
-      if (event.type === 'typing.start' || event.type === 'typing.stop') {
-        copyTypingState();
-      } else if (event.type === 'message.read') {
-        copyReadState();
-      } else if (event.type === 'message.new') {
-        copyMessagesState();
-      } else if (channel) {
-        copyChannelState();
-      }
-    }
-  };
   (0, _react.useEffect)(function () {
     var channelSubscriptions = [];
-    var clientSubscriptions = [];
-    if (!channel) return;
-    clientSubscriptions.push(client.on('channel.deleted', function (event) {
-      if (event.cid === channel.cid) {
-        setDeleted(true);
-      }
-    }));
-    if (enableOfflineSupport) {
-      clientSubscriptions.push(_DBSyncManager.DBSyncManager.onSyncStatusChange(connectionChangedHandler));
-    } else {
-      clientSubscriptions.push(client.on('connection.changed', function (event) {
-        if (event.online) {
-          connectionChangedHandler();
-        }
-      }));
+    if (channel && shouldSyncChannel) {
+      channelSubscriptions.push(channel.on('message.new', copyMessagesState));
+      channelSubscriptions.push(channel.on('message.read', copyReadState));
+      channelSubscriptions.push(channel.on('typing.start', copyTypingState));
+      channelSubscriptions.push(channel.on('typing.stop', copyTypingState));
     }
-    channelSubscriptions.push(channel.on(handleEvent));
     return function () {
-      clientSubscriptions.forEach(function (s) {
-        return s.unsubscribe();
-      });
       channelSubscriptions.forEach(function (s) {
         return s.unsubscribe();
       });
     };
-  }, [channelId, connectionChangedHandler, handleEvent]);
+  }, [channelId, shouldSyncChannel]);
+  (0, _react.useEffect)(function () {
+    var handleEvent = function handleEvent(event) {
+      if (shouldSyncChannel) {
+        var _event$message;
+        if (thread) {
+          var updatedThreadMessages = thread.id && channel && channel.state.threads[thread.id] || threadMessages;
+          setThreadMessages(updatedThreadMessages);
+        }
+        if (channel && thread && ((_event$message = event.message) == null ? void 0 : _event$message.id) === thread.id) {
+          var updatedThread = channel.state.formatMessage(event.message);
+          setThread(updatedThread);
+        }
+        if (channel && event.type !== 'message.new' && event.type !== 'message.read' && event.type !== 'typing.start' && event.type !== 'typing.stop') {
+          copyChannelState();
+        }
+      }
+    };
+    var _channel$on = channel.on(handleEvent),
+      unsubscribe = _channel$on.unsubscribe;
+    return unsubscribe;
+  }, [channelId, thread == null ? void 0 : thread.id, shouldSyncChannel]);
+  (0, _react.useEffect)(function () {
+    var _client$on = client.on('channel.deleted', function (event) {
+        if (event.cid === (channel == null ? void 0 : channel.cid)) {
+          setDeleted(true);
+        }
+      }),
+      unsubscribe = _client$on.unsubscribe;
+    return unsubscribe;
+  }, [channelId]);
   var channelQueryCallRef = (0, _react.useRef)(function () {
     var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee(queryCall) {
       var onAfterQueryCall,
@@ -927,6 +916,28 @@ var ChannelWithContext = function ChannelWithContext(props) {
       return _ref9.apply(this, arguments);
     };
   }();
+  var resyncChannelRef = (0, _react.useRef)(resyncChannel);
+  resyncChannelRef.current = resyncChannel;
+  (0, _react.useEffect)(function () {
+    var connectionChangedHandler = function connectionChangedHandler() {
+      if (shouldSyncChannel) {
+        resyncChannelRef.current();
+      }
+    };
+    var connectionChangedSubscription;
+    if (enableOfflineSupport) {
+      connectionChangedSubscription = _DBSyncManager.DBSyncManager.onSyncStatusChange(connectionChangedHandler);
+    } else {
+      connectionChangedSubscription = client.on('connection.changed', function (event) {
+        if (event.online) {
+          connectionChangedHandler();
+        }
+      });
+    }
+    return function () {
+      connectionChangedSubscription.unsubscribe();
+    };
+  }, [enableOfflineSupport, shouldSyncChannel]);
   var reloadChannel = function reloadChannel() {
     return channelQueryCallRef.current((0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee8() {
       return _regenerator["default"].wrap(function _callee8$(_context8) {
@@ -2015,7 +2026,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2001,
+        lineNumber: 2018,
         columnNumber: 12
       }
     });
@@ -2029,7 +2040,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
       __self: _this,
       __source: {
         fileName: _jsxFileName,
-        lineNumber: 2006,
+        lineNumber: 2023,
         columnNumber: 7
       }
     }, t('Please select a channel first'));
@@ -2042,7 +2053,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2013,
+      lineNumber: 2030,
       columnNumber: 5
     }
   }), _react["default"].createElement(_ChannelContext.ChannelProvider, {
@@ -2050,7 +2061,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2019,
+      lineNumber: 2036,
       columnNumber: 7
     }
   }, _react["default"].createElement(_OwnCapabilitiesContext.OwnCapabilitiesProvider, {
@@ -2058,7 +2069,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2020,
+      lineNumber: 2037,
       columnNumber: 9
     }
   }, _react["default"].createElement(_TypingContext.TypingProvider, {
@@ -2066,7 +2077,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2021,
+      lineNumber: 2038,
       columnNumber: 11
     }
   }, _react["default"].createElement(_PaginatedMessageListContext.PaginatedMessageListProvider, {
@@ -2074,7 +2085,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2022,
+      lineNumber: 2039,
       columnNumber: 13
     }
   }, _react["default"].createElement(_MessagesContext.MessagesProvider, {
@@ -2082,7 +2093,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2023,
+      lineNumber: 2040,
       columnNumber: 15
     }
   }, _react["default"].createElement(_ThreadContext.ThreadProvider, {
@@ -2090,7 +2101,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2024,
+      lineNumber: 2041,
       columnNumber: 17
     }
   }, _react["default"].createElement(_SuggestionsContext.SuggestionsProvider, {
@@ -2098,7 +2109,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2025,
+      lineNumber: 2042,
       columnNumber: 19
     }
   }, _react["default"].createElement(_MessageInputContext.MessageInputProvider, {
@@ -2106,7 +2117,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2026,
+      lineNumber: 2043,
       columnNumber: 21
     }
   }, _react["default"].createElement(_reactNative.View, {
@@ -2116,7 +2127,7 @@ var ChannelWithContext = function ChannelWithContext(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2027,
+      lineNumber: 2044,
       columnNumber: 23
     }
   }, children))))))))));
@@ -2167,7 +2178,7 @@ var Channel = function Channel(props) {
     __self: _this,
     __source: {
       fileName: _jsxFileName,
-      lineNumber: 2084,
+      lineNumber: 2101,
       columnNumber: 5
     }
   }));