+
{
// TODO fix the accessibility of this: https://github.com/vector-im/riot-web/issues/14180
className="mx_LeftPanel2_exploreButton"
onClick={this.onExplore}
- alt={_t("Explore rooms")}
+ title={_t("Explore rooms")}
/>
);
diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx
index 7ed2acf276..15f3bd5b54 100644
--- a/src/components/structures/RoomSearch.tsx
+++ b/src/components/structures/RoomSearch.tsx
@@ -149,7 +149,8 @@ export default class RoomSearch extends React.PureComponent
{
let clearButton = (
);
@@ -157,8 +158,8 @@ export default class RoomSearch extends React.PureComponent {
if (this.props.isMinimized) {
icon = (
);
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 5955a046a4..221ec07439 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -329,7 +329,7 @@ export default class UserMenu extends React.Component {
className={classes}
onClick={this.onOpenMenuClick}
inputRef={this.buttonRef}
- label={_t("Account settings")}
+ label={_t("User menu")}
isExpanded={!!this.state.contextMenuPosition}
onContextMenu={this.onContextMenu}
>
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 508691e5fd..53e8d0072b 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -132,7 +132,7 @@ const BaseAvatar = (props) => {
);
} else {
return (
-
+
{ textNode }
{ imgNode }
diff --git a/src/components/views/rooms/RoomList2.tsx b/src/components/views/rooms/RoomList2.tsx
index 91bef0fc3d..0d7c3b8ec1 100644
--- a/src/components/views/rooms/RoomList2.tsx
+++ b/src/components/views/rooms/RoomList2.tsx
@@ -274,9 +274,6 @@ export default class RoomList2 extends React.Component {
className="mx_RoomList2"
role="tree"
aria-label={_t("Rooms")}
- // Firefox sometimes makes this element focusable due to
- // overflow:scroll;, so force it out of tab order.
- tabIndex={-1}
>{sublists}
)}
diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx
index 90ca8b2d4b..18f8f4e2f6 100644
--- a/src/components/views/rooms/RoomSublist2.tsx
+++ b/src/components/views/rooms/RoomSublist2.tsx
@@ -26,8 +26,12 @@ import AccessibleButton from "../../views/elements/AccessibleButton";
import RoomTile2 from "./RoomTile2";
import { ResizableBox, ResizeCallbackData } from "react-resizable";
import { ListLayout } from "../../../stores/room-list/ListLayout";
-import { ContextMenu, ContextMenuButton } from "../../structures/ContextMenu";
-import StyledRadioButton from "../elements/StyledRadioButton";
+import {
+ ContextMenu,
+ ContextMenuButton,
+ StyledMenuItemCheckbox,
+ StyledMenuItemRadio,
+} from "../../structures/ContextMenu";
import RoomListStore from "../../../stores/room-list/RoomListStore2";
import { ListAlgorithm, SortAlgorithm } from "../../../stores/room-list/algorithms/models";
import { DefaultTagID, TagID } from "../../../stores/room-list/models";
@@ -62,7 +66,7 @@ interface IProps {
onAddRoom?: () => void;
addRoomLabel: string;
isInvite: boolean;
- layout: ListLayout;
+ layout?: ListLayout;
isMinimized: boolean;
tagId: TagID;
onResize: () => void;
@@ -136,11 +140,13 @@ export default class RoomSublist2 extends React.Component