Skip to content

Commit 5ef5da3

Browse files
committed
chore: resolve conflicts from develop
2 parents 10ac4ca + e324cb5 commit 5ef5da3

File tree

76 files changed

+1960
-8049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1960
-8049
lines changed

examples/ExpoMessaging/yarn.lock

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4070,6 +4070,11 @@ emoji-regex@^10.3.0:
40704070
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
40714071
integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
40724072

4073+
emoji-regex@^10.4.0:
4074+
version "10.4.0"
4075+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
4076+
integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
4077+
40734078
emoji-regex@^8.0.0:
40744079
version "8.0.0"
40754080
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -7456,6 +7461,21 @@ stream-chat@^9.3.0:
74567461
linkifyjs "^4.2.0"
74577462
ws "^8.18.1"
74587463

7464+
stream-chat@^8.57.6:
7465+
version "8.60.0"
7466+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.60.0.tgz#b67d4fbb185da53fb8ac5fc5759986d6ad7e19a3"
7467+
integrity sha512-7FpO7Wno++r+n+x9aFuXtGYtNO06CIMd2Bxe3doYZLhMfS0nuaXloeFlGcMT0r4U/6bnguz1qQdDJUPNQAS8bQ==
7468+
dependencies:
7469+
"@babel/runtime" "^7.27.0"
7470+
"@types/jsonwebtoken" "~9.0.0"
7471+
"@types/ws" "^7.4.0"
7472+
axios "^1.6.0"
7473+
base64-js "^1.5.1"
7474+
form-data "^4.0.0"
7475+
isomorphic-ws "^4.0.1"
7476+
jsonwebtoken "~9.0.0"
7477+
ws "^7.5.10"
7478+
74597479
stream-slice@^0.1.2:
74607480
version "0.1.2"
74617481
resolved "https://registry.yarnpkg.com/stream-slice/-/stream-slice-0.1.2.tgz#2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"

