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

Adapt the rendering of extra icons in the room header (#11835)

Browse source 
Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net>
This commit is contained in:
Charly Nguyen 2023-11-09 12:23:30 +01:00 committed by GitHub
parent 03b01b4a50
commit 47a4e4a52a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -64,7 +64,7 @@
"@matrix-org/analytics-events": "^0.8.0", "@matrix-org/analytics-events": "^0.8.0",
"@matrix-org/emojibase-bindings": "^1.1.2", "@matrix-org/emojibase-bindings": "^1.1.2",
"@matrix-org/matrix-wysiwyg": "2.4.1", "@matrix-org/matrix-wysiwyg": "2.4.1",
"@matrix-org/react-sdk-module-api": "^2.2.0", "@matrix-org/react-sdk-module-api": "^2.2.1",
"@matrix-org/spec": "^1.7.0", "@matrix-org/spec": "^1.7.0",
"@sentry/browser": "^7.0.0", "@sentry/browser": "^7.0.0",
"@sentry/tracing": "^7.0.0", "@sentry/tracing": "^7.0.0",

2
src/components/views/rooms/LegacyRoomHeader.tsx
View file

@ -684,7 +684,7 @@ export default class RoomHeader extends React.Component<IProps, IState> {
}} }}
title={label} title={label}
> >
{props.icon} {typeof props.icon === "function" ? props.icon() : props.icon}
</IconButton> </IconButton>
</Tooltip> </Tooltip>
); );

2
src/components/views/rooms/RoomHeader.tsx
View file

@ -188,7 +188,7 @@ export default function RoomHeader({
props.onClick(); props.onClick();
}} }}
> >
{props.icon} {typeof props.icon === "function" ? props.icon() : props.icon}
</IconButton> </IconButton>
</Tooltip> </Tooltip>
); );

4
test/components/views/rooms/LegacyRoomHeader-test.tsx
View file

@ -743,7 +743,7 @@ describe("LegacyRoomHeader", () => {
it("renders additionalButtons", async () => { it("renders additionalButtons", async () => {
const additionalButtons: ViewRoomOpts["buttons"] = [ const additionalButtons: ViewRoomOpts["buttons"] = [
{ {
icon: <>test-icon</>, icon: () => <>test-icon</>,
id: "test-id", id: "test-id",
label: () => "test-label", label: () => "test-label",
onClick: () => {}, onClick: () => {},
@ -757,7 +757,7 @@ describe("LegacyRoomHeader", () => {
const callback = jest.fn(); const callback = jest.fn();
const additionalButtons: ViewRoomOpts["buttons"] = [ const additionalButtons: ViewRoomOpts["buttons"] = [
{ {
icon: <>test-icon</>, icon: () => <>test-icon</>,
id: "test-id", id: "test-id",
label: () => "test-label", label: () => "test-label",
onClick: callback, onClick: callback,

4
test/components/views/rooms/RoomHeader-test.tsx
View file

@ -522,7 +522,7 @@ describe("RoomHeader", () => {
it("renders additionalButtons", async () => { it("renders additionalButtons", async () => {
const additionalButtons: ViewRoomOpts["buttons"] = [ const additionalButtons: ViewRoomOpts["buttons"] = [
{ {
icon: <>test-icon</>, icon: () => <>test-icon</>,
id: "test-id", id: "test-id",
label: () => "test-label", label: () => "test-label",
onClick: () => {}, onClick: () => {},
@ -539,7 +539,7 @@ describe("RoomHeader", () => {
const callback = jest.fn(); const callback = jest.fn();
const additionalButtons: ViewRoomOpts["buttons"] = [ const additionalButtons: ViewRoomOpts["buttons"] = [
{ {
icon: <>test-icon</>, icon: () => <>test-icon</>,
id: "test-id", id: "test-id",
label: () => "test-label", label: () => "test-label",
onClick: callback, onClick: callback,

8
yarn.lock
View file

@ -1814,10 +1814,10 @@
resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec" resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q== integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
"@matrix-org/react-sdk-module-api@^2.2.0": "@matrix-org/react-sdk-module-api@^2.2.1":
version "2.2.0" version "2.2.1"
resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.0.tgz#cb284601a82448dc23fac31949c466eb34ec64b4" resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.2.1.tgz#308bcb42a780200d3e7994235376784b51819379"
integrity sha512-HSicxLdagZRbQp35d3t2SeDFTiT4GmEQDQGih8dWSKRHXK4krVQjb6Kf1NkwweiFDAeU0qgbz2pP4RZqbv0XIg== integrity sha512-+MXTMEapzGmhArUt86GYDQirOvm19+wvQLDApmHpUQvSZvYm7wOo1EwR9FFvSKve53fu+v6gI1grnj7YLzGQ9Q==
dependencies: dependencies:
"@babel/runtime" "^7.17.9" "@babel/runtime" "^7.17.9"