Skip to content

Commit

Permalink
Fix bubble interactivity
Browse files Browse the repository at this point in the history
  • Loading branch information
gdbroman committed Jul 23, 2023
1 parent 7f905da commit ace2dd8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 14 deletions.
24 changes: 11 additions & 13 deletions lib/design-system/src/blocks/Bubble/Bubble.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ export const Bubble = ({
>
{!isOur && !isPrevGrouped && (
<BubbleAuthor
id={id}
style={{
color: authorColorDisplay,
pointerEvents: 'none',
}}
authorColor={authorColor}
>
Expand All @@ -222,24 +222,18 @@ export const Bubble = ({
)}
{forwardedFrom && (
<Text.Custom
id={id}
style={{
color: 'rgba(var(--rlm-icon-rgba), 0.60)',
fontSize: 11,
pointerEvents: 'none',
}}
>
Forwarded from: {forwardedFrom}
</Text.Custom>
)}
<FragmentBlock style={{ pointerEvents: 'none' }}>
{fragments}
</FragmentBlock>
<BubbleFooter
height={footerHeight}
mt={1}
style={{ pointerEvents: 'none' }}
>
<Flex height="100%" flex={7} style={{ pointerEvents: 'auto' }}>
<FragmentBlock id={id}>{fragments}</FragmentBlock>
<BubbleFooter height={footerHeight} mt={1}>
<Flex height="100%" flex={7}>
{((reactions && reactions.length > 0) || onReaction) && (
<Reactions
isOur={isOur}
Expand All @@ -251,17 +245,21 @@ export const Bubble = ({
)}
</Flex>
<Flex
id={id}
flex={3}
gap={4}
alignItems="flex-end"
justifyContent="flex-end"
minWidth={minBubbleWidth}
flexBasis={minBubbleWidth}
style={{ pointerEvents: 'none' }}
>
{error && (
<Text.Custom
style={{ whiteSpace: 'nowrap', userSelect: 'none' }}
style={{
whiteSpace: 'nowrap',
userSelect: 'none',
pointerEvents: 'none',
}}
textAlign="right"
display="inline-flex"
alignItems="flex-end"
Expand Down
2 changes: 1 addition & 1 deletion lib/design-system/src/blocks/Bubble/renderFragment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const renderFragment = (
if (linkType === 'media') {
return (
<MediaBlock
id={`media-${link}`}
id={id}
mode="embed"
variant="content"
width={320}
Expand Down

0 comments on commit ace2dd8

Please sign in to comment.