Merge branch 'develop' into sort-imports
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
commit
7b94e13a84
642 changed files with 30052 additions and 8035 deletions
|
@ -23,6 +23,7 @@ import { Key } from '../../Keyboard';
|
|||
import dis from '../../dispatcher/dispatcher';
|
||||
import AccessibleButton from '../../components/views/elements/AccessibleButton';
|
||||
import { replaceableComponent } from "../../utils/replaceableComponent";
|
||||
import { Action } from '../../dispatcher/actions';
|
||||
|
||||
interface IProps {
|
||||
onSearch?: (query: string) => void;
|
||||
|
@ -78,7 +79,7 @@ export default class SearchBox extends React.Component<IProps, IState> {
|
|||
if (!this.props.enableRoomSearchFocus) return;
|
||||
|
||||
switch (payload.action) {
|
||||
case 'view_room':
|
||||
case Action.ViewRoom:
|
||||
if (this.search.current && payload.clear_search) {
|
||||
this.clearSearch();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue