sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Fix spotlight cmd-k wrongly expanding left panel (#7463)

Browse Source
This commit is contained in:
Michael Telatynski
2022-01-05 10:07:04 +00:00
committed by GitHub
parent 6eea416e7e
commit ea7ac453bc
3 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/structures/RoomSearch.tsx
+8 -4
View File
@@ -93,11 +93,11 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
private onAction = (payload: ActionPayload) => {
if (payload.action === Action.ViewRoom && payload.clear_search) {
this.clearInput();
} else if (payload.action === 'focus_room_filter' && this.inputRef.current) {
} else if (payload.action === 'focus_room_filter') {
if (SettingsStore.getValue("feature_spotlight")) {
this.openSpotlight();
} else {
this.inputRef.current.focus();
this.inputRef.current?.focus();
}
}
};
@@ -109,8 +109,12 @@ export default class RoomSearch extends React.PureComponent<IProps, IState> {
};
private openSearch = () => {
defaultDispatcher.dispatch({ action: "show_left_panel" });
defaultDispatcher.dispatch({ action: "focus_room_filter" });
if (SettingsStore.getValue("feature_spotlight")) {
this.openSpotlight();
} else {
defaultDispatcher.dispatch({ action: "show_left_panel" });
defaultDispatcher.dispatch({ action: "focus_room_filter" });
}
};
private onChange = () => {