Skip to content

Commit ac8157f

Browse files
khushal87khushal87
authored
fix: add Flatlist mvcp as optional package and peer deps versions (#2720)
* fix: add Flatlist mvcp as optional package and peer deps versions * fix: add Flatlist mvcp as optional package and peer deps versions * docs: fix native handler docs * docs: fix vale issues * docs: remove native handler docs * fix: lint issues
1 parent f087ee5 commit ac8157f

File tree

19 files changed

+303
-2019
lines changed

19 files changed

+303
-2019
lines changed

‎docusaurus/docs/reactnative/basics/migrating-from-5.x-to-6.x.mdx‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: Migration from 5.x to 6.x
44
---
55

66
:::note
7-
v6.0 is supported on React native version **0.72** and above.
7+
If you are using new architecture or the new FlatList with [`maintainVisibleContentPosition`](https://reactnative.dev/docs/scrollview#maintainvisiblecontentposition) feat, v6.0 would require you to be in React native version **0.72** and above.
88
:::
99

1010
## Dependency changes
@@ -57,26 +57,18 @@ yarn remove react-native-quick-sqlite
5757
yarn add op-sqlite
5858
```
5959

60-
#### Remove the usage of `@stream-io/flat-list-mvcp`
60+
#### Made `@stream-io/flat-list-mvcp` optional
6161

62-
The dependency on `@stream-io/flat-list-mvcp` package has been removed in favour of React Native's [`FlatList`](https://reactnative.dev/docs/flatlist) component supporting [`maintainVisibleContentPosition`](https://reactnative.dev/docs/scrollview#maintainvisiblecontentposition) from React Native version `>=0.72`. You can replace it by using the `FlatList` component directly.
62+
The dependency on `@stream-io/flat-list-mvcp` package has been made optional in favour of React Native's [`FlatList`](https://reactnative.dev/docs/flatlist) component supporting [`maintainVisibleContentPosition`](https://reactnative.dev/docs/scrollview#maintainvisiblecontentposition) from React Native version `>=0.72`. If the package is installed it takes up the package or the default React Native [`FlatList`](https://reactnative.dev/docs/flatlist).
63+
64+
:::info
65+
If you are on or above version **0.72** of React Native, please remove it.
6366

6467
```bash
6568
yarn remove @stream-io/flat-list-mvcp
6669
```
6770

68-
```tsx
69-
// removed-line
70-
import { FlatList } from '@stream-io/flat-list-mvcp';
71-
import { registerNativeHandlers } from 'stream-chat-react-native';
72-
73-
registerNativeHandlers({
74-
// removed-line
75-
FlatList: FlatList,
76-
});
77-
```
78-
79-
This also involves not passing the `FlatList` component as a handler to [`registerNativeHandlers`](../customization/native-handlers.mdx#overriding-handlers) anymore.
71+
:::
8072

8173
## SDK changes
8274

‎docusaurus/docs/reactnative/guides/custom-message-actions.mdx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,6 @@ Please note that these intercepts will neither change the standard functions nor
373373
:::
374374
375375
- `handleBan`
376-
<<<<<<< HEAD
377-
=======
378-
- `handleBlock`(deprecated)
379-
> > > > > > > 50d6467ce4ff02ba01398b858985547a0b490beb
380376
- `handleCopy`
381377
- `handleDelete`
382378
- `handleEdit`

‎docusaurus/reactnative_versioned_docs/version-5.x.x/index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is coming up soon.

‎examples/SampleApp/ios/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1626,4 +1626,4 @@ SPEC CHECKSUMS:
16261626

16271627
PODFILE CHECKSUM: 35eaf6ce44604be195e8eb15532275b5a777ac32
16281628

1629-
COCOAPODS: 1.15.2
1629+
COCOAPODS: 1.14.3

‎examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,9 @@
681681
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
682682
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
683683
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
684+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
685+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
686+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
684687
);
685688
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
686689
LD_RUNPATH_SEARCH_PATHS = (
@@ -844,6 +847,9 @@
844847
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
845848
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
846849
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
850+
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
851+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
852+
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
847853
);
848854
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
849855
LD_RUNPATH_SEARCH_PATHS = (

‎examples/TypeScriptMessaging/ios/Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ PODS:
11421142
- React-Core
11431143
- RNCClipboard (1.13.2):
11441144
- React-Core
1145-
- RNGestureHandler (2.15.0):
1145+
- RNGestureHandler (2.20.1):
11461146
- glog
11471147
- RCT-Folly (= 2022.05.16.00)
11481148
- React-Core
@@ -1160,7 +1160,7 @@ PODS:
11601160
- React-RCTImage
11611161
- RNShare (10.2.1):
11621162
- React-Core
1163-
- RNSVG (15.6.0):
1163+
- RNSVG (15.8.0):
11641164
- React-Core
11651165
- SocketRocket (0.6.1)
11661166
- Yoga (1.14.0)
@@ -1473,15 +1473,15 @@ SPEC CHECKSUMS:
14731473
ReactCommon: 3dc453f427d2f3d7f2c71499d191b456f83c59bd
14741474
RNAudioRecorderPlayer: f790fc1afb118552ae6285d60adde52ee6b5d9ef
14751475
RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
1476-
RNGestureHandler: 67fb54b3e6ca338a8044e85cd6f340265aa41091
1476+
RNGestureHandler: 7ff7793b53454ed4a2faf52fb3fcd7804d0b494c
14771477
RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
14781478
RNReanimated: 15a855719335a6b655a214531e86d806edfd49da
14791479
RNScreens: e842cdccb23c0a084bd6307f6fa83fd1c1738029
14801480
RNShare: 0fad69ae2d71de9d1f7b9a43acf876886a6cb99c
1481-
RNSVG: 5da7a24f31968ec74f0b091e3440080f347e279b
1481+
RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d
14821482
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
14831483
Yoga: 57d2ffe418d024d56f8b0047f335c677e4c4d9ac
14841484

14851485
PODFILE CHECKSUM: 90406e1e85c82b37484f5d746afa45c0637bb4b3
14861486

1487-
COCOAPODS: 1.14.3
1487+
COCOAPODS: 1.15.2

‎examples/TypeScriptMessaging/yarn.lock‎

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3628,13 +3628,13 @@ csstype@^3.0.2:
36283628
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
36293629
integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
36303630

3631-
d@1, d@^1.0.1:
3632-
version "1.0.1"
3633-
resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
3634-
integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
3631+
d@1, d@^1.0.1, d@^1.0.2:
3632+
version "1.0.2"
3633+
resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
3634+
integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
36353635
dependencies:
3636-
es5-ext "^0.10.50"
3637-
type "^1.0.1"
3636+
es5-ext "^0.10.64"
3637+
type "^2.7.2"
36383638

36393639
[email protected]:
36403640
version "1.10.5"
@@ -3944,13 +3944,14 @@ es-to-primitive@^1.2.1:
39443944
is-date-object "^1.0.1"
39453945
is-symbol "^1.0.2"
39463946

3947-
es5-ext@^0.10.35, es5-ext@^0.10.50:
3948-
version "0.10.62"
3949-
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
3950-
integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
3947+
es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14:
3948+
version "0.10.64"
3949+
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
3950+
integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
39513951
dependencies:
39523952
es6-iterator "^2.0.3"
39533953
es6-symbol "^3.1.3"
3954+
esniff "^2.0.1"
39543955
next-tick "^1.1.0"
39553956

39563957
es6-iterator@^2.0.3:
@@ -3963,12 +3964,12 @@ es6-iterator@^2.0.3:
39633964
es6-symbol "^3.1.1"
39643965

39653966
es6-symbol@^3.1.1, es6-symbol@^3.1.3:
3966-
version "3.1.3"
3967-
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
3968-
integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
3967+
version "3.1.4"
3968+
resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
3969+
integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
39693970
dependencies:
3970-
d "^1.0.1"
3971-
ext "^1.1.2"
3971+
d "^1.0.2"
3972+
ext "^1.7.0"
39723973

39733974
escalade@^3.1.1:
39743975
version "3.1.1"
@@ -4144,6 +4145,16 @@ eslint@^8.19.0:
41444145
strip-ansi "^6.0.1"
41454146
text-table "^0.2.0"
41464147

4148+
esniff@^2.0.1:
4149+
version "2.0.1"
4150+
resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
4151+
integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
4152+
dependencies:
4153+
d "^1.0.1"
4154+
es5-ext "^0.10.62"
4155+
event-emitter "^0.3.5"
4156+
type "^2.7.2"
4157+
41474158
espree@^9.6.0, espree@^9.6.1:
41484159
version "9.6.1"
41494160
resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
@@ -4192,6 +4203,14 @@ etag@~1.8.1:
41924203
resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
41934204
integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
41944205

4206+
event-emitter@^0.3.5:
4207+
version "0.3.5"
4208+
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
4209+
integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
4210+
dependencies:
4211+
d "1"
4212+
es5-ext "~0.10.14"
4213+
41954214
event-target-shim@^5.0.0, event-target-shim@^5.0.1:
41964215
version "5.0.1"
41974216
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
@@ -4228,7 +4247,7 @@ expect@^29.7.0:
42284247
jest-message-util "^29.7.0"
42294248
jest-util "^29.7.0"
42304249

4231-
ext@^1.1.2:
4250+
ext@^1.7.0:
42324251
version "1.7.0"
42334252
resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
42344253
integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
@@ -6571,14 +6590,13 @@ react-native-document-picker@^9.3.0:
65716590
invariant "^2.2.4"
65726591

65736592
react-native-gesture-handler@^2.14.0:
6574-
version "2.15.0"
6575-
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.15.0.tgz#f8e6c0451a7bdf065edb7b9be605480db402baa0"
6576-
integrity sha512-cmMGW8k86o/xgVTBZZOPohvR5re4Vh65PUxH4HbBBJAYTog4aN4wTVTUlnoky01HuSN8/X4h3tI/K3XLPoDnsg==
6593+
version "2.20.1"
6594+
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.20.1.tgz#04743f7064d6ad7d0f66ec0d71c35eeee8c89a97"
6595+
integrity sha512-Oqq5A606F6iV1eQ3FExEH6V4zE2uatNdrwQU1qMy7szHgm0SewQexeyLY3Zaaeo7luOknVq2xvZjNN/LvULGPw==
65776596
dependencies:
65786597
"@egjs/hammerjs" "^2.0.17"
65796598
hoist-non-react-statics "^3.3.0"
65806599
invariant "^2.2.4"
6581-
lodash "^4.17.21"
65826600
prop-types "^15.7.2"
65836601

65846602
react-native-haptic-feedback@^2.2.0:
@@ -6636,9 +6654,9 @@ react-native-share@^10.2.1:
66366654
integrity sha512-Z2LWGYWH7raM4H6Oauttv1tEhaB43XSWJAN8iS6oaSG9CnyrUBeYFF4QpU1AH5RgNeylXQdN8CtbizCHHt6coQ==
66376655

66386656
react-native-svg@^15.6.0:
6639-
version "15.6.0"
6640-
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.6.0.tgz#13b2af53b1701597df301122b869b61918e1e9a5"
6641-
integrity sha512-TUtR+h+yi1ODsd8FHdom1TpjfWOmnaK5pri5rnSBXnMqpzq8o2zZfonHTjPX+nS3wb/Pu2XsoARgYaHNjVWXhQ==
6657+
version "15.8.0"
6658+
resolved "https://registry.yarnpkg.com/react-native-svg/-/react-native-svg-15.8.0.tgz#9b5fd4f5cf5675197b3f4cbfcc77c215de2b9502"
6659+
integrity sha512-KHJzKpgOjwj1qeZzsBjxNdoIgv2zNCO9fVcoq2TEhTRsVV5DGTZ9JzUZwybd7q4giT/H3RdtqC3u44dWdO0Ffw==
66426660
dependencies:
66436661
css-select "^5.1.0"
66446662
css-tree "^1.1.3"
@@ -7540,15 +7558,10 @@ type-fest@^0.7.1:
75407558
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
75417559
integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
75427560

7543-
type@^1.0.1:
7544-
version "1.2.0"
7545-
resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
7546-
integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
7547-
75487561
type@^2.7.2:
7549-
version "2.7.2"
7550-
resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
7551-
integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
7562+
version "2.7.3"
7563+
resolved "https://registry.yarnpkg.com/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
7564+
integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
75527565

75537566
typed-array-length@^1.0.4:
75547567
version "1.0.4"

‎package/expo-package/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"stream-chat-react-native-core": "5.39.4"
1414
},
1515
"peerDependencies": {
16-
"expo": "^51.0.0",
16+
"expo": ">=51.0.0",
1717
"expo-av": "*",
1818
"expo-clipboard": "*",
1919
"expo-document-picker": "*",

‎package/jest-setup.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* global require */
2-
import { View } from 'react-native';
2+
import { FlatList, View } from 'react-native';
33

44
import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock.js';
55

@@ -18,6 +18,7 @@ registerNativeHandlers({
1818
},
1919
compressImage: () => null,
2020
deleteFile: () => null,
21+
FlatList,
2122
getLocalAssetUri: () => null,
2223
getPhotos: () => null,
2324
oniOS14GalleryLibrarySelectionChange: () => ({

‎package/native-package/package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"@bam.tech/react-native-image-resizer": ">=3.0.10",
1818
"@react-native-camera-roll/camera-roll": ">=7.8.0",
1919
"@react-native-clipboard/clipboard": ">=1.14.1",
20-
"react-native": ">=0.73.6",
20+
"@stream-io/flat-list-mvcp": ">=0.10.3",
21+
"react-native": ">=0.67.0",
2122
"react-native-audio-recorder-player": ">=3.6.4",
2223
"react-native-blob-util": ">=0.19.9",
2324
"react-native-document-picker": ">=9.3.0",
@@ -33,6 +34,9 @@
3334
"@react-native-clipboard/clipboard": {
3435
"optional": true
3536
},
37+
"@stream-io/flat-list-mvcp": {
38+
"optional": true
39+
},
3640
"react-native-share": {
3741
"optional": true
3842
},
@@ -61,6 +65,6 @@
6165
},
6266
"devDependencies": {
6367
"@bam.tech/react-native-image-resizer": ">=3.0.10",
64-
"react-native": ">=0.73.6"
68+
"react-native": ">=0.67.0"
6569
}
6670
}

0 commit comments

Comments
 (0)