Merge pull request #1944 from GetStream/develop

vanGalilea · web-flow · commit 9e70cdd58277 · 2023-02-02T13:59:02.000+01:00
diff --git a/docusaurus/docs/reactnative/basics/offline_support.mdx b/docusaurus/docs/reactnative/basics/offline_support.mdx
@@ -28,12 +28,14 @@ The following features are currently **NOT** implemented. They will be implement
 First and foremost make sure to follow all steps from [Migrating to v5](./upgrade_helper.mdx) guide.
 To enable offline support, please follow the given steps:
 
-1. **Upgrade stream-chat dependency (optional)**
+1. **Remove stream-chat dependency (when applicable)**
 
-If you have installed `stream-chat` dependency explicitly on your application, then please make sure to upgrade it to v7 or higher.
+If you have installed `stream-chat` dependency explicitly on your application, then please make sure you remove it.
+Our Chat SDK (`stream-chat-react-native`) has `stream-chat` as a dependency (not peer dependency).
+Therefore, having `stream-chat` in your app's package.json is discouraged and will probably cause random issues that will disturb the chat functionalities.
 
 ```bash
-yarn add stream-chat
+yarn remove stream-chat
 ```
 
 2. **Add `react-native-quick-sqlite` dependency**
diff --git a/docusaurus/docs/reactnative/basics/upgrade_helper.mdx b/docusaurus/docs/reactnative/basics/upgrade_helper.mdx
@@ -19,11 +19,15 @@ The following values in [`ImageGalleryContext`](../../contexts/image-gallery-con
 
 ## Dependency Changes
 
-- If you have installed `stream-chat` dependency explicitly in your application, then upgrade it to v7:
+## Remove stream-chat dependency (when applicable)
 
-  ```bash
-  yarn add stream-chat@7.0.0
-  ```
+If you have installed `stream-chat` dependency explicitly on your application, then please make sure you remove it.
+Our Chat SDK (`stream-chat-react-native`) has `stream-chat` as a dependency (not peer dependency).
+Therefore, having `stream-chat` in your app's package.json is discouraged and will probably cause random issues that will disturb the chat functionalities.
+
+```bash
+yarn remove stream-chat
+```
 
 - Replace [`@react-native-community/cameraroll`](https://github.com/react-native-cameraroll/react-native-cameraroll) dependency with [`@react-native-camera-roll/camera-roll`](https://www.npmjs.com/package/@react-native-camera-roll/camera-roll):
 
diff --git a/examples/ExpoMessaging/yarn.lock b/examples/ExpoMessaging/yarn.lock
@@ -6665,10 +6665,10 @@ stream-buffers@2.2.x:
   version "0.0.0"
   uid ""
 
-stream-chat-react-native-core@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.8.0.tgz#650e224be1663be363044bad0f1244582f8c7d4f"
-  integrity sha512-YhnWeVwdYCpoyFdbYwizDKFWdIU8DgMUduA/mA1tvaSkFRQqFIAoJeIEqd5TeMjQnAPLXvZXkdhqAXy9FjVhjw==
+stream-chat-react-native-core@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.9.0.tgz#a226a1f9d629d1f3e212df1f2a46312c544bc0bb"
+  integrity sha512-goG9dyDpVopspGt3gq31ILkwEzdolo0+CdhcpVeGmOB2CZ0tF9X78uByrj4/7VsqpCkC0hi4uMSEsERM3DZdbg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/examples/SampleApp/App.tsx b/examples/SampleApp/App.tsx
@@ -185,6 +185,7 @@ const DrawerNavigatorWrapper: React.FC<{
         <Chat<StreamChatGenerics>
           client={chatClient}
           enableOfflineSupport
+          // @ts-expect-error
           ImageComponent={FastImage}
         >
           <AppOverlayProvider>
diff --git a/examples/SampleApp/src/context/AppOverlayProvider.tsx b/examples/SampleApp/src/context/AppOverlayProvider.tsx
@@ -18,9 +18,11 @@ import { BottomSheetOverlayProvider } from './BottomSheetOverlayContext';
 import { ChannelInfoOverlayProvider } from './ChannelInfoOverlayContext';
 import { UserInfoOverlayProvider } from './UserInfoOverlayContext';
 
-export const AppOverlayProvider: React.FC<{
-  value?: Partial<AppOverlayContextValue>;
-}> = (props) => {
+export const AppOverlayProvider = (
+  props: React.PropsWithChildren<{
+    value?: Partial<AppOverlayContextValue>;
+  }>,
+) => {
   const { children, value } = props;
 
   const [overlay, setOverlay] = useState(value?.overlay || 'none');
diff --git a/examples/SampleApp/src/context/UserSearchContext.tsx b/examples/SampleApp/src/context/UserSearchContext.tsx
@@ -6,9 +6,10 @@ export type UserSearchContextValue = PaginatedUsers;
 
 export const UserSearchContext = React.createContext({} as UserSearchContextValue);
 
-export const UserSearchProvider: React.FC<{
-  value?: UserSearchContextValue;
-}> = ({ children, value }) => {
+export const UserSearchProvider = (
+  props: React.PropsWithChildren<{ value?: UserSearchContextValue }>,
+) => {
+  const { children, value } = props;
   const paginatedUsers = usePaginatedUsers();
 
   const userSearchContext = { ...paginatedUsers, ...value };
diff --git a/examples/SampleApp/yarn.lock b/examples/SampleApp/yarn.lock
@@ -1193,11 +1193,6 @@
   resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.2.1.tgz#3cffbe2a368e47f14578bda2b244790a7119f662"
   integrity sha512-axWwlLj/3E5PIjXcN2y2XZzK/hYTx73kDlQJpHpcurejmQR9sU22w3cs+YltaNkZGl3y7Eu/LbiPEkGIwNVQow==
 
-"@react-native-clipboard/clipboard@^1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.1.tgz#d3a9e685ce2383b1e92b89a334896c5575cc103d"
-  integrity sha512-nvSIIHzybVWqYxcJE5hpT17ekxAAg383Ggzw5WrYHtkKX61N1AwaKSNmXs5xHV7pmKSOe/yWjtSwxIzfW51I5Q==
-
 "@react-native-community/cli-clean@^9.2.1":
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-9.2.1.tgz#198c5dd39c432efb5374582073065ff75d67d018"
@@ -7603,10 +7598,10 @@ stream-buffers@2.2.x:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-stream-chat-react-native-core@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.8.0.tgz#650e224be1663be363044bad0f1244582f8c7d4f"
-  integrity sha512-YhnWeVwdYCpoyFdbYwizDKFWdIU8DgMUduA/mA1tvaSkFRQqFIAoJeIEqd5TeMjQnAPLXvZXkdhqAXy9FjVhjw==
+stream-chat-react-native-core@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.9.0.tgz#a226a1f9d629d1f3e212df1f2a46312c544bc0bb"
+  integrity sha512-goG9dyDpVopspGt3gq31ILkwEzdolo0+CdhcpVeGmOB2CZ0tF9X78uByrj4/7VsqpCkC0hi4uMSEsERM3DZdbg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/examples/TypeScriptMessaging/yarn.lock b/examples/TypeScriptMessaging/yarn.lock
@@ -1111,11 +1111,6 @@
   resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.2.1.tgz#3cffbe2a368e47f14578bda2b244790a7119f662"
   integrity sha512-axWwlLj/3E5PIjXcN2y2XZzK/hYTx73kDlQJpHpcurejmQR9sU22w3cs+YltaNkZGl3y7Eu/LbiPEkGIwNVQow==
 
-"@react-native-clipboard/clipboard@^1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.1.tgz#d3a9e685ce2383b1e92b89a334896c5575cc103d"
-  integrity sha512-nvSIIHzybVWqYxcJE5hpT17ekxAAg383Ggzw5WrYHtkKX61N1AwaKSNmXs5xHV7pmKSOe/yWjtSwxIzfW51I5Q==
-
 "@react-native-community/cli-clean@^9.2.1":
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-9.2.1.tgz#198c5dd39c432efb5374582073065ff75d67d018"
@@ -7166,10 +7161,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.8.0.tgz#650e224be1663be363044bad0f1244582f8c7d4f"
-  integrity sha512-YhnWeVwdYCpoyFdbYwizDKFWdIU8DgMUduA/mA1tvaSkFRQqFIAoJeIEqd5TeMjQnAPLXvZXkdhqAXy9FjVhjw==
+stream-chat-react-native-core@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.9.0.tgz#a226a1f9d629d1f3e212df1f2a46312c544bc0bb"
+  integrity sha512-goG9dyDpVopspGt3gq31ILkwEzdolo0+CdhcpVeGmOB2CZ0tF9X78uByrj4/7VsqpCkC0hi4uMSEsERM3DZdbg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/package/expo-package/yarn.lock b/package/expo-package/yarn.lock
@@ -2998,10 +2998,10 @@ stream-buffers@2.2.x:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-stream-chat-react-native-core@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.8.0.tgz#650e224be1663be363044bad0f1244582f8c7d4f"
-  integrity sha512-YhnWeVwdYCpoyFdbYwizDKFWdIU8DgMUduA/mA1tvaSkFRQqFIAoJeIEqd5TeMjQnAPLXvZXkdhqAXy9FjVhjw==
+stream-chat-react-native-core@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.9.0.tgz#a226a1f9d629d1f3e212df1f2a46312c544bc0bb"
+  integrity sha512-goG9dyDpVopspGt3gq31ILkwEzdolo0+CdhcpVeGmOB2CZ0tF9X78uByrj4/7VsqpCkC0hi4uMSEsERM3DZdbg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/package/native-package/package.json b/package/native-package/package.json
@@ -23,7 +23,13 @@
     "react-native-haptic-feedback": ">=1.11.0",
     "react-native-image-crop-picker": ">=0.33.2",
     "react-native-image-resizer": ">=1.4.2",
-    "react-native-share": ">=4.1.0"
+    "react-native-share": ">=4.1.0",
+    "@react-native-clipboard/clipboard": "^1.11.1"
+  },
+  "peerDependenciesMeta": {
+    "@react-native-clipboard/clipboard": {
+      "optional": true
+    }
   },
   "scripts": {
     "prepack": " cp ../../README.md .",
@@ -41,8 +47,5 @@
     "react-native-image-crop-picker": "^0.38.0",
     "react-native-image-resizer": ">=1.4.2",
     "react-native-share": ">=4.1.0"
-  },
-  "optionalDependencies": {
-    "@react-native-clipboard/clipboard": "^1.11.1"
   }
 }
diff --git a/package/native-package/yarn.lock b/package/native-package/yarn.lock
@@ -879,11 +879,6 @@
   resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.2.1.tgz#3cffbe2a368e47f14578bda2b244790a7119f662"
   integrity sha512-axWwlLj/3E5PIjXcN2y2XZzK/hYTx73kDlQJpHpcurejmQR9sU22w3cs+YltaNkZGl3y7Eu/LbiPEkGIwNVQow==
 
-"@react-native-clipboard/clipboard@^1.11.1":
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.1.tgz#d3a9e685ce2383b1e92b89a334896c5575cc103d"
-  integrity sha512-nvSIIHzybVWqYxcJE5hpT17ekxAAg383Ggzw5WrYHtkKX61N1AwaKSNmXs5xHV7pmKSOe/yWjtSwxIzfW51I5Q==
-
 "@react-native-community/cli-clean@^10.1.1":
   version "10.1.1"
   resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-10.1.1.tgz#4c73ce93a63a24d70c0089d4025daac8184ff504"
@@ -4408,10 +4403,10 @@ statuses@~1.5.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-stream-chat-react-native-core@5.8.0:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.8.0.tgz#650e224be1663be363044bad0f1244582f8c7d4f"
-  integrity sha512-YhnWeVwdYCpoyFdbYwizDKFWdIU8DgMUduA/mA1tvaSkFRQqFIAoJeIEqd5TeMjQnAPLXvZXkdhqAXy9FjVhjw==
+stream-chat-react-native-core@5.9.0:
+  version "5.9.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.9.0.tgz#a226a1f9d629d1f3e212df1f2a46312c544bc0bb"
+  integrity sha512-goG9dyDpVopspGt3gq31ILkwEzdolo0+CdhcpVeGmOB2CZ0tF9X78uByrj4/7VsqpCkC0hi4uMSEsERM3DZdbg==
   dependencies:
     "@babel/runtime" "^7.12.5"
     "@gorhom/bottom-sheet" "4.4.5"
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
@@ -35,8 +35,8 @@ import { useCreateTypingContext } from './hooks/useCreateTypingContext';
 import { useTargetedMessage } from './hooks/useTargetedMessage';
 
 import { ChannelContextValue, ChannelProvider } from '../../contexts/channelContext/ChannelContext';
-import { useChannelState } from '../../contexts/channelsStateContext/useChannelState';
 import type { UseChannelStateValue } from '../../contexts/channelsStateContext/useChannelState';
+import { useChannelState } from '../../contexts/channelsStateContext/useChannelState';
 import { ChatContextValue, useChatContext } from '../../contexts/chatContext/ChatContext';
 import {
   InputMessageInputContextValue,
@@ -771,25 +771,29 @@ const ChannelWithContext = <
     const channelSubscriptions: Array<ReturnType<ChannelType['on']>> = [];
     const clientSubscriptions: Array<ReturnType<StreamChat['on']>> = [];
 
-    const subscribe = () => {
-      if (!channel) return;
+    if (!channel) return;
 
-      /**
-       * The more complex sync logic around internet connectivity (NetInfo) is part of Chat.tsx
-       * listen to client.connection.recovered and all channel events
-       */
+    clientSubscriptions.push(
+      client.on('channel.deleted', (event) => {
+        if (event.cid === channel.cid) {
+          setDeleted(true);
+        }
+      }),
+    );
+
+    if (enableOfflineSupport) {
       clientSubscriptions.push(DBSyncManager.onSyncStatusChange(connectionChangedHandler));
+    } else {
       clientSubscriptions.push(
-        client.on('channel.deleted', (event) => {
-          if (event.cid === channel.cid) {
-            setDeleted(true);
+        client.on('connection.changed', (event) => {
+          if (event.online) {
+            connectionChangedHandler();
           }
         }),
       );
-      channelSubscriptions.push(channel.on(handleEvent));
-    };
+    }
 
-    subscribe();
+    channelSubscriptions.push(channel.on(handleEvent));
 
     return () => {
       clientSubscriptions.forEach((s) => s.unsubscribe());

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,7 @@ const DrawerNavigatorWrapper: React.FC<{`
`185`	`185`	`<Chat<StreamChatGenerics>`
`186`	`186`	`client={chatClient}`
`187`	`187`	`enableOfflineSupport`
	`188`	`+ // @ts-expect-error`
`188`	`189`	`ImageComponent={FastImage}`
`189`	`190`	`>`
`190`	`191`	`<AppOverlayProvider>`