Skip to content

Commit de5b7b7

Browse files
authored
Merge pull request #3053 from GetStream/develop
Next Release
2 parents d443859 + 74a3d04 commit de5b7b7

File tree

6 files changed

+31
-17
lines changed

6 files changed

+31
-17
lines changed

package/expo-package/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4733,10 +4733,10 @@ [email protected], stream-buffers@~2.2.0:
47334733
resolved "https://registry.yarnpkg.com/stream-buffers/-/stream-buffers-2.2.0.tgz#91d5f5130d1cef96dcfa7f726945188741d09ee4"
47344734
integrity sha512-uyQK/mx5QjHun80FLJTfaWE7JtwfRMKBLkMne6udYOmvH0CawotVa7TfgYHzAnpphn4+TweIx1QKMnRIbipmUg==
47354735

4736-
4737-
version "6.7.0"
4738-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.0.tgz#d9e8c8ca57db93f148ef8acab93d3552f425eb36"
4739-
integrity sha512-Ue/euBMJ2h/H33hp58znfOMFzocgyW+dqvS8qiCooO5RZ26zQYGSDvmp8TeYyiBpqwM927vqfrPmPqOeXb12IQ==
4736+
4737+
version "6.7.1"
4738+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.1.tgz#37cdfbc5c7f8a5bac5634b954da4bbdcd2fb95f2"
4739+
integrity sha512-4ePEMt1W+iw3zUulSDRFO9Nt4HPa8kW6wJ3Qv+ZN+y886rvcUuTuH18MFrdrJtHYb+UxCU+X3oz++3qzq7Jzxw==
47404740
dependencies:
47414741
"@gorhom/bottom-sheet" "^5.1.1"
47424742
dayjs "1.10.5"

package/native-package/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3409,10 +3409,10 @@ statuses@~1.5.0:
34093409
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
34103410
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
34113411

3412-
3413-
version "6.7.0"
3414-
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.0.tgz#d9e8c8ca57db93f148ef8acab93d3552f425eb36"
3415-
integrity sha512-Ue/euBMJ2h/H33hp58znfOMFzocgyW+dqvS8qiCooO5RZ26zQYGSDvmp8TeYyiBpqwM927vqfrPmPqOeXb12IQ==
3412+
3413+
version "6.7.1"
3414+
resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-6.7.1.tgz#37cdfbc5c7f8a5bac5634b954da4bbdcd2fb95f2"
3415+
integrity sha512-4ePEMt1W+iw3zUulSDRFO9Nt4HPa8kW6wJ3Qv+ZN+y886rvcUuTuH18MFrdrJtHYb+UxCU+X3oz++3qzq7Jzxw==
34163416
dependencies:
34173417
"@gorhom/bottom-sheet" "^5.1.1"
34183418
dayjs "1.10.5"

package/src/components/Message/Message.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ const MessageWithContext = <
296296
const {
297297
theme: {
298298
colors: { targetedMessageBackground },
299-
messageSimple: { targetedMessageContainer, unreadUnderlayColor },
299+
messageSimple: { targetedMessageContainer, unreadUnderlayColor, wrapper },
300300
screenPadding,
301301
},
302302
} = useTheme();
@@ -737,8 +737,12 @@ const MessageWithContext = <
737737
<View
738738
style={[
739739
{ marginTop: 2, paddingHorizontal: screenPadding },
740+
wrapper,
740741
(isTargetedMessage || message.pinned) && !isMessageTypeDeleted
741-
? { backgroundColor: targetedMessageBackground, ...targetedMessageContainer }
742+
? {
743+
backgroundColor: targetedMessageBackground,
744+
...targetedMessageContainer,
745+
}
742746
: {},
743747
]}
744748
testID='message-wrapper'

package/src/components/Thread/__tests__/__snapshots__/Thread.test.js.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ exports[`Thread should match thread snapshot 1`] = `
276276
"paddingHorizontal": 8,
277277
},
278278
{},
279+
{},
279280
]
280281
}
281282
testID="message-wrapper"
@@ -787,6 +788,7 @@ exports[`Thread should match thread snapshot 1`] = `
787788
"paddingHorizontal": 8,
788789
},
789790
{},
791+
{},
790792
]
791793
}
792794
testID="message-wrapper"
@@ -1336,6 +1338,7 @@ exports[`Thread should match thread snapshot 1`] = `
13361338
"paddingHorizontal": 8,
13371339
},
13381340
{},
1341+
{},
13391342
]
13401343
}
13411344
testID="message-wrapper"
@@ -1837,6 +1840,7 @@ exports[`Thread should match thread snapshot 1`] = `
18371840
"paddingHorizontal": 8,
18381841
},
18391842
{},
1843+
{},
18401844
]
18411845
}
18421846
testID="message-wrapper"

package/src/components/UIComponents/BottomSheetModal.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { PropsWithChildren, useEffect } from 'react';
1+
import React, { PropsWithChildren, useEffect, useMemo } from 'react';
22
import {
33
Animated,
44
Keyboard,
@@ -50,13 +50,17 @@ export const BottomSheetModal = (props: PropsWithChildren<BottomSheetModalProps>
5050
},
5151
} = useTheme();
5252

53-
const translateY = new Animated.Value(height);
53+
const translateY = useMemo(() => new Animated.Value(height), [height]);
5454

55-
const openAnimation = Animated.timing(translateY, {
56-
duration: 200,
57-
toValue: 0,
58-
useNativeDriver: true,
59-
});
55+
const openAnimation = useMemo(
56+
() =>
57+
Animated.timing(translateY, {
58+
duration: 200,
59+
toValue: 0,
60+
useNativeDriver: true,
61+
}),
62+
[translateY],
63+
);
6064

6165
const closeAnimation = Animated.timing(translateY, {
6266
duration: 50,

package/src/contexts/themeContext/utils/theme.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ export type Theme = {
674674
roundedView: ViewStyle;
675675
};
676676
unreadUnderlayColor?: ColorValue;
677+
wrapper: ViewStyle;
677678
};
678679
poll: {
679680
allOptions: {
@@ -1466,6 +1467,7 @@ export const defaultTheme: Theme = {
14661467
container: {},
14671468
roundedView: {},
14681469
},
1470+
wrapper: {},
14691471
},
14701472
poll: {
14711473
allOptions: {

0 commit comments

Comments
 (0)