chore: fix merge conflicts form v6.0.0

GetStream · Jun 7, 2024 · 84d0745 · 84d0745
2 parents a139f9f + e9f8a52
commit 84d0745
Show file tree

Hide file tree

Showing 50 changed files with 1,386 additions and 1,849 deletions.
diff --git a/docusaurus/docs/reactnative/basics/client.mdx b/docusaurus/docs/reactnative/basics/client.mdx
@@ -31,11 +31,11 @@ const client = StreamChat.getInstance('api_key');
 **Usage of `StreamChat.getInstance()` available since [email protected].**
 
 <br />
-This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and retrieve
-it wherever you need it on your app to perform API calls. After calling it once, any following <code>
+This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and
+retrieve it wherever you need it on your app to perform API calls. After calling it once, any following <code>
   getInstance
-</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple StreamChat
-instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
+</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple
+StreamChat instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
 <br />
 <br />
 

diff --git a/...urus/docs/reactnative/common-content/contexts/message-input-context/editing.mdx b/...urus/docs/reactnative/common-content/contexts/message-input-context/editing.mdx
@@ -1,5 +1,5 @@
 Defined with message type if the user is editing some message within `MessageInput` component else its undefined.
 
-| Type    |
-| ------- |
-| Boolean |
+| Type                    |
+| ----------------------- |
+| `Message`\| `undefined` |
diff --git a/...cs/reactnative/common-content/contexts/message-input-context/quoted_message.mdx b/...cs/reactnative/common-content/contexts/message-input-context/quoted_message.mdx
@@ -1,5 +1,5 @@
 Message that is quoted to the original message
 
