Merge pull request #5017 from matrix-org/t3chguy/fix/14596

Fix Breadcrumbs2 ending up with 2 tabIndexes on Firefox
pull/21833/head
Michael Telatynski 2020-07-20 15:35:07 +01:00 committed by GitHub
commit 446e8de39e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions

View File

@ -43,6 +43,7 @@ export default class AutoHideScrollbar extends React.Component {
className={["mx_AutoHideScrollbar", this.props.className].join(" ")} className={["mx_AutoHideScrollbar", this.props.className].join(" ")}
onScroll={this.props.onScroll} onScroll={this.props.onScroll}
onWheel={this.props.onWheel} onWheel={this.props.onWheel}
tabIndex={this.props.tabIndex}
> >
{ this.props.children } { this.props.children }
</div>); </div>);

View File

@ -324,6 +324,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
<IndicatorScrollbar <IndicatorScrollbar
className="mx_LeftPanel_breadcrumbsContainer mx_AutoHideScrollbar" className="mx_LeftPanel_breadcrumbsContainer mx_AutoHideScrollbar"
verticalScrollsHorizontally={true} verticalScrollsHorizontally={true}
// Firefox sometimes makes this element focusable due to
// overflow:scroll;, so force it out of tab order.
tabIndex={-1}
> >
<RoomBreadcrumbs /> <RoomBreadcrumbs />
</IndicatorScrollbar> </IndicatorScrollbar>