Skip to content

fix: add theme for the bottom sheet styles and message user reactions… #2827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2024
Merged

fix: add theme for the bottom sheet styles and message user reactions… #2827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package/src/components/MessageMenu/MessageUserReactionsItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ export const MessageUserReactionsItem = <
messageMenu: {
userReactions: {
avatarContainer,
avatarInnerContainer,
avatarName,
avatarNameContainer,
avatarSize,
radius,
reactionBubbleBackground,
Expand Down Expand Up @@ -69,7 +71,7 @@ export const MessageUserReactionsItem = <
accessibilityLabel='Individual User Reaction on long press message'
style={[styles.avatarContainer, avatarContainer]}
>
<View style={styles.avatarInnerContainer}>
<View style={[styles.avatarInnerContainer, avatarInnerContainer]}>
<MessageUserReactionsAvatar reaction={reaction} size={avatarSize} />
<View
style={[
Expand All @@ -91,7 +93,7 @@ export const MessageUserReactionsItem = <
/>
</View>
</View>
<View style={styles.avatarNameContainer}>
<View style={[styles.avatarNameContainer, avatarNameContainer]}>
<Text numberOfLines={2} style={[styles.avatarName, { color: black }, avatarName]}>
{name}
</Text>
Expand Down
10 changes: 7 additions & 3 deletions package/src/components/UIComponents/BottomSheetModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export const BottomSheetModal = (props: PropsWithChildren<BottomSheetModalProps>
const { children, height = windowHeight / 2, onClose, visible } = props;
const {
theme: {
bottomSheetModal: { container, contentContainer, handle, overlay: overlayTheme },
colors: { grey, overlay, white_snow },
},
} = useTheme();
Expand Down Expand Up @@ -121,7 +122,7 @@ export const BottomSheetModal = (props: PropsWithChildren<BottomSheetModalProps>
<Modal animationType='fade' onRequestClose={handleDismiss} transparent visible={visible}>
<GestureHandlerRootView style={{ flex: 1 }}>
<TouchableWithoutFeedback onPress={handleDismiss}>
<View style={[styles.overlay, { backgroundColor: overlay }]}>
<View style={[styles.overlay, { backgroundColor: overlay }, overlayTheme]}>
<GestureDetector gesture={gesture}>
<Animated.View
style={[
Expand All @@ -131,10 +132,13 @@ export const BottomSheetModal = (props: PropsWithChildren<BottomSheetModalProps>
height,
transform: [{ translateY }],
},
container,
]}
>
<View style={[styles.handle, { backgroundColor: grey, width: windowWidth / 4 }]} />
<View style={styles.contentContainer}>{children}</View>
<View
style={[styles.handle, { backgroundColor: grey, width: windowWidth / 4 }, handle]}
/>
<View style={[styles.contentContainer, contentContainer]}>{children}</View>
</Animated.View>
</GestureDetector>
</View>
Expand Down
16 changes: 16 additions & 0 deletions package/src/contexts/themeContext/utils/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ export type Theme = {
presenceIndicator: CircleProps;
presenceIndicatorContainer: ViewStyle;
};
bottomSheetModal: {
container: ViewStyle;
contentContainer: ViewStyle;
handle: ViewStyle;
overlay: ViewStyle;
};
channel: {
selectChannel: TextStyle;
};
Expand Down Expand Up @@ -436,7 +442,9 @@ export type Theme = {
};
userReactions: {
avatarContainer: ViewStyle;
avatarInnerContainer: ViewStyle;
avatarName: TextStyle;
avatarNameContainer: ViewStyle;
avatarSize: number;
container: ViewStyle;
contentContainer: ViewStyle;
Expand Down Expand Up @@ -852,6 +860,12 @@ export const defaultTheme: Theme = {
},
presenceIndicatorContainer: {},
},
bottomSheetModal: {
container: {},
contentContainer: {},
handle: {},
overlay: {},
},
channel: {
selectChannel: {},
},
Expand Down Expand Up @@ -1161,7 +1175,9 @@ export const defaultTheme: Theme = {
},
userReactions: {
avatarContainer: {},
avatarInnerContainer: {},
avatarName: {},
avatarNameContainer: {},
avatarSize: 64,
container: {},
contentContainer: {},
Expand Down
Loading