Skip to content

fix: message issues with alignment and styles #3439

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
khushal87 merged 3 commits into from
Feb 27, 2026
+977 −1,055
Merged

fix: message issues with alignment and styles #3439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
529d286
fix: gallery layout issue
khushal87 Feb 26, 2026
8bb414b
Merge branch 'develop' of github.com:GetStream/stream-chat-react-nati…
khushal87 Feb 27, 2026
2418f3e
fix: message issues with alignment and styles
khushal87 Feb 27, 2026
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
208 changes: 111 additions & 97 deletions package/src/components/Message/Message.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
import {
GestureResponderEvent,
StyleProp,
StyleSheet,
useWindowDimensions,
View,
ViewStyle,
Expand Down Expand Up @@ -323,14 +324,6 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
);
const isMessageTypeDeleted = message.type === 'deleted';
const { client } = chatContext;
const {
theme: {
colors: { bg_gradient_start },
messageSimple: { targetedMessageContainer, unreadUnderlayColor = bg_gradient_start, wrapper },
screenPadding,
semantics,
},
} = useTheme();

const [rect, setRect] = useState<{ w: number; h: number; x: number; y: number } | undefined>(
undefined,
Expand Down Expand Up @@ -802,6 +795,11 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
}
}, [overlayActive, message]);

const styles = useStyles({
showUnreadUnderlay,
highlightedMessage: (isTargetedMessage || message.pinned) && !isMessageTypeDeleted,
});

if (!(isMessageTypeDeleted || messageContentOrder.length)) {
return null;
}
Expand All @@ -812,103 +810,82 @@ const MessageWithContext = (props: MessagePropsWithContext) => {

return (
<MessageProvider value={messageContext}>
<View
style={[
style,
{
backgroundColor: showUnreadUnderlay ? unreadUnderlayColor : undefined,
},
]}
>
<View
style={[
{ paddingHorizontal: screenPadding },
wrapper,
(isTargetedMessage || message.pinned) && !isMessageTypeDeleted
? {
backgroundColor: semantics.backgroundCoreHighlight,
...targetedMessageContainer,
}
: {},
]}
testID='message-wrapper'
>
<View style={[style, styles.wrapper]} testID='message-wrapper'>
{overlayActive && rect ? (
<View
style={{
height: rect.h,
width: rect.w,
}}
/>
) : null}
{/*TODO: V9: Find a way to separate these in a dedicated file*/}
<Portal hostName={overlayActive && rect ? 'top-item' : undefined}>
{overlayActive && rect ? (
<View
style={{
height: rect.h,
width: rect.w,
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;

setOverlayTopH({
h,
w,
x: isMyMessage ? screenW - rect.x - w : rect.x,
y: rect.y - h,
});
}}
/>
>
<MessageReactionPicker
dismissOverlay={dismissOverlay}
handleReaction={ownCapabilities.sendReaction ? handleReaction : undefined}
/>
</View>
) : null}
{/*TODO: V9: Find a way to separate these in a dedicated file*/}
<Portal hostName={overlayActive && rect ? 'top-item' : undefined}>
{overlayActive && rect ? (
<View
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;

setOverlayTopH({
h,
w,
x: isMyMessage ? screenW - rect.x - w : rect.x,
y: rect.y - h,
});
}}
>
<MessageReactionPicker
dismissOverlay={dismissOverlay}
handleReaction={ownCapabilities.sendReaction ? handleReaction : undefined}
/>
</View>
) : null}
</Portal>
<Portal
hostName={overlayActive ? 'message-overlay' : undefined}
style={overlayActive && rect ? { width: rect.w } : undefined}
</Portal>
<Portal
hostName={overlayActive ? 'message-overlay' : undefined}
style={overlayActive && rect ? { width: rect.w } : undefined}
>
<MessageSimple ref={messageWrapperRef} />
</Portal>
{showMessageReactions ? (
<BottomSheetModal
lazy={true}
onClose={() => setShowMessageReactions(false)}
visible={showMessageReactions}
height={424}
>
<MessageSimple ref={messageWrapperRef} />
</Portal>
{showMessageReactions ? (
<BottomSheetModal
lazy={true}
onClose={() => setShowMessageReactions(false)}
visible={showMessageReactions}
height={424}
<MessageUserReactions
message={message}
MessageUserReactionsAvatar={MessageUserReactionsAvatar}
MessageUserReactionsItem={MessageUserReactionsItem}
selectedReaction={selectedReaction}
/>
</BottomSheetModal>
) : null}
<Portal hostName={overlayActive && rect ? 'bottom-item' : undefined}>
{overlayActive && rect ? (
<View
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;
setOverlayBottomH({
h,
w,
x: isMyMessage ? screenW - rect.x - w : rect.x,
y: rect.y + rect.h,
});
}}
>
<MessageUserReactions
message={message}
MessageUserReactionsAvatar={MessageUserReactionsAvatar}
MessageUserReactionsItem={MessageUserReactionsItem}
selectedReaction={selectedReaction}
<MessageActionList
dismissOverlay={dismissOverlay}
MessageActionListItem={MessageActionListItem}
messageActions={messageActions}
/>
</BottomSheetModal>
) : null}
<Portal hostName={overlayActive && rect ? 'bottom-item' : undefined}>
{overlayActive && rect ? (
<View
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;
setOverlayBottomH({
h,
w,
x: isMyMessage ? screenW - rect.x - w : rect.x,
y: rect.y + rect.h,
});
}}
>
<MessageActionList
dismissOverlay={dismissOverlay}
MessageActionListItem={MessageActionListItem}
messageActions={messageActions}
/>
</View>
) : null}
</Portal>
{isBounceDialogOpen ? (
<MessageBounce setIsBounceDialogOpen={setIsBounceDialogOpen} />
</View>
) : null}
</View>
</Portal>
{isBounceDialogOpen ? (
<MessageBounce setIsBounceDialogOpen={setIsBounceDialogOpen} />
) : null}
</View>
</MessageProvider>
);
Expand Down Expand Up @@ -1131,3 +1108,40 @@ export const Message = (props: MessageProps) => {
/>
);
};

const useStyles = ({
showUnreadUnderlay,
highlightedMessage,
}: {
showUnreadUnderlay?: boolean;
highlightedMessage?: boolean;
}) => {
const {
theme: {
colors: { bg_gradient_start },
messageSimple: { wrapper, unreadUnderlayColor = bg_gradient_start, targetedMessageContainer },
screenPadding,
semantics,
},
} = useTheme();
return useMemo(() => {
return StyleSheet.create({
wrapper: {
paddingHorizontal: screenPadding,
backgroundColor: showUnreadUnderlay ? unreadUnderlayColor : undefined,
...(highlightedMessage
? { backgroundColor: semantics.backgroundCoreHighlight, ...targetedMessageContainer }
: {}),
...wrapper,
},
});
}, [
wrapper,
screenPadding,
showUnreadUnderlay,
unreadUnderlayColor,
highlightedMessage,
semantics,
targetedMessageContainer,
]);
};
Loading