Skip to content

Commit 8462318

Browse files
committed
fix: channel preview tests
2 parents b695a18 + 570b872 commit 8462318

File tree

64 files changed

+2096
-609
lines changed

Some content is hidden

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

64 files changed

+2096
-609
lines changed

examples/ExpoMessaging/yarn.lock

Lines changed: 9 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2937,6 +2937,11 @@
29372937
dependencies:
29382938
"@types/yargs-parser" "*"
29392939

2940+
"@ungap/structured-clone@^1.3.0":
2941+
version "1.3.0"
2942+
resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
2943+
integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
2944+
29402945
"@urql/core@^5.0.0", "@urql/core@^5.0.6":
29412946
version "5.0.8"
29422947
resolved "https://registry.yarnpkg.com/@urql/core/-/core-5.0.8.tgz#eba39eaa2bf9a0a963383e87a65cba7a9ca794bd"
@@ -4065,11 +4070,6 @@ electron-to-chromium@^1.5.41:
40654070
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.69.tgz#7268a4251e82fc83a7cdc9ab51e7154bb2813038"
40664071
integrity sha512-zz4e7EbJqqtdQtwt61ZYKrfEYlV0HpGbIGRVFGOO9YBZIhg0BDXtBcWxpqyAm6oyPl2Zp8tc5FrPpCZQH/Yazg==
40674072

4068-
emoji-regex@^10.3.0:
4069-
version "10.3.0"
4070-
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.3.0.tgz#76998b9268409eb3dae3de989254d456e70cfe23"
4071-
integrity sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==
4072-
40734073
emoji-regex@^10.4.0:
40744074
version "10.4.0"
40754075
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
@@ -7408,48 +7408,14 @@ [email protected], stream-buffers@~2.2.0:
74087408
version "0.0.0"
74097409
uid ""
74107410

7411-
7412-
version "7.1.0"
7413-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-7.1.0.tgz#b5002ec967467a2ac4be54700e5e4e60bbd5fd97"
7414-
integrity sha512-Rfecu6kH2zBW0ufhVz076NlpOg6QxNgShGnK4js/ypjSZ4rGZIKMFHNuArLVr/uSuTWiVPNO1zMI/LyvljtwdQ==
7415-
dependencies:
7416-
"@gorhom/bottom-sheet" "^5.1.1"
7417-
dayjs "1.10.5"
7418-
emoji-regex "^10.3.0"
7419-
i18next "^21.6.14"
7420-
intl-pluralrules "^2.0.1"
7421-
linkifyjs "^4.1.1"
7422-
lodash-es "4.17.21"
7423-
mime-types "^2.1.34"
7424-
path "0.12.7"
7425-
react-native-markdown-package "1.8.2"
7426-
react-native-url-polyfill "^1.3.0"
7427-
stream-chat "^9.2.0"
7428-
use-sync-external-store "^1.4.0"
7429-
74307411
"stream-chat-react-native-core@link:../../package":
74317412
version "0.0.0"
74327413
uid ""
74337414

7434-
stream-chat@^9.2.0:
7435-
version "9.2.0"
7436-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.2.0.tgz#f3109891ca27f17b6fd0aa6ebcf66be12df1f88c"
7437-
integrity sha512-inz3CA5tuqqSrla7qjRTCKs+coRKOYROWf0wEWYgbCu0tAUuiBTRtu1PJL1isEXIaPLiWi00BuRrBEIFon9Kng==
7438-
dependencies:
7439-
"@types/jsonwebtoken" "^9.0.8"
7440-
"@types/ws" "^8.5.14"
7441-
axios "^1.6.0"
7442-
base64-js "^1.5.1"
7443-
form-data "^4.0.0"
7444-
isomorphic-ws "^5.0.0"
7445-
jsonwebtoken "^9.0.2"
7446-
linkifyjs "^4.2.0"
7447-
ws "^8.18.1"
7448-
7449-
stream-chat@^9.3.0:
7450-
version "9.3.0"
7451-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.3.0.tgz#35ca4db9e841eb92d07413ae156de0500ad77b23"
7452-
integrity sha512-S73B3HrvmQvJjq58Zjo50vh74juhsWsVRpT+OBjGAxSGxlA+ITkZ3vKs8Y/r2eDK7mBTMmX5QCruFaDJH5dRuw==
7415+
stream-chat@^9.5.1:
7416+
version "9.5.1"
7417+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-9.5.1.tgz#b8260bc1d1470ae3c91d8c40d22f41e9c4523d7b"
7418+
integrity sha512-X9w22JfEp2cTggAwyt0gyvwe8VBy1qvJENliNen/2FJDpS3k6PCaeSO6MHNXz3c0Qy21hqxuu8/b32jCSe4LSA==
74537419
dependencies:
74547420
"@types/jsonwebtoken" "^9.0.8"
74557421
"@types/ws" "^8.5.14"
@@ -7461,21 +7427,6 @@ stream-chat@^9.3.0:
74617427
linkifyjs "^4.2.0"
74627428
ws "^8.18.1"
74637429

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-
74797430
stream-slice@^0.1.2:
74807431
version "0.1.2"
74817432
resolved "https://registry.yarnpkg.com/stream-slice/-/stream-slice-0.1.2.tgz#2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"

