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

Fix Shortcut prompt for Search showing in minimized Roomlist (#9014)

Browse source
This commit is contained in:
Janne Mareike Koschinski 2022-07-08 10:50:06 +02:00 • committed by GitHub
parent 4844cc14bd
commit 39816f67e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 41 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/structures/LeftPanel.tsx
View file

@ -304,14 +304,6 @@ export default class LeftPanel extends React.Component<IProps, IState> {
}
};
private selectRoom = () => {
const firstRoom = this.listContainerRef.current.querySelector<HTMLDivElement>(".mx_RoomTile");
if (firstRoom) {
firstRoom.click();
return true; // to get the field to clear
}
};
private renderBreadcrumbs(): React.ReactNode {
if (this.state.showBreadcrumbs === BreadcrumbsMode.Legacy && !this.props.isMinimized) {
return (
@ -357,10 +349,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
onBlur={this.onBlur}
onKeyDown={this.onKeyDown}
>
<RoomSearch
isMinimized={this.props.isMinimized}
onSelectRoom={this.selectRoom}
/>
<RoomSearch isMinimized={this.props.isMinimized} />
{ dialPadButton }
{ rightButton }

8
src/components/structures/RoomSearch.tsx
View file

@ -28,10 +28,6 @@ import AccessibleButton from "../views/elements/AccessibleButton";
interface IProps {
isMinimized: boolean;
/**
* @returns true if a room has been selected and the search field should be cleared
*/
onSelectRoom(): boolean;
}
export default class RoomSearch extends React.PureComponent<IProps> {
@ -67,9 +63,9 @@ export default class RoomSearch extends React.PureComponent<IProps> {
<div className="mx_RoomSearch_icon" />
);
const shortcutPrompt = <div className="mx_RoomSearch_shortcutPrompt">
const shortcutPrompt = <kbd className="mx_RoomSearch_shortcutPrompt">
{ IS_MAC ? "⌘ K" : _t(ALTERNATE_KEY_NAME[Key.CONTROL]) + " K" }
</div>;
</kbd>;
return <AccessibleButton onClick={this.openSpotlight} className={classes}>
{ icon }