PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix ended polls overlapping event bubbles (#11895)

Browse source 
* Fix ended polls overlapping event bubbles

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update snapshot

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2023-11-20 17:27:54 +00:00 committed by GitHub
parent fc37f2d0e3
commit 2f0eb8fb05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/css/views/rooms/_EventBubbleTile.pcss
View file

@ -358,6 +358,11 @@ limitations under the License.
// Keep height equal to text for shield alignment, additional 2px because of 1px padding on text // Keep height equal to text for shield alignment, additional 2px because of 1px padding on text
height: calc($font-18px + 2px); 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) { &:not(.mx_EventTile_noBubble) .mx_EventTile_line:not(.mx_EventTile_mediaLine) {

2
src/components/views/messages/MPollEndBody.tsx
View file

@ -108,7 +108,7 @@ export const MPollEndBody = React.forwardRef<any, IBodyProps>(({ mxEvent, ...pro
} }
return ( return (
<div ref={ref}> <div className="mx_MPollEndBody" ref={ref}>
<Caption>{_t("timeline|m.poll.end|ended")}</Caption> <Caption>{_t("timeline|m.poll.end|ended")}</Caption>
<MPollBody mxEvent={pollStartEvent} {...props} /> <MPollBody mxEvent={pollStartEvent} {...props} />
</div> </div>

4
test/components/views/messages/__snapshots__/MPollEndBody-test.tsx.snap
View file

@ -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`] = ` exports[`<MPollEndBody /> when poll start event exists in current timeline renders an ended poll 1`] = `
<div> <div>
<div> <div
class="mx_MPollEndBody"
>
<span <span
class="mx_Caption" class="mx_Caption"
> >