-| Type                        |
-| --------------------------- |
-| `Boolean` \| `Message` type |
+| Type                    |
+| ----------------------- |
+| `Message`\| `undefined` |
diff --git a/docusaurus/docs/reactnative/customization/native-handlers.mdx b/docusaurus/docs/reactnative/customization/native-handlers.mdx
@@ -62,14 +62,6 @@ A function that deletes a file at a given local `uri`.
 | ---------------------------------------------------------------- | -------------------------------------------------------------------------- |
 | [`react-native-fs`](https://github.com/itinance/react-native-fs) | [`expo-file-system`](https://docs.expo.io/versions/latest/sdk/filesystem/) |
 
-### `FlatList`
-
-A FlatList component, on Expo the standard React Native component is used, on React Native a modified FlatList better fit for two directional scrolling is used.
-
-| React Native CLI                                                           | Expo                                                    |
-| -------------------------------------------------------------------------- | ------------------------------------------------------- |
-| [`@stream-io/flat-list-mvcp`](https://github.com/GetStream/flat-list-mvcp) | [`react-native`](https://reactnative.dev/docs/flatlist) |
-
 ### `getLocalAssetUri`
 
 A function that gets the local `uri` of an image or remote asset.
@@ -86,14 +78,6 @@ A function that returns photos from the camera roll given an offset of `after` a
 | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
 | [`@react-native-camera-roll/camera-roll`](https://github.com/react-native-cameraroll/react-native-cameraroll) | [`expo-media-library`](https://docs.expo.io/versions/latest/sdk/media-library/) |
 
-### `NetInfo`
-
-A object containing two keys, `addEventListener` and `fetch`, which are functions that allow a developer to add listeners to `NetInfo` or fetch information from `NetInfo`.
-
-| React Native CLI                                                                                  | Expo                                                                                              |
-| ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- |
-| [`@react-native-community/netinfo`](https://github.com/react-native-netinfo/react-native-netinfo) | [`@react-native-community/netinfo`](https://github.com/react-native-netinfo/react-native-netinfo) |
-
 ### `pickDocument`
 
 A function to open the document picker and return documents picked from it.

diff --git a/docusaurus/docs/reactnative/state-and-offline-support/state-overview.mdx b/docusaurus/docs/reactnative/state-and-offline-support/state-overview.mdx
@@ -30,11 +30,11 @@ const client = StreamChat.getInstance('api_key');
 **Usage of `StreamChat.getInstance()` available since [email protected].**
 
 <br />
-This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and retrieve
-it wherever you need it on your app to perform API calls. After calling it once, any following <code>
+This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and
+retrieve it wherever you need it on your app to perform API calls. After calling it once, any following <code>
   getInstance
-</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple StreamChat
-instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
+</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple
+StreamChat instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
 <br />
 <br />
 

diff --git a/docusaurus/reactnative_versioned_docs/version-3.x.x/basics/client.mdx b/docusaurus/reactnative_versioned_docs/version-3.x.x/basics/client.mdx
@@ -31,11 +31,11 @@ const client = StreamChat.getInstance('api_key');
 **Usage of `StreamChat.getInstance()` available since [email protected].**
 
 <br />
-This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and retrieve
-it wherever you need it on your app to perform API calls. After calling it once, any following <code>
+This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and
+retrieve it wherever you need it on your app to perform API calls. After calling it once, any following <code>
   getInstance
-</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple StreamChat
-instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
+</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple
+StreamChat instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
 <br />
 <br />
 

diff --git a/...reactnative_versioned_docs/version-3.x.x/basics/stream_chat_with_navigation.mdx b/...reactnative_versioned_docs/version-3.x.x/basics/stream_chat_with_navigation.mdx
@@ -21,13 +21,12 @@ The guidance provided makes the assumption you are using [React Navigation](http
 
 <code>createNativeStackNavigator</code> uses the native APIs <code>UINavigationController</code> on iOS and <code>
   Fragment
-</code> on Android. The <code>OverlayProvider</code> needs to exist in a view that can render content in front of the chat
-screen. Therefore using a <code>fullScreenModal</code> with <code>createNativeStackNavigator</code>, which uses <code>
+</code> on Android. The <code>OverlayProvider</code> needs to exist in a view that can render content in front of the
+chat screen. Therefore using a <code>fullScreenModal</code> with <code>createNativeStackNavigator</code>, which uses <code>
   UIModalPresentationFullScreen
-</code> on iOS and <code>modal</code> on Android, to render your chat screen will leave the <code>
-  OverlayProvider
-</code> rendered behind the chat. If you are having issues we suggest you get in touch with support and we can find a
-solution to your specific navigation arrangement.
+</code> on iOS and <code>modal</code> on Android, to render your chat screen will leave the <code>OverlayProvider</code> rendered
+behind the chat. If you are having issues we suggest you get in touch with support and we can find a solution to your
+specific navigation arrangement.
 
 :::
 

diff --git a/docusaurus/reactnative_versioned_docs/version-4.x.x/basics/client.mdx b/docusaurus/reactnative_versioned_docs/version-4.x.x/basics/client.mdx
@@ -31,11 +31,11 @@ const client = StreamChat.getInstance('api_key');
 **Usage of `StreamChat.getInstance()` available since [email protected].**
 
 <br />
-This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and retrieve
-it wherever you need it on your app to perform API calls. After calling it once, any following <code>
+This new Singleton pattern allows you to instantiate a unique StreamChat client, i.e create a StreamChat instance and
+retrieve it wherever you need it on your app to perform API calls. After calling it once, any following <code>
   getInstance
-</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple StreamChat
-instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
+</code> call will return the initial StreamChat instance. This will prevent you from accidentally creating multiple
+StreamChat instances, opening multiple WebSockets, and driving up your concurrent connections unnecessarily.
 <br />
 <br />
 

diff --git a/...reactnative_versioned_docs/version-4.x.x/basics/stream_chat_with_navigation.mdx b/...reactnative_versioned_docs/version-4.x.x/basics/stream_chat_with_navigation.mdx
@@ -21,13 +21,12 @@ The guidance provided makes the assumption you are using [React Navigation](http
 
 <code>createNativeStackNavigator</code> uses the native APIs <code>UINavigationController</code> on iOS and <code>
   Fragment
-</code> on Android. The <code>OverlayProvider</code> needs to exist in a view that can render content in front of the chat
-screen. Therefore using a <code>fullScreenModal</code> with <code>createNativeStackNavigator</code>, which uses <code>
+</code> on Android. The <code>OverlayProvider</code> needs to exist in a view that can render content in front of the
+chat screen. Therefore using a <code>fullScreenModal</code> with <code>createNativeStackNavigator</code>, which uses <code>
   UIModalPresentationFullScreen
-</code> on iOS and <code>modal</code> on Android, to render your chat screen will leave the <code>
-  OverlayProvider
-</code> rendered behind the chat. If you are having issues we suggest you get in touch with support and we can find a
-solution to your specific navigation arrangement.
+</code> on iOS and <code>modal</code> on Android, to render your chat screen will leave the <code>OverlayProvider</code> rendered
+behind the chat. If you are having issues we suggest you get in touch with support and we can find a solution to your
+specific navigation arrangement.
 
 :::
 

diff --git a/examples/ExpoMessaging/yarn.lock b/examples/ExpoMessaging/yarn.lock
@@ -7327,10 +7327,10 @@ [email protected]:
   version "0.0.0"
   uid ""
 
-stream-chat-react-native-core@5.29.0:
-  version "5.29.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.29.0.tgz#b89d5f954c2063316ab6dc254e0b98188f01524d"
-  integrity sha512-cm8CQUIHPE+hHxM1hVQ6V3ogUJLpGPRZBvMYbJW7+MBdhUTn4+40EqEbqHTEtHdkLgPUmxaDJsh/gFCtVEGgog==
+stream-chat-react-native-core@5.31.1:
+  version "5.31.1"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.31.1.tgz#4367276c8316d325e6b062e4efb95d464d4e2eef"
+  integrity sha512-EKHMQ0bWRoyubTxk1IKEbkIzcIY5hxHDpyGU7ObGXLLnhoVBEDranZBQ7dNDdbuM88uKh9mGK5WH4NQSTioKxQ==
   dependencies:
     "@gorhom/bottom-sheet" "4.4.8"
     dayjs "1.10.5"
@@ -7342,27 +7342,12 @@ [email protected]:
     path "0.12.7"
     react-native-markdown-package "1.8.2"
     react-native-url-polyfill "^1.3.0"
-    stream-chat "8.17.0"
+    stream-chat "8.31.0"
 
 "stream-chat-react-native-core@link:../../package":
   version "0.0.0"
   uid ""
 
-[email protected]:
-  version "8.17.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.17.0.tgz#01c4aacbcdb5dd734b088e70f40cd42a0bcd0fb7"
-  integrity sha512-0cYKSroKGiLilElk8Ol6AKAowWIIpXz3wsY97o+cAqixOwwHdnbuPZ00L2CzAjNB2c94Vl5L48n1K+9iOEpv3w==
-  dependencies:
-    "@babel/runtime" "^7.16.3"
-    "@types/jsonwebtoken" "~9.0.0"
-    "@types/ws" "^7.4.0"
-    axios "^1.6.0"
-    base64-js "^1.5.1"
-    form-data "^4.0.0"
-    isomorphic-ws "^4.0.1"
-    jsonwebtoken "~9.0.0"
-    ws "^7.4.4"
-
 [email protected]:
   version "8.31.0"
   resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.31.0.tgz#387ed3109ac930e222bf260d98afc37dd1fcb1ac"

diff --git a/examples/SampleApp/package.json b/examples/SampleApp/package.json
@@ -34,7 +34,6 @@
     "@react-navigation/drawer": "6.6.9",
     "@react-navigation/native": "^6.1.12",
     "@react-navigation/stack": "^6.3.0",
-    "@stream-io/flat-list-mvcp": "0.10.3",
     "react": "18.2.0",
     "react-native": "^0.73.0",
     "react-native-audio-recorder-player": "^3.6.7",

diff --git a/examples/SampleApp/yarn.lock b/examples/SampleApp/yarn.lock
@@ -2066,11 +2066,6 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@stream-io/[email protected]":
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/@stream-io/flat-list-mvcp/-/flat-list-mvcp-0.10.3.tgz#774e56aba7f3da5a8f2ae5ad3065f05e5a27e7f2"
-  integrity sha512-2ZK8piYlEfKIPZrH8BpZz9uj8HZcUvMCV0X7qSLSAc/vhLOANBfR0SSn0OaWPbqb2mFGAd4FxmLSPp1zKEYuaw==
-
 "@types/babel__core@^7.1.14":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"

diff --git a/examples/TypeScriptMessaging/ios/Podfile.lock b/examples/TypeScriptMessaging/ios/Podfile.lock
@@ -955,7 +955,7 @@ PODS:
     - React-Core
   - react-native-image-resizer (3.0.10):
     - React-Core
-  - react-native-netinfo (11.3.0):
+  - react-native-netinfo (11.3.2):
     - React-Core
   - react-native-quick-sqlite (8.0.2):
     - React

diff --git a/examples/TypeScriptMessaging/package.json b/examples/TypeScriptMessaging/package.json
@@ -16,10 +16,9 @@
     "@react-native-camera-roll/camera-roll": "^5.3.1",
     "@react-native-clipboard/clipboard": "^1.10.0",
     "@react-native-community/masked-view": "0.1.11",
-    "@react-native-community/netinfo": "^11.0.1",
+    "@react-native-community/netinfo": "^11.3.2",
     "@react-navigation/native": "^6.0.8",
     "@react-navigation/stack": "^6.2.0",
-    "@stream-io/flat-list-mvcp": "0.10.3",
     "react": "18.2.0",
     "react-native": "^0.73.6",
     "react-native-audio-recorder-player": "3.6.6",

diff --git a/examples/TypeScriptMessaging/yarn.lock b/examples/TypeScriptMessaging/yarn.lock
@@ -2062,10 +2062,10 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.11.tgz#2f4c6e10bee0786abff4604e39a37ded6f3980ce"
   integrity sha512-rQfMIGSR/1r/SyN87+VD8xHHzDYeHaJq6elOSCAD+0iLagXkSI2pfA0LmSXP21uw5i3em7GkkRjfJ8wpqWXZNw==
 
-"@react-native-community/netinfo@^11.0.1":
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.0.tgz#9d99ba00138b38350a794eab5eca436f6e209114"
-  integrity sha512-mR9iqUi0GzuC8ut+goI/lLkgG+a2OViI1mjSdXHKZnkfdJVjHblyWX3xoA8GE4GH8X4r0X/PNM3Vvyf2FH9mVg==
+"@react-native-community/netinfo@^11.3.2":
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.2.tgz#e63201d0b87ad42d086d1003be48ae7b327f0594"
+  integrity sha512-YsaS3Dutnzqd1BEoeC+DEcuNJedYRkN6Ef3kftT5Sm8ExnCF94C/nl4laNxuvFli3+Jz8Df3jO25Jn8A9S0h4w==
 
 "@react-native/[email protected]":
   version "0.73.1"
@@ -2369,11 +2369,6 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@stream-io/[email protected]":
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/@stream-io/flat-list-mvcp/-/flat-list-mvcp-0.10.3.tgz#774e56aba7f3da5a8f2ae5ad3065f05e5a27e7f2"
-  integrity sha512-2ZK8piYlEfKIPZrH8BpZz9uj8HZcUvMCV0X7qSLSAc/vhLOANBfR0SSn0OaWPbqb2mFGAd4FxmLSPp1zKEYuaw==
-
 "@types/babel__core@^7.1.14":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"

diff --git a/package/expo-package/package.json b/package/expo-package/package.json
@@ -13,16 +13,16 @@
     "stream-chat-react-native-core": "5.31.1"
   },
   "peerDependencies": {
-    "@react-native-community/netinfo": ">=6.0.0",
     "expo": ">=44.0.0",
+    "expo-av": "*",
+    "expo-clipboard": "*",
     "expo-document-picker": "*",
     "expo-file-system": "*",
     "expo-haptics": "*",
     "expo-image-manipulator": "*",
     "expo-image-picker": ">=14.1.0",
     "expo-media-library": "*",
-    "expo-sharing": "*",
-    "expo-av": "*"
+    "expo-sharing": "*"
   },
   "peerDependenciesMeta": {
     "expo-av": {
@@ -42,7 +42,6 @@
     }
   },
   "devDependencies": {
-    "@react-native-community/netinfo": "^6.0.0",
     "expo": "^44.0.0",
     "expo-file-system": "^11.0.2",
     "expo-image-manipulator": "^9.1.0",

diff --git a/package/expo-package/src/handlers/NetInfo.ts b/package/expo-package/src/handlers/NetInfo.ts
diff --git a/package/expo-package/src/handlers/index.ts b/package/expo-package/src/handlers/index.ts
@@ -4,7 +4,6 @@ export * from './deleteFile';
 export * from './getLocalAssetUri';
 export * from './getPhotos';
 export * from './iOS14RefreshGallerySelection';
-export * from './NetInfo';
 export * from './oniOS14GalleryLibrarySelectionChange';
 export * from './saveFile';
 export * from './Sound';

diff --git a/package/expo-package/src/index.js b/package/expo-package/src/index.js
@@ -1,5 +1,3 @@
-import { FlatList } from 'react-native';
-
 import { registerNativeHandlers } from 'stream-chat-react-native-core';
 
 import {
@@ -9,7 +7,6 @@ import {
   getLocalAssetUri,
   getPhotos,
   iOS14RefreshGallerySelection,
-  NetInfo,
   oniOS14GalleryLibrarySelectionChange,
   saveFile,
   Sound,
@@ -28,11 +25,9 @@ registerNativeHandlers({
   Audio,
   compressImage,
   deleteFile,
-  FlatList,
   getLocalAssetUri,
   getPhotos,
   iOS14RefreshGallerySelection,
-  NetInfo,
   oniOS14GalleryLibrarySelectionChange,
   pickDocument,
   saveFile,

diff --git a/package/expo-package/yarn.lock b/package/expo-package/yarn.lock
@@ -2929,10 +2929,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
   integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
 
-[email protected].0:
-  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.31.0.tgz#8bbcd7310891bf70fc8c0ff345224be9d29cd59e"
-  integrity sha512-gPhY5Ly+n8tfa/awu1hV9+Aj+1c35lUpo+UZLgcmgPey2F7kC8YZr1pvon6m7IWTh/MoU5IEnqtswqF+NWQdBQ==
+[email protected].1:
+  version "5.31.1"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.31.1.tgz#4367276c8316d325e6b062e4efb95d464d4e2eef"
+  integrity sha512-EKHMQ0bWRoyubTxk1IKEbkIzcIY5hxHDpyGU7ObGXLLnhoVBEDranZBQ7dNDdbuM88uKh9mGK5WH4NQSTioKxQ==
   dependencies:
     "@gorhom/bottom-sheet" "4.4.8"
     dayjs "1.10.5"