Skip to content

Commit 1c52f4f

Browse files
committed
chore: resolve conflicts from develop
1 parent 0e5a3ef commit 1c52f4f

File tree

108 files changed

+3210
-2289
lines changed

Some content is hidden

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

108 files changed

+3210
-2289
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ index.android.bundle
2323
*.app
2424
*.DSYM.zip
2525
**/metrics/
26+
27+
#docusaurus
28+
docusaurus/shared

β€Ž.nvmrcβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20
1+
v20

β€Ž.styles/Vocab/Base/accept.txtβ€Ž

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,9 @@ haptics
4444
async
4545
Podfile
4646
pickFile
47-
onChange
47+
onChange
48+
boolean
49+
Async
50+
subscribable
51+
memoizing
52+
Boolean

β€ŽREADME.mdβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
> The official React Native and Expo components for Stream Chat, a service for
88
> building chat applications.
99
10-
1110
[![NPM](https://img.shields.io/npm/v/stream-chat-react-native.svg)](https://www.npmjs.com/package/stream-chat-react-native)
1211
[![Build Status](https://github.com/GetStream/stream-chat-react-native/actions/workflows/release.yml/badge.svg)](https://github.com/GetStream/stream-chat-react-native/actions)
1312
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/reactnative)
14-
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-442%20KB-blue)
13+
![JS Bundle Size](https://img.shields.io/badge/js_bundle_size-447%20KB-blue)
1514

1615
<img align="right" src="https://getstream.imgix.net/images/ios-chat-tutorial/[email protected]?auto=format,enhance" width="50%" />
1716

452 KB
Loading
408 KB
Loading
373 KB
Loading
299 KB
Loading
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
An instance of the [`Thread` class](https://github.com/GetStream/stream-chat-js/blob/master/src/thread.ts) that can be used to either get more data about the thread or pass to `onThreadSelect`.
2+
3+
| Type |
4+
| ------ |
5+
| Thread |
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
An object containing [`FlatListProps`](https://reactnative.dev/docs/flatlist#props) that can be used to override the default ones provided in the `ThreadList`.
2+
3+
| Type |
4+
| ------ |
5+
| object |

0 commit comments

Comments
Β (0)