imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3

Browse source 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
This commit is contained in:
Michael Telatynski 2020-07-02 23:46:12 +01:00
commit 404009c8cb
36 changed files with 998 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/structures/ContextMenu.tsx
View file

@ -160,6 +160,13 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
e.stopPropagation();
};
// Prevent clicks on the background from going through to the component which opened the menu.
_onFinished = (ev: InputEvent) => {
ev.stopPropagation();
ev.preventDefault();
if (this.props.onFinished) this.props.onFinished();
};
_onMoveFocus = (element, up) => {
let descending = false; // are we currently descending or ascending through the DOM tree?
@ -262,7 +269,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
position.bottom = props.bottom;
}
let chevronFace: IProps["chevronFace"];
let chevronFace: ChevronFace;
if (props.left) {
position.left = props.left;
chevronFace = ChevronFace.Left;
@ -349,7 +356,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
<div
className="mx_ContextualMenu_background"
style={wrapperStyle}
onClick={props.onFinished}
onClick={this._onFinished}
onContextMenu={this.onContextMenu}
/>
);