OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Only render NotificationBadge when needed (#9493)

pull/28788/head^2
Germain 2022-10-25 14:31:38 +01:00 committed by GitHub
parent 6e73a853a8
commit 249474b430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cypress/e2e/sliding-sync/sliding-sync.ts
View File

@ -235,7 +235,7 @@ describe("Sliding Sync", () => {
"Test Room", "Dummy", "Test Room", "Dummy",
]); ]);
cy.contains(".mx_RoomTile", "Test Room").get(".mx_NotificationBadge").should("not.be.visible"); cy.contains(".mx_RoomTile", "Test Room").get(".mx_NotificationBadge").should("not.exist");
}); });
it("should update user settings promptly", () => { it("should update user settings promptly", () => {

7
src/components/views/rooms/NotificationBadge.tsx
View File

@ -111,7 +111,12 @@ export default class NotificationBadge extends React.PureComponent<XOR<IProps, I
public render(): React.ReactElement { public render(): React.ReactElement {
/* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */ /* eslint @typescript-eslint/no-unused-vars: ["error", { "ignoreRestSiblings": true }] */
const { notification, showUnsentTooltip, onClick } = this.props; const { notification, showUnsentTooltip, forceCount, onClick } = this.props;
if (notification.isIdle) return null;
if (forceCount) {
if (!notification.hasUnreadCount) return null; // Can't render a badge
}
let label: string; let label: string;
let tooltip: JSX.Element; let tooltip: JSX.Element;