Skip to content

Commit 49ab5f4

Browse files
committed
chore: resolve conflicts from develop
2 parents d6788b8 + 9f03aa4 commit 49ab5f4

File tree

49 files changed

+419
-241
lines changed

Some content is hidden

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

49 files changed

+419
-241
lines changed

docusaurus/docs/reactnative/basics/hello_stream_chat.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ Before starting make sure you have installed `stream-chat-react-native` as direc
2727
Stream Chat for React Native uses [`stream-chat`](https://github.com/GetStream/stream-chat-js), Stream's JavaScript client, to interact with Stream's chat services.
2828
`stream-chat` is a dependency of Stream Chat for React Native so it is can be used once `stream-chat-react-native` is installed.
2929

30-
To start you must get an instance of Stream Chat, for this you will need an API key.
31-
To create one you can sign up for a [free 30-day trial](https://getstream.io/chat/trial/) of Stream Chat, no CC is required.
30+
To start, you can sign up for a [Free subscription](https://getstream.io/chat/pricing/) and then get your API key.
3231

3332
```ts
3433
import { StreamChat } from 'stream-chat';

docusaurus/docs/reactnative/basics/internationalization.mdx

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ streami18n.registerTranslation('nl', {
106106
[`react-native-localize`](https://github.com/zoontek/react-native-localize#-react-native-localize) package provides a toolbox for React Native app localization. You can use this package to access user preferred locale, and use it to set language for chat components:
107107

108108
```tsx
109-
import *as RNLocalizefrom 'react-native-localize';
110-
const streami18n =new Streami18n();
109+
import * as RNLocalize from 'react-native-localize';
110+
const streami18n = new Streami18n();
111111

112112
const userPreferredLocales = RNLocalize.getLocales();
113113

@@ -176,14 +176,14 @@ const i18n =new Streami18n({
176176
Or by providing your own [Day.js](https://day.js.org/docs/en/installation/installation) object:
177177

178178
```tsx
179-
import Dayjsfrom 'dayjs';
179+
import Dayjs from 'dayjs';
180180

181181
import 'dayjs/locale/nl';
182182
import 'dayjs/locale/it';
183183
// or if you want to include all locales
184184
import 'dayjs/min/locales';
185185

186-
const i18n =new Streami18n({
186+
const i18n = new Streami18n({
187187
language: 'nl',
188188
DateTimeParser: Dayjs,
189189
});
@@ -195,6 +195,28 @@ If you would like to stick with English language for date-times in Stream compon
195195

196196
If your application has a user-base that speaks more than one language, Stream's Chat Client provides the option to automatically translate messages. For more information on using automatic machine translation for messages, see the [Chat Client Guide on Translation](https://getstream.io/chat/docs/react-native/translation/?language=javascript).
197197

198+
### Timezone location
199+
200+
To display date and time in different than machine's local timezone, you can provide the timezone parameter to the `Streami18n` constructor. The timezone value has to be a valid [timezone identifier string](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). If no timezone parameter is provided, then the machine's local timezone is applied.
201+
202+
:::note
203+
On our React Native SDK, the timezone is only supported through `moment-timezone` and not through the default `Dayjs`. This is because of the [following issue](https://github.com/iamkun/dayjs/issues/1377).
204+
205+
So, to ensure this please pass the `moment-timezone` object to the `DateTimeParser` key of the `Streami18n` constructor.
206+
:::
207+
208+
```tsx
209+
import { Streami18n } from 'stream-chat-react';
210+
import momentTimezone from 'moment-timezone';
211+
212+
const streami18n = new Streami18n({
213+
DateTimeParser: momentTimezone,
214+
timezone: 'Europe/Budapest',
215+
});
216+
```
217+
218+
Moment Timezone will automatically load and extend the moment module, then return the modified instance. This will also prevent multiple versions of moment being installed in a project.
219+
198220
## Options
199221

200222
`options` are the first optional parameter passed to `Streami18n`, it is an object with all keys being optional.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Boolean to enable/disable parent message press.
2+
3+
| Type | Default |
4+
| ------- | ------- |
5+
| Boolean | `true` |

docusaurus/docs/reactnative/contexts/thread-context.mdx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Thread from '../common-content/ui-components/channel/props/thread.mdx';
99
import CloseThread from '../common-content/contexts/thread-context/close_thread.mdx';
1010
import LoadMoreThread from '../common-content/contexts/thread-context/load_more_thread.mdx';
1111
import OpenThread from '../common-content/contexts/thread-context/open_thread.mdx';
12+
import ParentMessagePreventPress from '../common-content/contexts/thread-context/parent_message_prevent_press.mdx';
1213
import ReloadThread from '../common-content/contexts/thread-context/reload_thread.mdx';
1314
import SetThreadLoadingMore from '../common-content/contexts/thread-context/set_thread_loading_more.mdx';
1415
import ThreadHasMore from '../common-content/contexts/thread-context/thread_has_more.mdx';
@@ -38,7 +39,7 @@ const value = useThreadContext();
3839

3940
## Value
4041

41-
### <div class="label description">_forwarded from [Channel](../../core-components/channel#allowthreadmessagesinchannel)_ props</div> allowThreadMessagesInChannel {#allowthreadmessagesinchannel}
42+
### <div class="label description">_forwarded from [Channel](../../core-components/channel#allowthreadmessagesinchannel)_ props</div> allowThreadMessagesInChannel `{#allowthreadmessagesinchannel}`
4243

4344
<AllowThreadMessagesInChannel />
4445

@@ -54,6 +55,10 @@ const value = useThreadContext();
5455

5556
<OpenThread />
5657

58+
### `parentMessagePreventPress`
59+
60+
<ParentMessagePreventPress />
61+
5762
### `reloadThread`
5863

5964
<ReloadThread />

docusaurus/docs/reactnative/ui-components/overview.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Stream Chat for React Native uses [`stream-chat`](https://github.com/GetStream/s
3030
You don't have to explicitly install `stream-chat` in your project.
3131
:::
3232

33-
To start you must get an instance of Stream Chat, for this you will need an API key. To create one you can sign up for a [free 30-day trial](https://getstream.io/chat/trial/) of Stream Chat.
33+
To start, you can sign up for a [Free subscription](https://getstream.io/chat/pricing/) and then get your API key.
3434

3535
```ts
3636
import { StreamChat } from 'stream-chat';

docusaurus/docs/reactnative/ui-components/thread.mdx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Thread from '../common-content/ui-components/channel/props/thread.mdx';
99

1010
import CloseThread from '../common-content/contexts/thread-context/close_thread.mdx';
1111
import LoadMoreThread from '../common-content/contexts/thread-context/load_more_thread.mdx';
12+
import ParentMessagePreventPress from '../common-content/contexts/thread-context/parent_message_prevent_press.mdx';
1213
import ReloadThread from '../common-content/contexts/thread-context/reload_thread.mdx';
1314

1415
Component to render thread replies for a message, along with and input box for adding new thread replies. This component internally uses `MessageList` and `MessageInput` components.
@@ -70,7 +71,7 @@ Closes thread on dismount, defaults to `true`.
7071

7172
<Client />
7273

73-
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#closeThread)</div> `closeThread` {#closeThread}
74+
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#closethread)</div> `closeThread` {#closeThread}
7475

7576
<CloseThread />
7677

@@ -82,7 +83,7 @@ When true, the underlying input box will be disabled.
8283
| ------- | ------- |
8384
| Boolean | `false` |
8485

85-
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#loadMoreThread)</div> `loadMoreThread` {#loadMoreThread}
86+
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#loadmorethread)</div> `loadMoreThread` {#loadMoreThread}
8687

8788
<LoadMoreThread />
8889

@@ -94,7 +95,11 @@ Function which gets called when Thread component un-mounts.
9495
| -------- |
9596
| Function |
9697

97-
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#reloadThread)</div> `reloadThread` {#reloadThread}
98+
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#parentmessagepreventpress)</div> `parentMessagePreventPress` {#parentMessagePreventPress}
99+
100+
<ParentMessagePreventPress />
101+
102+
### <div class="label description">overrides the value from [ThreadContext](../../contexts/thread-context#reloadthread)</div> `reloadthread` {#reloadThread}
98103

99104
<ReloadThread />
100105

examples/ExpoMessaging/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7457,10 +7457,10 @@ [email protected], stream-buffers@~2.2.0:
74577457
version "0.0.0"
74587458
uid ""
74597459

7460-
7461-
version "5.33.0"
7462-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.33.0.tgz#14f04de90cbc8db011bab8db3fa84abe2dc2eaec"
7463-
integrity sha512-V9OJA9MrHzaCw5q16ZRbEktA1HamITbXPOkVZOjpDbb0OBcmedmOnD9C2NFIprc770lhllS/1MKBDr0GdQ9NXQ==
7460+
7461+
version "5.33.1"
7462+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-5.33.1.tgz#d9e7847469d3ffb6e7fd35fbb7b720f2e25d172e"
7463+
integrity sha512-TCDmChJe07cYyL3sErc6qycRFMA+HbflCKRGrFvVvpU0RdWJljaqiOo3avFSauciSnQxx9WxzTkMism8YsFHcQ==
74647464
dependencies:
74657465
"@gorhom/bottom-sheet" "4.4.8"
74667466
dayjs "1.10.5"

examples/SampleApp/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
### [1.27.6](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.27.6) (2024-07-08)
4+
5+
6+
### Workspaces
7+
8+
* Following linked packages updated: [stream-chat-react-native]
9+
310
### [1.27.5](https://github.com/GetStream/stream-chat-react-native/compare/[email protected]@v1.27.5) (2024-06-27)
411

512

examples/SampleApp/ios/Podfile.lock

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,14 +1058,13 @@ PODS:
10581058
- React-Core
10591059
- react-native-safe-area-context (4.10.7):
10601060
- React-Core
1061-
- react-native-video (6.0.0-beta.8):
1061+
- react-native-video (6.4.2):
10621062
- glog
10631063
- RCT-Folly (= 2022.05.16.00)
10641064
- React-Core
1065-
- react-native-video/Video (= 6.0.0-beta.8)
1066-
- react-native-video/Video (6.0.0-beta.8):
1065+
- react-native-video/Video (= 6.4.2)
1066+
- react-native-video/Video (6.4.2):
10671067
- glog
1068-
- PromisesSwift
10691068
- RCT-Folly (= 2022.05.16.00)
10701069
- React-Core
10711070
- React-nativeconfig (0.73.5)
@@ -1583,7 +1582,7 @@ SPEC CHECKSUMS:
15831582
react-native-image-resizer: fd0c333eca55147bd55c5e054cac95dcd0da6814
15841583
react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc
15851584
react-native-safe-area-context: 422017db8bcabbada9ad607d010996c56713234c
1586-
react-native-video: 2e38d3e0f7382427539b6b436812553480fcf70a
1585+
react-native-video: 244d6e4f8f426df9d5cc20915a56194399e9e067
15871586
React-nativeconfig: 78e2b14c0ee479449845b67bbe103343257cbcc0
15881587
React-NativeModulesApple: 4fce13d416890352a7a9621427459fe738c4e79a
15891588
React-perflogger: 0dd9f1725d55f8264b81efadd373fe1d9cca7dc2

examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -633,15 +633,6 @@
633633
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
634634
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
635635
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
636-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
637-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
638-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
639-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
640-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
641-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
642-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
643-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
644-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
645636
);
646637
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
647638
LD_RUNPATH_SEARCH_PATHS = (
@@ -753,15 +744,6 @@
753744
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
754745
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
755746
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
756-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
757-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
758-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
759-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
760-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
761-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
762-
" ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers",
763-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx",
764-
" ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers",
765747
);
766748
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
767749
LD_RUNPATH_SEARCH_PATHS = (

0 commit comments

Comments
 (0)