Skip to content

Commit a26b64c

Browse files
committed
chore: resolve conflicts from develop on v6
1 parent 4811497 commit a26b64c

Some content is hidden

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

42 files changed

+755
-339
lines changed

examples/ExpoMessaging/types.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ export type LocalEventType = Record<string, unknown>;
55
export type LocalMessageType = Record<string, unknown>;
66
export type LocalReactionType = Record<string, unknown>;
77
export type LocalUserType = Record<string, unknown>;
8-
type LocalPollOptionType = Record<string, unknown>;
9-
type LocalPollType = Record<string, unknown>;
8+
export type LocalPollOptionType = Record<string, unknown>;
9+
export type LocalPollType = Record<string, unknown>;
10+
export type LocalMemberType = Record<string, unknown>;
1011

1112
export type StreamChatGenerics = {
1213
attachmentType: LocalAttachmentType;
1314
channelType: LocalChannelType;
1415
commandType: LocalCommandType;
1516
eventType: LocalEventType;
17+
memberType: LocalMemberType;
1618
messageType: LocalMessageType;
1719
pollOptionType: LocalPollOptionType;
1820
pollType: LocalPollType;

examples/ExpoMessaging/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7513,10 +7513,10 @@ [email protected], stream-buffers@~2.2.0:
75137513
version "0.0.0"
75147514
uid ""
75157515

7516-
stream-chat-react-native-core@5.39.4:
7517-
version "5.39.4"
7518-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.4.tgz#39db32070ccf95aa32ceb2fec96f777c27f0a8d2"
7519-
integrity sha512-XKrPnIKVVOz9mi4/oVkMX8zD8JnqDIxjiqhYZelT4Hb2qMrhvpmCmxq60Fz++JZf7lFgtnoAx+oec1ns4g0VWg==
7516+
stream-chat-react-native-core@5.43.1:
7517+
version "5.43.1"
7518+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
7519+
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
75207520
dependencies:
75217521
"@gorhom/bottom-sheet" "^4.6.4"
75227522
dayjs "1.10.5"
@@ -7529,16 +7529,16 @@ [email protected]:
75297529
path "0.12.7"
75307530
react-native-markdown-package "1.8.2"
75317531
react-native-url-polyfill "^1.3.0"
7532-
stream-chat "8.40.8"
7532+
stream-chat "8.45.1"
75337533

75347534
"stream-chat-react-native-core@link:../../package":
75357535
version "0.0.0"
75367536
uid ""
75377537

7538-
stream-chat@8.40.8:
7539-
version "8.40.8"
7540-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.40.8.tgz#0f5320bd8b03d1cbff377f8c7ae2f8afe24d0515"
7541-
integrity sha512-nYLvYAkrvXRzuPO52TIofNiInCkDdXrnBc/658297lC6hzrHNc87mmTht264BXmXLlpasTNP3rLKxR6MxhpgKg==
7538+
stream-chat@8.45.1:
7539+
version "8.45.1"
7540+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
7541+
integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
75427542
dependencies:
75437543
"@babel/runtime" "^7.16.3"
75447544
"@types/jsonwebtoken" "~9.0.0"

examples/SampleApp/CHANGELOG.md

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,108 @@
11
# Change Log
22

3-
### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
3+
### [1.32.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.1) (2024-11-22)
4+
5+
### Workspaces
46

7+
- Following linked packages updated: [stream-chat-react-native]
8+
9+
## [1.32.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.32.0) (2024-11-20)
10+
11+
### Features
12+
13+
- add support for membership customization ([#2802](https://github.com/GetStream/stream-chat-react-native/issues/2802)) ([376ac7d](https://github.com/GetStream/stream-chat-react-native/commit/376ac7d5bd5a5c34080b2272601300633b3412f1))
14+
- moderation v2 support ([#2801](https://github.com/GetStream/stream-chat-react-native/issues/2801)) ([9c55bd5](https://github.com/GetStream/stream-chat-react-native/commit/9c55bd543215a6c615b3e088238154bba34a958f))
515

616
### Workspaces
717

8-
* Following linked packages updated: [stream-chat-react-native]
18+
- Following linked packages updated: [stream-chat-react-native]
919

10-
### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].3[email protected].4) (2024-11-07)
20+
### [1.31.8](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].7[email protected].8) (2024-11-19)
1121

22+
### Workspaces
23+
24+
- Following linked packages updated: [stream-chat-react-native]
25+
26+
### [1.31.7](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.7) (2024-11-15)
1227

1328
### Workspaces
1429

15-
* Following linked packages updated: [stream-chat-react-native]
30+
- Following linked packages updated: [stream-chat-react-native]
1631

17-
### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
32+
### [1.31.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.6) (2024-11-14)
33+
34+
### Workspaces
35+
36+
- Following linked packages updated: [stream-chat-react-native]
1837

38+
### [1.31.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.5) (2024-11-08)
1939

2040
### Workspaces
2141

22-
* Following linked packages updated: [stream-chat-react-native]
42+
- Following linked packages updated: [stream-chat-react-native]
43+
44+
### [1.31.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.4) (2024-11-07)
2345

24-
### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.2) (2024-11-01)
46+
### Workspaces
47+
48+
- Following linked packages updated: [stream-chat-react-native]
2549

50+
### [1.31.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.3) (2024-11-04)
2651

2752
### Workspaces
2853

29-
* Following linked packages updated: [stream-chat-react-native]
54+
- Following linked packages updated: [stream-chat-react-native]
3055

31-
### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].0[email protected].1) (2024-10-31)
56+
### [1.31.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected].1[email protected].2) (2024-11-01)
3257

58+
### Workspaces
59+
60+
- Following linked packages updated: [stream-chat-react-native]
61+
62+
### [1.31.1](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.1) (2024-10-31)
3363

3464
### Workspaces
3565

36-
* Following linked packages updated: [stream-chat-react-native]
66+
- Following linked packages updated: [stream-chat-react-native]
3767

3868
## [1.31.0](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.31.0) (2024-10-31)
3969

40-
4170
### Features
4271

43-
* polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
44-
72+
- polls implementation ([#2719](https://github.com/GetStream/stream-chat-react-native/issues/2719)) ([c770854](https://github.com/GetStream/stream-chat-react-native/commit/c7708544d49e27dab4a2fee08c235fb39afd2178))
4573

4674
### Bug Fixes
4775

48-
* bump sample apps and store issues ([#2735](https://github.com/GetStream/stream-chat-react-native/issues/2735)) ([424aefb](https://github.com/GetStream/stream-chat-react-native/commit/424aefba4b90b2de8c5bff59e52c0e9aaa580d09))
49-
* remove macos deployment destination ([#2736](https://github.com/GetStream/stream-chat-react-native/issues/2736)) ([e81c6bc](https://github.com/GetStream/stream-chat-react-native/commit/e81c6bc9a0e5734e7af02d59f8d644e7dbde36cb))
50-
76+
- bump sample apps and store issues ([#2735](https://github.com/GetStream/stream-chat-react-native/issues/2735)) ([424aefb](https://github.com/GetStream/stream-chat-react-native/commit/424aefba4b90b2de8c5bff59e52c0e9aaa580d09))
77+
- remove macos deployment destination ([#2736](https://github.com/GetStream/stream-chat-react-native/issues/2736)) ([e81c6bc](https://github.com/GetStream/stream-chat-react-native/commit/e81c6bc9a0e5734e7af02d59f8d644e7dbde36cb))
5178

5279
### Workspaces
5380

54-
* Following linked packages updated: [stream-chat-react-native]
81+
- Following linked packages updated: [stream-chat-react-native]
5582

5683
### [1.30.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.6) (2024-10-28)
5784

58-
5985
### Workspaces
6086

61-
* Following linked packages updated: [stream-chat-react-native]
87+
- Following linked packages updated: [stream-chat-react-native]
6288

6389
### [1.30.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.5) (2024-10-24)
6490

65-
6691
### Workspaces
6792

68-
* Following linked packages updated: [stream-chat-react-native]
93+
- Following linked packages updated: [stream-chat-react-native]
6994

7095
### [1.30.4](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.4) (2024-10-21)
7196

72-
7397
### Workspaces
7498

75-
* Following linked packages updated: [stream-chat-react-native]
99+
- Following linked packages updated: [stream-chat-react-native]
76100

77101
### [1.30.3](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.3) (2024-10-15)
78102

79-
80103
### Workspaces
81104

82-
* Following linked packages updated: [stream-chat-react-native]
105+
- Following linked packages updated: [stream-chat-react-native]
83106

84107
### [1.30.2](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.30.2) (2024-10-14)
85108

examples/SampleApp/ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2187,7 +2187,7 @@ PODS:
21872187
- libwebp (~> 1.0)
21882188
- SDWebImage/Core (~> 5.10)
21892189
- SocketRocket (0.7.1)
2190-
- stream-chat-react-native (5.41.4):
2190+
- stream-chat-react-native (5.43.1):
21912191
- DoubleConversion
21922192
- glog
21932193
- hermes-engine
@@ -2603,7 +2603,7 @@ SPEC CHECKSUMS:
26032603
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
26042604
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
26052605
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
2606-
stream-chat-react-native: 5f358230d87074128d47ea6bee43ef6a81720186
2606+
stream-chat-react-native: 98ee8e5faacce9bbdcbf8579802c6d04897e48d0
26072607
Yoga: 83048fe4b4ce15018a5e9ccbf0b06bd76fc643d4
26082608

26092609
PODFILE CHECKSUM: 4f662370295f8f9cee909f1a4c59a614999a209d

examples/SampleApp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "sampleapp",
3-
"version": "1.31.5",
3+
"version": "1.32.1",
44
"private": true,
55
"repository": {
66
"type": "git",

examples/SampleApp/src/components/NewDirectMessagingSendButton.tsx

Lines changed: 15 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,30 @@ import { TouchableOpacity } from 'react-native-gesture-handler';
44
import { useNavigation } from '@react-navigation/core';
55

66
import {
7-
DefaultAttachmentType,
8-
DefaultChannelType,
9-
DefaultCommandType,
10-
DefaultEventType,
11-
DefaultMessageType,
12-
DefaultReactionType,
13-
DefaultUserType,
7+
DefaultStreamChatGenerics,
148
MessageInputContextValue,
159
Search,
1610
SendRight,
1711
SendUp,
18-
UnknownType,
1912
useChannelContext,
2013
useMessageInputContext,
2114
useTheme,
2215
} from 'stream-chat-react-native';
2316

2417
import { NewDirectMessagingScreenNavigationProp } from '../screens/NewDirectMessagingScreen';
2518

26-
import { StreamChatGenerics } from '../types';
19+
import { StreamChatGenerics as LocalStreamChatGenerics } from '../types';
2720

2821
type NewDirectMessagingSendButtonPropsWithContext<
29-
At extends UnknownType = DefaultAttachmentType,
30-
Ch extends UnknownType = DefaultChannelType,
31-
Co extends string = DefaultCommandType,
32-
Ev extends UnknownType = DefaultEventType,
33-
Me extends UnknownType = DefaultMessageType,
34-
Re extends UnknownType = DefaultReactionType,
35-
Us extends UnknownType = DefaultUserType,
36-
> = Pick<MessageInputContextValue<At, Ch, Co, Ev, Me, Re, Us>, 'giphyActive' | 'sendMessage'> & {
22+
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
23+
> = Pick<MessageInputContextValue<StreamChatGenerics>, 'giphyActive' | 'sendMessage'> & {
3724
/** Disables the button */ disabled: boolean;
3825
};
3926

4027
const SendButtonWithContext = <
41-
At extends UnknownType = DefaultAttachmentType,
42-
Ch extends UnknownType = DefaultChannelType,
43-
Co extends string = DefaultCommandType,
44-
Ev extends UnknownType = DefaultEventType,
45-
Me extends UnknownType = DefaultMessageType,
46-
Re extends UnknownType = DefaultReactionType,
47-
Us extends UnknownType = DefaultUserType,
28+
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
4829
>(
49-
props: NewDirectMessagingSendButtonPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
30+
props: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
5031
) => {
5132
const { disabled = false, giphyActive, sendMessage } = props;
5233
const {
@@ -70,17 +51,9 @@ const SendButtonWithContext = <
7051
);
7152
};
7253

73-
const areEqual = <
74-
At extends UnknownType = DefaultAttachmentType,
75-
Ch extends UnknownType = DefaultChannelType,
76-
Co extends string = DefaultCommandType,
77-
Ev extends UnknownType = DefaultEventType,
78-
Me extends UnknownType = DefaultMessageType,
79-
Re extends UnknownType = DefaultReactionType,
80-
Us extends UnknownType = DefaultUserType,
81-
>(
82-
prevProps: NewDirectMessagingSendButtonPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
83-
nextProps: NewDirectMessagingSendButtonPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>,
54+
const areEqual = <StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics>(
55+
prevProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
56+
nextProps: NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>,
8457
) => {
8558
const {
8659
disabled: prevDisabled,
@@ -117,23 +90,17 @@ const MemoizedNewDirectMessagingSendButton = React.memo(
11790
) as typeof SendButtonWithContext;
11891

11992
export type SendButtonProps<
120-
At extends UnknownType = DefaultAttachmentType,
121-
Ch extends UnknownType = DefaultChannelType,
122-
Co extends string = DefaultCommandType,
123-
Ev extends UnknownType = DefaultEventType,
124-
Me extends UnknownType = DefaultMessageType,
125-
Re extends UnknownType = DefaultReactionType,
126-
Us extends UnknownType = DefaultUserType,
127-
> = Partial<NewDirectMessagingSendButtonPropsWithContext<At, Ch, Co, Ev, Me, Re, Us>>;
93+
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
94+
> = Partial<NewDirectMessagingSendButtonPropsWithContext<StreamChatGenerics>>;
12895

12996
/**
13097
* UI Component for send button in MessageInput component.
13198
*/
132-
export const NewDirectMessagingSendButton = (props: SendButtonProps<StreamChatGenerics>) => {
99+
export const NewDirectMessagingSendButton = (props: SendButtonProps<LocalStreamChatGenerics>) => {
133100
const navigation = useNavigation<NewDirectMessagingScreenNavigationProp>();
134-
const { channel } = useChannelContext<StreamChatGenerics>();
101+
const { channel } = useChannelContext<LocalStreamChatGenerics>();
135102

136-
const { giphyActive, text } = useMessageInputContext<StreamChatGenerics>();
103+
const { giphyActive, text } = useMessageInputContext<LocalStreamChatGenerics>();
137104

138105
const sendMessage = async () => {
139106
if (!channel) {
@@ -152,7 +119,7 @@ export const NewDirectMessagingSendButton = (props: SendButtonProps<StreamChatGe
152119
};
153120

154121
return (
155-
<MemoizedNewDirectMessagingSendButton<StreamChatGenerics>
122+
<MemoizedNewDirectMessagingSendButton<LocalStreamChatGenerics>
156123
{...{ giphyActive, sendMessage }}
157124
{...props}
158125
{...{ disabled: props.disabled || false }}

examples/SampleApp/src/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ export type LocalUserType = {
1717
};
1818
type LocalPollOptionType = Record<string, unknown>;
1919
type LocalPollType = Record<string, unknown>;
20+
type LocalMemberType = Record<string, unknown>;
2021

2122
export type StreamChatGenerics = {
2223
attachmentType: LocalAttachmentType;
2324
channelType: LocalChannelType;
2425
commandType: LocalCommandType;
2526
eventType: LocalEventType;
27+
memberType: LocalMemberType;
2628
messageType: LocalMessageType;
2729
pollOptionType: LocalPollOptionType;
2830
pollType: LocalPollType;

examples/SampleApp/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7361,10 +7361,10 @@ statuses@~1.5.0:
73617361
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
73627362
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
73637363

7364-
stream-chat-react-native-core@5.41.4:
7365-
version "5.41.4"
7366-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.4.tgz#55104e1eb10f464b27d82b9566a18005723ea26d"
7367-
integrity sha512-Fe2AnbfZ98nRfP5BwMOwR2iae/hT8N5oEiYOb2FwbgtJqot4UFABZDCxMVcoYcFouOK1gc5BkTjdnXYYm/L8EQ==
7364+
stream-chat-react-native-core@5.43.1:
7365+
version "5.43.1"
7366+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.43.1.tgz#ec0d5a06e329c8991c46cff5bd0211bc94d2b26f"
7367+
integrity sha512-qj/WfjFeCCP2wcp1YZGFJgRYGdSWXd0maG3hn3oURgFR6p/BmO6lDL2g3jnLq0SEkD8x+KZeNBS9cs1gW5Gblw==
73687368
dependencies:
73697369
"@gorhom/bottom-sheet" "^4.6.4"
73707370
dayjs "1.10.5"
@@ -7377,7 +7377,7 @@ [email protected]:
73777377
path "0.12.7"
73787378
react-native-markdown-package "1.8.2"
73797379
react-native-url-polyfill "^1.3.0"
7380-
stream-chat "8.42.0"
7380+
stream-chat "8.45.1"
73817381

73827382
"stream-chat-react-native-core@link:../../package":
73837383
version "0.0.0"
@@ -7387,10 +7387,10 @@ [email protected]:
73877387
version "0.0.0"
73887388
uid ""
73897389

7390-
stream-chat@8.42.0:
7391-
version "8.42.0"
7392-
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
7393-
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
7390+
stream-chat@8.45.1:
7391+
version "8.45.1"
7392+
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.45.1.tgz#001f452520602ebffe45f1634b5f5dd1ff036ec5"
7393+
integrity sha512-7OMpL2RHUd+PXSWzhTUAIjjXlI9Oqc4HhUBRfc5i6dK+Ug9S5ertb7RvyzGL5N4ITpq/6ZUAwXtTqRaN9+UUkw==
73947394
dependencies:
73957395
"@babel/runtime" "^7.16.3"
73967396
"@types/jsonwebtoken" "~9.0.0"

examples/TypeScriptMessaging/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ type LocalReactionType = Record<string, unknown>;
3636
type LocalUserType = Record<string, unknown>;
3737
type LocalPollOptionType = Record<string, unknown>;
3838
type LocalPollType = Record<string, unknown>;
39+
type LocalMemberType = Record<string, unknown>;
3940

4041
type StreamChatGenerics = {
4142
attachmentType: LocalAttachmentType;
4243
channelType: LocalChannelType;
4344
commandType: LocalCommandType;
4445
eventType: LocalEventType;
46+
memberType: LocalMemberType;
4547
messageType: LocalMessageType;
4648
pollOptionType: LocalPollOptionType;
4749
pollType: LocalPollType;

0 commit comments

Comments
 (0)