Skip to content
This repository was archived by the owner on Oct 22, 2024. It is now read-only.

Commit f033b64

Browse files
authored
Display the indicator even with one message in pinned message banner (#12946)
* Display the indicator even with one message * Update e2e tests
1 parent 41686bb commit f033b64

10 files changed

+16
-4
lines changed

res/css/views/rooms/_PinnedMessageBanner.pcss

+7-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
grid-area: title;
8181
font: var(--cpd-font-body-sm-regular);
8282
color: var(--cpd-color-text-action-accent);
83-
height: 20px;
83+
line-height: 20px;
8484

8585
.mx_PinnedMessageBanner_title_counter {
8686
font: var(--cpd-font-body-sm-semibold);
@@ -90,7 +90,7 @@
9090
.mx_PinnedMessageBanner_message {
9191
grid-area: message;
9292
font: var(--cpd-font-body-sm-regular);
93-
height: 20px;
93+
line-height: 20px;
9494
overflow: hidden;
9595
text-overflow: ellipsis;
9696
white-space: nowrap;
@@ -114,6 +114,10 @@
114114
height: 63px;
115115

116116
.mx_PinnedMessageBanner_content {
117-
grid-template: "pinIcon message" auto;
117+
grid-template: "indicators pinIcon message" auto;
118+
119+
.mx_PinnedMessageBanner_message {
120+
line-height: 40px;
121+
}
118122
}
119123
}

src/components/views/rooms/PinnedMessageBanner.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export function PinnedMessageBanner({ room, permalinkCreator }: PinnedMessageBan
102102
onClick={onBannerClick}
103103
>
104104
<div className="mx_PinnedMessageBanner_content">
105-
{!isSinglePinnedEvent && <Indicators count={eventCount} currentIndex={currentEventIndex} />}
105+
<Indicators count={eventCount} currentIndex={currentEventIndex} />
106106
<PinIcon width="20" className="mx_PinnedMessageBanner_PinIcon" />
107107
{!isSinglePinnedEvent && (
108108
<div className="mx_PinnedMessageBanner_title" data-testid="banner-counter">

test/components/views/rooms/__snapshots__/PinnedMessageBanner-test.tsx.snap

+8
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,14 @@ exports[`<PinnedMessageBanner /> should render a single pinned event 1`] = `
219219
<div
220220
class="mx_PinnedMessageBanner_content"
221221
>
222+
<div
223+
class="mx_PinnedMessageBanner_Indicators"
224+
>
225+
<div
226+
class="mx_PinnedMessageBanner_Indicator mx_PinnedMessageBanner_Indicator--active"
227+
data-testid="banner-indicator"
228+
/>
229+
</div>
222230
<div
223231
class="mx_PinnedMessageBanner_PinIcon"
224232
width="20"

0 commit comments

Comments
 (0)