matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Fix accessibility and consistency of MessageComposerButtons (#7679)

Browse Source
This commit is contained in:
Michael Telatynski
2022-01-31 16:05:05 +00:00
committed by GitHub
parent a17d585a12
commit 991257cbc3
8 changed files with 94 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/components/views/rooms/MessageComposerButtons-test.tsx
View File

@@ -77,6 +77,7 @@ describe("MessageComposerButtons", () => {
narrowMode={true}
showLocationButton={true}
showStickersButton={true}
toggleButtonMenu={() => {}}
/>,
);
@@ -159,28 +160,28 @@ function createRoomState(room: Room): IRoomState {
function buttonLabels(buttons: ReactWrapper): any[] {
// Note: Depends on the fact that the mini buttons use aria-label
// and the labels under More options use label
// and the labels under More options use textContent
const mainButtons = (
buttons
.find('div')
.map((button: ReactWrapper) => button.prop("aria-label"))
.find('div.mx_MessageComposer_button[aria-label]')
.map((button: ReactWrapper) => button.prop("aria-label") as string)
.filter(x => x)
);
let extraButtons = (
const extraButtons = (
buttons
.find('div')
.map((button: ReactWrapper) => button.prop("label"))
.find('.mx_MessageComposer_Menu div.mx_AccessibleButton[role="menuitem"]')
.map((button: ReactWrapper) => button.text())
.filter(x => x)
);
if (extraButtons.length === 0) {
extraButtons = [];
} else {
extraButtons = [extraButtons];
const list: any[] = [
...mainButtons,
];
if (extraButtons.length > 0) {
list.push(extraButtons);
}
return [
...mainButtons,
...extraButtons,
];
return list;
}