From f236c263564057366ff31bdfaac2dfd3b55f485b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 19 Jan 2026 12:10:24 +0000 Subject: [PATCH] Fix avatar decorations in thread activity centre not being atop avatar (#31789) * Fix avatar decorations in thread activity centre not being atop avatar Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../spaces/threads-activity-centre/index.ts | 8 ++++-- .../tac-panel-mix-unread-linux.png | Bin 6858 -> 6891 bytes .../tac-panel-notification-unread-linux.png | Bin 6853 -> 6906 bytes .../views/avatars/_DecoratedRoomAvatar.pcss | 26 +++++++++++------- .../views/avatars/DecoratedRoomAvatar.tsx | 14 +++++++--- .../ThreadsActivityCentre-test.tsx.snap | 10 +++---- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/playwright/e2e/spaces/threads-activity-centre/index.ts b/playwright/e2e/spaces/threads-activity-centre/index.ts index cf889f64cc..c4781c1c27 100644 --- a/playwright/e2e/spaces/threads-activity-centre/index.ts +++ b/playwright/e2e/spaces/threads-activity-centre/index.ts @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import { type JSHandle, type Locator, type Page } from "@playwright/test"; -import type { MatrixEvent, IContent, Room } from "matrix-js-sdk/src/matrix"; +import type { MatrixEvent, IContent, Room, Preset } from "matrix-js-sdk/src/matrix"; import { test as base, expect } from "../../../element-web-test"; import { type Bot } from "../../../pages/bot"; import { type Client } from "../../../pages/client"; @@ -37,7 +37,11 @@ export const test = base.extend<{ room1Name: "Room 1", room1: async ({ room1Name: name, app, user, bot }, use) => { - const roomId = await app.client.createRoom({ name, invite: [bot.credentials.userId] }); + const roomId = await app.client.createRoom({ + name, + invite: [bot.credentials.userId], + preset: "public_chat" as Preset, + }); await bot.awaitRoomMembership(roomId); await use({ name, roomId }); }, diff --git a/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png b/playwright/snapshots/spaces/threads-activity-centre/threadsActivityCentre.spec.ts/tac-panel-mix-unread-linux.png index 0785ecbe97df958b61c12a200676fdd4261b17b0..8aecb3701952da5cd13ac79c78b2cddea56a188a 100644 GIT binary patch literal 6891 zcmb`Mbx<79mWQ!m!65_>kPu*ScN;tecLpawAh-nv27x4_^Q2+lBQaCf)h?ruwJ zxAyIBz1mk>wf#re?bD}k-|BPfoUea3R7FV^8fnD>?2kHO%@3oE}D3PjlN$rRric2aj0j_Tx? zmcLT?$Zc(^7?O}f0PP}X0x$qV7z(K|{nVsla9}o1ON$)(<(P-1`Wb9@kC`6F1G6c! z8y@%0L+M;qP)34KbQ;c-2nLlG*>d{RttIv=e8*&a9$wihQh31Pv8k!CEvNGfez3lQ zq=*O$3wGhBN}Y)k4c`~4Hkp!z5H&4Tbo@47ztOQ6% zA=v?elGPlcyx))%7>MFp$R$IiQZw%4jH34@W`n2$9{CQ%ys#b=wY#HiibZn0fkZ_v zVV!Z+0~CBoLtQecC^Y9S8k*`~g@lG-u&Vt0_pihg#i^;oF4=kB!m_f^B+%h3q0@G^ zm)q?Y{UB*x)#~UGwu8f6aXg@XY+AU8RP^qTU)hdcYFZdu!82^q+bmo>yz5Rb3jItp zLHk`YCW;0kQRCF-O8oQlT9Xqm1AvN#&>vP(uV~IMB_54W4Xb>Y(Yb=3mk}k7@cdca zkfU+WuK!+=Y&)Bzs#cX}2A9zSkMOWkfml3&v>b-hK_f!B&@wurP;Lxh2qJqJItP*r zK8;K(1MP2g66pXEL}&=!TVo=8Q|-+GJ&${gHiiL| zl!A&W{7UNTW_Otne0GaeL^DE+0vk|V)T@�dGN?H8(9y&B%DOt&x~$Y^-yW?(+yC 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 literal 6858 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 IfXzex3o~?CC;$Ke literal 6853 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 diff --git a/res/css/views/avatars/_DecoratedRoomAvatar.pcss b/res/css/views/avatars/_DecoratedRoomAvatar.pcss index c014e4bce7..f170471a01 100644 --- a/res/css/views/avatars/_DecoratedRoomAvatar.pcss +++ b/res/css/views/avatars/_DecoratedRoomAvatar.pcss @@ -27,36 +27,42 @@ Please see LICENSE files in the repository root for full details. width: 25%; /* 8px for a 32x32 avatar */ height: 25%; border-radius: 50%; - } - .mx_DecoratedRoomAvatar_icon::before { - content: ""; - width: 100%; - height: 100%; - right: 0; - position: absolute; - border-radius: 8px; + &::before, + svg { + width: 100%; + height: 100%; + right: 0; + position: absolute; + border-radius: 8px; + } } .mx_DecoratedRoomAvatar_icon_globe svg { - width: inherit; - height: inherit; + /* Oversize the icon to account for the dead space around the icon within the canvas */ + width: 120%; + height: 120%; + margin: -10%; color: $secondary-content; } .mx_DecoratedRoomAvatar_icon_offline::before { + content: ""; background-color: $presence-offline; } .mx_DecoratedRoomAvatar_icon_online::before { + content: ""; background-color: $accent; } .mx_DecoratedRoomAvatar_icon_away::before { + content: ""; background-color: $presence-away; } .mx_DecoratedRoomAvatar_icon_busy::before { + content: ""; background-color: $presence-busy; } diff --git a/src/components/views/avatars/DecoratedRoomAvatar.tsx b/src/components/views/avatars/DecoratedRoomAvatar.tsx index 5d3d504105..ac7206ae59 100644 --- a/src/components/views/avatars/DecoratedRoomAvatar.tsx +++ b/src/components/views/avatars/DecoratedRoomAvatar.tsx @@ -46,6 +46,7 @@ interface IProps { tooltipProps?: { tabIndex?: number; }; + className?: string; } interface IState { @@ -186,7 +187,8 @@ export default class DecoratedRoomAvatar extends React.PureComponent diff --git a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap index 4c26f99dc0..ad30c36539 100644 --- a/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap +++ b/test/unit-tests/components/views/spaces/__snapshots__/ThreadsActivityCentre-test.tsx.snap @@ -34,7 +34,7 @@ exports[`ThreadsActivityCentre renders notifications matching the snapshot 1`] = tabindex="-1" >