Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix ended polls overlapping event bubbles #11895

Merged
merged 3 commits into from
Nov 20, 2023
Merged

Fix ended polls overlapping event bubbles #11895

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
8c5e491
Fix ended polls overlapping event bubbles
t3chguy Nov 17, 2023
84e66a1
Update snapshot
t3chguy Nov 17, 2023
edd8696
Merge branch 'develop' into t3chguy/cr/148
t3chguy Nov 20, 2023
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
5 changes: 5 additions & 0 deletions res/css/views/rooms/_EventBubbleTile.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,11 @@ limitations under the License.
// Keep height equal to text for shield alignment, additional 2px because of 1px padding on text
height: calc($font-18px + 2px);
}

.mx_MPollEndBody {
// Prevent the poll end body from exceeding the tile width
width: 100%;
}
}

&:not(.mx_EventTile_noBubble) .mx_EventTile_line:not(.mx_EventTile_mediaLine) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/messages/MPollEndBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export const MPollEndBody = React.forwardRef<any, IBodyProps>(({ mxEvent, ...pro
}

return (
<div ref={ref}>
<div className="mx_MPollEndBody" ref={ref}>
<Caption>{_t("timeline|m.poll.end|ended")}</Caption>
<MPollBody mxEvent={pollStartEvent} {...props} />
</div>
Expand Down
4 changes: 3 additions & 1 deletion test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ exports[`<MPollEndBody /> when poll start event does not exist in current timeli

exports[`<MPollEndBody /> when poll start event exists in current timeline renders an ended poll 1`] = `
<div>
<div>
<div
class="mx_MPollEndBody"
>
<span
class="mx_Caption"
>
Expand Down
Loading