examples/SampleApp/App.tsx

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { createStackNavigator } from '@react-navigation/stack';
66
import { SafeAreaProvider } from 'react-native-safe-area-context';
77
import {
88
Chat,
9+
createTextComposerEmojiMiddleware,
910
OverlayProvider,
1011
SqliteClient,
1112
ThemeProvider,
@@ -34,8 +35,12 @@ import { OneOnOneChannelDetailScreen } from './src/screens/OneOnOneChannelDetail
3435
import { SharedGroupsScreen } from './src/screens/SharedGroupsScreen';
3536
import { ThreadScreen } from './src/screens/ThreadScreen';
3637
import { UserSelectorScreen } from './src/screens/UserSelectorScreen';
38+
import { init, SearchIndex } from 'emoji-mart';
39+
import data from '@emoji-mart/data';
3740

38-
import type { LocalMessage, StreamChat } from 'stream-chat';
41+
import type { LocalMessage, StreamChat, TextComposerMiddleware } from 'stream-chat';
42+
43+
init({ data });
3944

4045
if (__DEV__) {
4146
DevSettings.addMenuItem('Reset local DB (offline storage)', () => {
@@ -118,6 +123,25 @@ const App = () => {
118123
};
119124
}, []);
120125

126+
useEffect(() => {
127+
if (!chatClient) {
128+
return;
129+
}
130+
chatClient.setMessageComposerSetupFunction(({ composer }) => {
131+
composer.updateConfig({
132+
drafts: {
133+
enabled: true,
134+
},
135+
});
136+
137+
composer.textComposer.middlewareExecutor.insert({
138+
middleware: [createTextComposerEmojiMiddleware(SearchIndex) as TextComposerMiddleware],
139+
position: { after: 'stream-io/text-composer/mentions-middleware' },
140+
unique: true,
141+
});
142+
});
143+
}, [chatClient]);
144+
121145
return (
122146
<SafeAreaProvider
123147
style={{

examples/SampleApp/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,9 +2662,9 @@ SPEC CHECKSUMS:
26622662
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
26632663
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
26642664
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2665-
stream-chat-react-native: c9c1901e17cb31dfd68f17dca5cdc994bef9ac5e
2665+
stream-chat-react-native: 3d6ea43d3097dfc813d9e99fd0d6d113d3faac78
26662666
Yoga: be02ca501b03c79d7027a6bbbd0a8db985034f11
26672667

26682668
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d
26692669

2670-
COCOAPODS: 1.16.2
2670+
COCOAPODS: 1.14.3

examples/SampleApp/src/components/BottomTabs.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { MentionsTab } from '../icons/MentionsTab';
1111

1212
import type { BottomTabBarProps } from '@react-navigation/bottom-tabs';
1313
import type { Route } from '@react-navigation/native';
14+
import { DraftsTab } from '../icons/DraftsTab';
1415

1516
const styles = StyleSheet.create({
1617
notification: {
@@ -44,6 +45,13 @@ const getTab = (key: string) => {
4445
notification: <ChannelsUnreadCountBadge />,
4546
title: 'Chats',
4647
};
48+
case 'DraftsScreen':
49+
return {
50+
icon: <DraftsTab />,
51+
iconActive: <DraftsTab active />,
52+
title: 'Drafts',
53+
notification: <ChannelsUnreadCountBadge />,
54+
};
4755
case 'ThreadsScreen':
4856
return {
4957
icon: <ThreadsTab />,

examples/SampleApp/src/components/ChannelPreview.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ const CustomChannelPreviewStatus = (
7171
);
7272
};
7373

74-
export const ChannelPreview: React.FC<ChannelPreviewMessengerProps> = (
75-
props,
76-
) => {
74+
export const ChannelPreview: React.FC<ChannelPreviewMessengerProps> = (props) => {
7775
const { channel } = props;
7876

7977
const { setOverlay } = useAppOverlayContext();

0 commit comments

Comments
 (0)