Skip to content

Commit

Permalink
Merge pull request #2749 from GetStream/develop
Browse files Browse the repository at this point in the history
Next Release
  • Loading branch information
isekovanic authored Nov 1, 2024
2 parents 3ef1377 + d7deaf4 commit 1da68f4
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 64 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
A message object that when set indicates a thread is open.
Can be either a `MessageType` object or a [`ThreadType`](https://github.com/GetStream/stream-chat-react-native/blob/develop/package/src/contexts/threadContext/ThreadContext.tsx) that when set indicates a thread is open.
Both of the types may be used interchangeably.

When used with the [`Thread`](../../../../ui-components/thread.mdx) component this will display the thread.
When used with the standard [`MessageList`](../../../../ui-components/message-list.mdx) component this will prevent any singleton components in the [`OverlayProvider`](../../../../core-components/overlay-provider.mdx) form getting out of sync.

Expand Down
6 changes: 3 additions & 3 deletions docusaurus/docs/reactnative/hooks/poll/use-poll-state.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ A property containing the number of answers (comments) to the `poll`.
| -------- |
| `number` |

### `created_by`
### `createdBy`

A property containing information about the user who created the `poll`. Its type can be found [here](https://github.com/GetStream/stream-chat-js/blob/b447512922b19bc7e3668bd9df81debcb673dd81/src/types.ts) under `UserResponse`.

Expand All @@ -57,7 +57,7 @@ A property depicting whether each user should have only one and unique vote or t
| --------- |
| `boolean` |

### `is_closed`
### `isClosed`

A property depicting whether the `poll` is still open for voting or not.

Expand All @@ -75,7 +75,7 @@ This property is not available for anonymous polls.
| -------------------------- |
| `Record<string, PollVote>` |

### `max_votes_allowed`
### `maxVotesAllowed`

A property containing the maximum number of votes allowed per user.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,13 @@ Please keep in mind that `message.poll` is not going to be reactive, but will ra

The React Native SDK provides 2 utility hooks to help with consuming the `poll` state. They can be found listed below:

- [`usePollStateStore`](./hooks/poll/use-poll-state-store.mdx)
- [`usePollState`](./hooks/poll/use-poll-state.mdx)
- [`usePollStateStore`](../hooks/poll/use-poll-state-store.mdx)
- [`usePollState`](../hooks/poll/use-poll-state.mdx)

Similarly to the `threads` feature, one can also directly use `useStateStore` and access `StreamChat.polls.fromState(<poll-id>).state` through custom `selector`s.

:::note
Both `usePollStateStore` and `usePollState` can only be used in children of a [`PollContext`](./contexts/poll-context.mdx). This impediment does not exist however on `useStateStore`.
Both `usePollStateStore` and `usePollState` can only be used in children of a [`PollContext`](../contexts/poll-context.mdx). This impediment does not exist however on `useStateStore`.
:::

Due to this, all `poll` related components within the SDK are self-wrapped within a `PollContext` and require `message` and `poll` as mandatory props.
Expand Down
2 changes: 1 addition & 1 deletion docusaurus/docs/reactnative/ui-components/thread.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const App = () => {
return (
<OverlayProvider>
<Chat client={client}>
<Channel channel={channel} thread={messageId} threadList>
<Channel channel={channel} thread={message} threadList>
// highlight-next-line
<Thread />
</Channel>
Expand Down
18 changes: 9 additions & 9 deletions examples/ExpoMessaging/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7310,10 +7310,10 @@ [email protected], stream-buffers@~2.2.0:
version "0.0.0"
uid ""

stream-chat-react-native-core@5.39.6:
version "5.39.6"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.6.tgz#bc40925070a55e45afb98d6518c899ab80273486"
integrity sha512-DlPC4UzBa/aP7UeT/e0axJ/S4y3QQ1TS6oxrYVQlZGasFxgmL+OUDfoj6HwX9J/DOSrogw9/YF6yZLXTorlB/g==
stream-chat-react-native-core@5.41.0:
version "5.41.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.0.tgz#defaeee932459c6357147c553167adee8d34493d"
integrity sha512-x46BYWWfRaRw3FbLLzCoJP636jHQrX+my9DG680t9p8wNWKX59imnqX9LjZVcOYo45vpJ8T5Zjs0kYXbDgppTQ==
dependencies:
"@gorhom/bottom-sheet" "^4.6.4"
dayjs "1.10.5"
Expand All @@ -7326,16 +7326,16 @@ [email protected]:
path "0.12.7"
react-native-markdown-package "1.8.2"
react-native-url-polyfill "^1.3.0"
stream-chat "8.41.1"
stream-chat "8.42.0"

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

stream-chat@8.41.1:
version "8.41.1"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.41.1.tgz#c991980b800b67ec38202a1aa3bbbd4112ccb5fa"
integrity sha512-WV0mHHm88D4RbAV42sD0+SqTWLCvjIwfGZ3nSBXRAuGpVYJEqnNUhEd4OIQ+YrXVbjY7qWz9L5XRk5fZIfE9kg==
stream-chat@8.42.0:
version "8.42.0"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
dependencies:
"@babel/runtime" "^7.16.3"
"@types/jsonwebtoken" "~9.0.0"
Expand Down
6 changes: 3 additions & 3 deletions examples/SampleApp/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
Firebase: 91fefd38712feb9186ea8996af6cbdef41473442
Expand All @@ -1556,7 +1556,7 @@ SPEC CHECKSUMS:
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
GoogleAppMeasurement: f3abf08495ef2cba7829f15318c373b8d9226491
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
Expand Down Expand Up @@ -1637,4 +1637,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 751ee2c534898a790da0a7dba7d623f1f21ae757

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
10 changes: 8 additions & 2 deletions examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,10 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down Expand Up @@ -817,7 +820,10 @@
"-DFOLLY_USE_LIBCPP=1",
"-DFOLLY_CFG_NO_COROUTINES=1",
);
OTHER_LDFLAGS = "$(inherited) ";
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
USE_HERMES = true;
Expand Down
25 changes: 5 additions & 20 deletions examples/SampleApp/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6837,10 +6837,10 @@ statuses@~1.5.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==

stream-chat-react-native-core@5.39.6:
version "5.39.6"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.6.tgz#bc40925070a55e45afb98d6518c899ab80273486"
integrity sha512-DlPC4UzBa/aP7UeT/e0axJ/S4y3QQ1TS6oxrYVQlZGasFxgmL+OUDfoj6HwX9J/DOSrogw9/YF6yZLXTorlB/g==
stream-chat-react-native-core@5.41.0:
version "5.41.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.0.tgz#defaeee932459c6357147c553167adee8d34493d"
integrity sha512-x46BYWWfRaRw3FbLLzCoJP636jHQrX+my9DG680t9p8wNWKX59imnqX9LjZVcOYo45vpJ8T5Zjs0kYXbDgppTQ==
dependencies:
"@gorhom/bottom-sheet" "^4.6.4"
dayjs "1.10.5"
Expand All @@ -6853,7 +6853,7 @@ [email protected]:
path "0.12.7"
react-native-markdown-package "1.8.2"
react-native-url-polyfill "^1.3.0"
stream-chat "8.41.1"
stream-chat "8.42.0"

"stream-chat-react-native-core@link:../../package":
version "0.0.0"
Expand All @@ -6863,21 +6863,6 @@ [email protected]:
version "0.0.0"
uid ""

[email protected]:
version "8.41.1"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.41.1.tgz#c991980b800b67ec38202a1aa3bbbd4112ccb5fa"
integrity sha512-WV0mHHm88D4RbAV42sD0+SqTWLCvjIwfGZ3nSBXRAuGpVYJEqnNUhEd4OIQ+YrXVbjY7qWz9L5XRk5fZIfE9kg==
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.5.10"

[email protected]:
version "8.42.0"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
Expand Down
6 changes: 3 additions & 3 deletions examples/TypeScriptMessaging/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Expand All @@ -1441,7 +1441,7 @@ SPEC CHECKSUMS:
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
FlipperKit: 37525a5d056ef9b93d1578e04bc3ea1de940094f
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
hermes-engine: 9cecf9953a681df7556b8cc9c74905de8f3293c0
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Expand Down Expand Up @@ -1511,4 +1511,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 90406e1e85c82b37484f5d746afa45c0637bb4b3

COCOAPODS: 1.15.2
COCOAPODS: 1.16.2
18 changes: 9 additions & 9 deletions examples/TypeScriptMessaging/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6899,10 +6899,10 @@ statuses@~1.5.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==

stream-chat-react-native-core@5.39.6:
version "5.39.6"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.39.6.tgz#bc40925070a55e45afb98d6518c899ab80273486"
integrity sha512-DlPC4UzBa/aP7UeT/e0axJ/S4y3QQ1TS6oxrYVQlZGasFxgmL+OUDfoj6HwX9J/DOSrogw9/YF6yZLXTorlB/g==
stream-chat-react-native-core@5.41.0:
version "5.41.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.0.tgz#defaeee932459c6357147c553167adee8d34493d"
integrity sha512-x46BYWWfRaRw3FbLLzCoJP636jHQrX+my9DG680t9p8wNWKX59imnqX9LjZVcOYo45vpJ8T5Zjs0kYXbDgppTQ==
dependencies:
"@gorhom/bottom-sheet" "^4.6.4"
dayjs "1.10.5"
Expand All @@ -6915,7 +6915,7 @@ [email protected]:
path "0.12.7"
react-native-markdown-package "1.8.2"
react-native-url-polyfill "^1.3.0"
stream-chat "8.41.1"
stream-chat "8.42.0"

"stream-chat-react-native-core@link:../../package":
version "0.0.0"
Expand All @@ -6930,10 +6930,10 @@ stream-chat-react-native-devtools@^1.1.0:
version "0.0.0"
uid ""

stream-chat@8.41.1:
version "8.41.1"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.41.1.tgz#c991980b800b67ec38202a1aa3bbbd4112ccb5fa"
integrity sha512-WV0mHHm88D4RbAV42sD0+SqTWLCvjIwfGZ3nSBXRAuGpVYJEqnNUhEd4OIQ+YrXVbjY7qWz9L5XRk5fZIfE9kg==
stream-chat@8.42.0:
version "8.42.0"
resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-8.42.0.tgz#124ea2c10c6e8f7990304e1101c66751daf63e6c"
integrity sha512-8xZz+fmdHSOa3L1rHUOC4Wah+ipvLvdiOmeOfGK6uXnLOKlSHMOblwmQErrOoFM4SKfX9Bea3V8viaKUu6bPng==
dependencies:
"@babel/runtime" "^7.16.3"
"@types/jsonwebtoken" "~9.0.0"
Expand Down
8 changes: 4 additions & 4 deletions package/expo-package/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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==

stream-chat-react-native-core@5.40.0:
version "5.40.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.40.0.tgz#edb325c81c6ba63f3f6f1f23acec7408ed63ef4c"
integrity sha512-zTAg29l1U3LLU1ZdmyicBbOekGgiyXJxcGXtlYbwCZdvY+mhAVh9zhL9y9GIIx/Mdox1U06s5bQXcKbQsLeuqg==
stream-chat-react-native-core@5.41.0:
version "5.41.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.0.tgz#defaeee932459c6357147c553167adee8d34493d"
integrity sha512-x46BYWWfRaRw3FbLLzCoJP636jHQrX+my9DG680t9p8wNWKX59imnqX9LjZVcOYo45vpJ8T5Zjs0kYXbDgppTQ==
dependencies:
"@gorhom/bottom-sheet" "^4.6.4"
dayjs "1.10.5"
Expand Down
8 changes: 4 additions & 4 deletions package/native-package/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4244,10 +4244,10 @@ statuses@~1.5.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==

stream-chat-react-native-core@5.40.0:
version "5.40.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.40.0.tgz#edb325c81c6ba63f3f6f1f23acec7408ed63ef4c"
integrity sha512-zTAg29l1U3LLU1ZdmyicBbOekGgiyXJxcGXtlYbwCZdvY+mhAVh9zhL9y9GIIx/Mdox1U06s5bQXcKbQsLeuqg==
stream-chat-react-native-core@5.41.0:
version "5.41.0"
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.41.0.tgz#defaeee932459c6357147c553167adee8d34493d"
integrity sha512-x46BYWWfRaRw3FbLLzCoJP636jHQrX+my9DG680t9p8wNWKX59imnqX9LjZVcOYo45vpJ8T5Zjs0kYXbDgppTQ==
dependencies:
"@gorhom/bottom-sheet" "^4.6.4"
dayjs "1.10.5"
Expand Down
6 changes: 4 additions & 2 deletions package/src/components/Channel/Channel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2516,8 +2516,10 @@ const ChannelWithContext = <

export type ChannelProps<
StreamChatGenerics extends DefaultStreamChatGenerics = DefaultStreamChatGenerics,
> = Partial<Omit<ChannelPropsWithContext<StreamChatGenerics>, 'channel'>> &
Pick<ChannelPropsWithContext<StreamChatGenerics>, 'channel'>;
> = Partial<Omit<ChannelPropsWithContext<StreamChatGenerics>, 'channel' | 'thread'>> &
Pick<ChannelPropsWithContext<StreamChatGenerics>, 'channel'> & {
thread?: MessageType<StreamChatGenerics> | ThreadType<StreamChatGenerics> | null;
};

/**
*
Expand Down

0 comments on commit 1da68f4

Please sign in to comment.