examples/SampleApp/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"clean-all": "yarn clean && rm -rf node_modules && rm -rf ios/Pods && rm -rf vendor && bundle install && yarn install && cd ios && bundle exec pod install && cd -"
2424
},
2525
"dependencies": {
26+
"@emoji-mart/data": "^1.2.1",
2627
"@notifee/react-native": "^9.1.8",
2728
"@op-engineering/op-sqlite": "^11.4.7",
2829
"@react-native-async-storage/async-storage": "^2.1.1",
@@ -35,6 +36,8 @@
3536
"@react-navigation/drawer": "7.1.1",
3637
"@react-navigation/native": "^7.0.14",
3738
"@react-navigation/stack": "^7.1.1",
39+
"emoji-mart": "^5.6.0",
40+
"lodash.mergewith": "^4.6.2",
3841
"react": "19.0.0",
3942
"react-native": "^0.78.0",
4043
"react-native-audio-recorder-player": "^3.6.12",
@@ -66,6 +69,7 @@
6669
"@react-native/typescript-config": "^0.78.0",
6770
"@rnx-kit/metro-config": "^2.0.1",
6871
"@types/jest": "^29.5.13",
72+
"@types/lodash.mergewith": "^4.6.9",
6973
"@types/react": "^19.0.0",
7074
"@types/react-test-renderer": "^19.0.0",
7175
"eslint": "^9.20.1",

examples/SampleApp/src/screens/ChannelListScreen.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ const baseFilters = {
5959
type: 'messaging',
6060
};
6161

62-
const sort: ChannelSort = [
63-
{ pinned_at: -1 },
64-
{ last_message_at: -1 },
65-
{ updated_at: -1 },
66-
];
62+
const sort: ChannelSort = [{ pinned_at: -1 }, { last_message_at: -1 }, { updated_at: -1 }];
6763

6864
const options = {
6965
presence: true,

examples/SampleApp/src/screens/ChannelScreen.tsx

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import React, { useCallback, useEffect, useState } from 'react';
2-
import type { Channel as StreamChatChannel } from 'stream-chat';
2+
import type {
3+
LocalMessage,
4+
Channel as StreamChatChannel,
5+
TextComposerMiddleware,
6+
} from 'stream-chat';
37
import { RouteProp, useFocusEffect, useNavigation } from '@react-navigation/native';
48
import {
59
Channel,
@@ -13,6 +17,7 @@ import {
1317
useTheme,
1418
useTypingString,
1519
AITypingIndicatorView,
20+
createTextComposerEmojiMiddleware,
1621
} from 'stream-chat-react-native';
1722
import { Platform, StyleSheet, View } from 'react-native';
1823
import type { StackNavigationProp } from '@react-navigation/stack';
@@ -25,10 +30,10 @@ import { useChannelMembersStatus } from '../hooks/useChannelMembersStatus';
2530

2631
import type { StackNavigatorParamList } from '../types';
2732
import { NetworkDownIndicator } from '../components/NetworkDownIndicator';
33+
import { init, SearchIndex } from 'emoji-mart';
34+
import data from '@emoji-mart/data';
2835

29-
const styles = StyleSheet.create({
30-
flex: { flex: 1 },
31-
});
36+
init({ data });
3237

3338
export type ChannelScreenNavigationProp = StackNavigationProp<
3439
StackNavigatorParamList,
@@ -115,12 +120,9 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
115120
},
116121
} = useTheme();
117122

118-
const [channel, setChannel] = useState<StreamChatChannel | undefined>(
119-
channelFromProp,
120-
);
123+
const [channel, setChannel] = useState<StreamChatChannel | undefined>(channelFromProp);
121124

122-
const [selectedThread, setSelectedThread] =
123-
useState<ThreadContextValue['thread']>();
125+
const [selectedThread, setSelectedThread] = useState<ThreadContextValue['thread']>();
124126

125127
useEffect(() => {
126128
const initChannel = async () => {
@@ -146,13 +148,30 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
146148
setSelectedThread(undefined);
147149
});
148150

149-
const onThreadSelect = useCallback((thread) => {
150-
setSelectedThread(thread);
151-
navigation.navigate('ThreadScreen', {
152-
channel,
153-
thread,
151+
useEffect(() => {
152+
if (!chatClient) {
153+
return;
154+
}
155+
156+
chatClient.setMessageComposerSetupFunction(({ composer }) => {
157+
composer.textComposer.middlewareExecutor.insert({
158+
middleware: [createTextComposerEmojiMiddleware(SearchIndex) as TextComposerMiddleware],
159+
position: { after: 'stream-io/text-composer/mentions-middleware' },
160+
unique: true,
161+
});
154162
});
155-
}, [channel, navigation]);
163+
}, [chatClient]);
164+
165+
const onThreadSelect = useCallback(
166+
(thread: LocalMessage | null) => {
167+
setSelectedThread(thread);
168+
navigation.navigate('ThreadScreen', {
169+
channel,
170+
thread,
171+
});
172+
},
173+
[channel, navigation],
174+
);
156175

157176
if (!channel || !chatClient) {
158177
return null;
@@ -172,12 +191,14 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
172191
thread={selectedThread}
173192
>
174193
<ChannelHeader channel={channel} />
175-
<MessageList
176-
onThreadSelect={onThreadSelect}
177-
/>
194+
<MessageList onThreadSelect={onThreadSelect} />
178195
<AITypingIndicatorView channel={channel} />
179196
<MessageInput />
180197
</Channel>
181198
</View>
182199
);
183200
};
201+
202+
const styles = StyleSheet.create({
203+
flex: { flex: 1 },
204+
});

examples/SampleApp/yarn.lock

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1051,6 +1051,11 @@
10511051
dependencies:
10521052
"@types/hammerjs" "^2.0.36"
10531053

1054+
"@emoji-mart/data@^1.2.1":
1055+
version "1.2.1"
1056+
resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.2.1.tgz#0ad70c662e3bc603e23e7d98413bd1e64c4fcb6c"
1057+
integrity sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw==
1058+
10541059
"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
10551060
version "4.4.1"
10561061
resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56"
@@ -2566,6 +2571,18 @@
25662571
"@types/ms" "*"
25672572
"@types/node" "*"
25682573

2574+
"@types/lodash.mergewith@^4.6.9":
2575+
version "4.6.9"
2576+
resolved "https://registry.yarnpkg.com/@types/lodash.mergewith/-/lodash.mergewith-4.6.9.tgz#7093028a36de3cae4495d03b9d92c351cab1f8bf"
2577+
integrity sha512-fgkoCAOF47K7sxrQ7Mlud2TH023itugZs2bUg8h/KzT+BnZNrR2jAOmaokbLunHNnobXVWOezAeNn/lZqwxkcw==
2578+
dependencies:
2579+
"@types/lodash" "*"
2580+
2581+
"@types/lodash@*":
2582+
version "4.17.16"
2583+
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.16.tgz#94ae78fab4a38d73086e962d0b65c30d816bfb0a"
2584+
integrity sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==
2585+
25692586
"@types/ms@*":
25702587
version "2.1.0"
25712588
resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
@@ -3872,7 +3889,12 @@ emittery@^0.13.1:
38723889
resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
38733890
integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
38743891

3875-
emoji-regex@^10.3.0:
3892+
emoji-mart@^5.6.0:
3893+
version "5.6.0"
3894+
resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.6.0.tgz#71b3ed0091d3e8c68487b240d9d6d9a73c27f023"
3895+
integrity sha512-eJp3QRe79pjwa+duv+n7+5YsNhRcMl812EcFVwrnRvYKoNPoQb5qxU8DG6Bgwji0akHdp6D4Ln6tYLG58MFSow==
3896+
3897+
emoji-regex@^10.4.0:
38763898
version "10.4.0"
38773899
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
38783900
integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
@@ -5931,6 +5953,11 @@ lodash.merge@^4.6.2:
59315953
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
59325954
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
59335955

5956+
lodash.mergewith@^4.6.2:
5957+
version "4.6.2"
5958+
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
5959+
integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
5960+
59345961
lodash.once@^4.0.0:
59355962
version "4.1.1"
59365963
resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -7597,6 +7624,21 @@ stream-chat@^9.3.0:
75977624
linkifyjs "^4.2.0"
75987625
ws "^8.18.1"
75997626

7627+
stream-chat@^8.57.6:
7628+
version "8.60.0"
7629+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.60.0.tgz#b67d4fbb185da53fb8ac5fc5759986d6ad7e19a3"
7630+
integrity sha512-7FpO7Wno++r+n+x9aFuXtGYtNO06CIMd2Bxe3doYZLhMfS0nuaXloeFlGcMT0r4U/6bnguz1qQdDJUPNQAS8bQ==
7631+
dependencies:
7632+
"@babel/runtime" "^7.27.0"
7633+
"@types/jsonwebtoken" "~9.0.0"
7634+
"@types/ws" "^7.4.0"
7635+
axios "^1.6.0"
7636+
base64-js "^1.5.1"
7637+
form-data "^4.0.0"
7638+
isomorphic-ws "^4.0.1"
7639+
jsonwebtoken "~9.0.0"
7640+
ws "^7.5.10"
7641+
76007642
strict-uri-encode@^2.0.0:
76017643
version "2.0.0"
76027644
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"

examples/TypeScriptMessaging/yarn.lock

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3361,7 +3361,7 @@ emittery@^0.13.1:
33613361
resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
33623362
integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
33633363

3364-
emoji-regex@^10.3.0:
3364+
emoji-regex@^10.3.0, emoji-regex@^10.4.0:
33653365
version "10.4.0"
33663366
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
33673367
integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
@@ -6983,6 +6983,21 @@ stream-chat@^9.3.0:
69836983
linkifyjs "^4.2.0"
69846984
ws "^8.18.1"
69856985

6986+
stream-chat@^8.57.6:
6987+
version "8.60.0"
6988+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.60.0.tgz#b67d4fbb185da53fb8ac5fc5759986d6ad7e19a3"
6989+
integrity sha512-7FpO7Wno++r+n+x9aFuXtGYtNO06CIMd2Bxe3doYZLhMfS0nuaXloeFlGcMT0r4U/6bnguz1qQdDJUPNQAS8bQ==
6990+
dependencies:
6991+
"@babel/runtime" "^7.27.0"
6992+
"@types/jsonwebtoken" "~9.0.0"
6993+
"@types/ws" "^7.4.0"
6994+
axios "^1.6.0"
6995+
base64-js "^1.5.1"
6996+
form-data "^4.0.0"
6997+
isomorphic-ws "^4.0.1"
6998+
jsonwebtoken "~9.0.0"
6999+
ws "^7.5.10"
7000+
69867001
strict-uri-encode@^2.0.0:
69877002
version "2.0.0"
69887003
resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"

package/native-package/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1819,10 +1819,10 @@ electron-to-chromium@^1.5.73:
18191819
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz#8d3d95d4d5653836327890282c8eda5c6f26626d"
18201820
integrity sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA==
18211821

1822-
emoji-regex@^10.3.0:
1823-
version "10.3.0"
1824-
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
1825-
integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
1822+
emoji-regex@^10.4.0:
1823+
version "10.4.0"
1824+
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
1825+
integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
18261826

18271827
emoji-regex@^8.0.0:
18281828
version "8.0.0"

package/package.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"dependencies": {
6969
"@gorhom/bottom-sheet": "^5.1.1",
7070
"dayjs": "1.10.5",
71-
"emoji-regex": "^10.3.0",
71+
"emoji-regex": "^10.4.0",
7272
"i18next": "^21.6.14",
7373
"intl-pluralrules": "^2.0.1",
7474
"linkifyjs": "^4.1.1",
@@ -81,8 +81,10 @@
8181
"use-sync-external-store": "^1.4.0"
8282
},
8383
"peerDependencies": {
84+
"@emoji-mart/data": "^1.1.0",
8485
"@op-engineering/op-sqlite": ">=9.3.0",
8586
"@react-native-community/netinfo": ">=11.3.1",
87+
"emoji-mart": "^5.4.0",
8688
"react-native": ">=0.71.0",
8789
"react-native-gesture-handler": ">=2.16.1",
8890
"react-native-reanimated": ">=3.16.0",
@@ -91,6 +93,12 @@
9193
"peerDependenciesMeta": {
9294
"@op-engineering/op-sqlite": {
9395
"optional": true
96+
},
97+
"emoji-mart": {
98+
"optional": true
99+
},
100+
"@emoji-mart/data": {
101+
"optional": true
94102
}
95103
},
96104
"devDependencies": {

package/src/components/Attachment/Gallery.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import {
3030
useOverlayContext,
3131
} from '../../contexts/overlayContext/OverlayContext';
3232
import { useTheme } from '../../contexts/themeContext/ThemeContext';
33+
3334
import { useLoadingImage } from '../../hooks/useLoadingImage';
3435
import { isVideoPlayerAvailable } from '../../native';
3536
import { FileTypes } from '../../types/types';

package/src/components/Attachment/Giphy.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ const styles = StyleSheet.create({
7070
giphyHeaderText: {
7171
fontSize: 16,
7272
fontWeight: '600',
73+
marginHorizontal: 8,
7374
},
7475
giphyHeaderTitle: {
7576
fontSize: 14,
76-
marginLeft: 8,
7777
},
7878
giphyMask: {
7979
bottom: 8,
@@ -88,9 +88,7 @@ const styles = StyleSheet.create({
8888
alignItems: 'center',
8989
display: 'flex',
9090
flexDirection: 'row',
91-
justifyContent: 'space-between',
9291
padding: 8,
93-
width: '60%',
9492
},
9593
imageErrorIndicatorStyle: {
9694
alignItems: 'center',

0 commit comments

Comments
 (0)