Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions package/src/components/Message/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -842,8 +842,8 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
/>
) : null}
{/*TODO: V9: Find a way to separate these in a dedicated file*/}
{overlayActive && rect ? (
<Portal hostName='top-item'>
<Portal hostName={overlayActive && rect ? 'top-item' : undefined}>
{overlayActive && rect ? (
<View
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;
Expand All @@ -861,16 +861,30 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
handleReaction={ownCapabilities.sendReaction ? handleReaction : undefined}
/>
</View>
</Portal>
) : null}
) : null}
</Portal>
<Portal
hostName={overlayActive ? 'message-overlay' : undefined}
style={overlayActive && rect ? { width: rect.w } : undefined}
>
<MessageSimple ref={messageWrapperRef} />
</Portal>
{overlayActive && rect ? (
<Portal hostName='bottom-item'>
{showMessageReactions ? (
<BottomSheetModal
lazy={true}
onClose={() => setShowMessageReactions(false)}
visible={showMessageReactions}
height={424}
>
<MessageUserReactions
message={message}
MessageUserReactionsAvatar={MessageUserReactionsAvatar}
MessageUserReactionsItem={MessageUserReactionsItem}
/>
</BottomSheetModal>
) : null}
<Portal hostName={overlayActive && rect ? 'bottom-item' : undefined}>
{overlayActive && rect ? (
<View
onLayout={(e) => {
const { width: w, height: h } = e.nativeEvent.layout;
Expand All @@ -888,22 +902,8 @@ const MessageWithContext = (props: MessagePropsWithContext) => {
messageActions={messageActions}
/>
</View>
</Portal>
) : null}
{showMessageReactions ? (
<BottomSheetModal
lazy={true}
onClose={() => setShowMessageReactions(false)}
visible={showMessageReactions}
height={424}
>
<MessageUserReactions
message={message}
MessageUserReactionsAvatar={MessageUserReactionsAvatar}
MessageUserReactionsItem={MessageUserReactionsItem}
/>
</BottomSheetModal>
) : null}
) : null}
</Portal>
{isBounceDialogOpen ? (
<MessageBounce setIsBounceDialogOpen={setIsBounceDialogOpen} />
) : null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ exports[`Thread should match thread snapshot 1`] = `
}
testID="message-wrapper"
>
<View />
<View>
<View>
<View
Expand Down Expand Up @@ -681,6 +682,7 @@ exports[`Thread should match thread snapshot 1`] = `
</View>
</View>
</View>
<View />
</View>
</View>
</View>
Expand Down Expand Up @@ -735,6 +737,7 @@ exports[`Thread should match thread snapshot 1`] = `
}
testID="message-wrapper"
>
<View />
<View>
<View>
<View
Expand Down Expand Up @@ -1034,6 +1037,7 @@ exports[`Thread should match thread snapshot 1`] = `
</View>
</View>
</View>
<View />
</View>
</View>
</View>
Expand Down Expand Up @@ -1113,6 +1117,7 @@ exports[`Thread should match thread snapshot 1`] = `
}
testID="message-wrapper"
>
<View />
<View>
<View>
<View
Expand Down Expand Up @@ -1412,6 +1417,7 @@ exports[`Thread should match thread snapshot 1`] = `
</View>
</View>
</View>
<View />
</View>
</View>
</View>
Expand Down Expand Up @@ -1467,6 +1473,7 @@ exports[`Thread should match thread snapshot 1`] = `
}
testID="message-wrapper"
>
<View />
<View>
<View>
<View
Expand Down Expand Up @@ -1771,6 +1778,7 @@ exports[`Thread should match thread snapshot 1`] = `
</View>
</View>
</View>
<View />
</View>
</View>
</View>
Expand Down