OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Extract `focus_search` dispatch action into enum (#12721) 

* Extract `focus_search` dispatch action into enum

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* copypasta

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28217/head
Michael Telatynski 2024-07-03 18:02:02 +01:00 committed by GitHub
parent b0d2010247
commit 6b90fe20ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/LoggedInView.tsx
View File

@ -458,9 +458,7 @@ class LoggedInView extends React.Component<IProps, IState> {
handled = true;
break;
case KeyBindingAction.SearchInRoom:
dis.dispatch({
action: "focus_search",
});
dis.fire(Action.FocusMessageSearch);
handled = true;
break;
}

2
src/components/structures/RoomView.tsx
View File

@ -1196,7 +1196,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
);
}
break;
case "focus_search":
case Action.FocusMessageSearch:
this.onSearchClick();
break;

5
src/dispatcher/actions.ts
View File

@ -388,4 +388,9 @@ export enum Action {
* Opens right panel with 3pid invite information
*/
View3pidInvite = "view_3pid_invite",
/**
* Opens right panel room summary and focuses the search input
*/
FocusMessageSearch = "focus_search",
}

14
test/components/structures/LoggedInView-test.tsx
View File

@ -19,6 +19,7 @@ import { render, RenderResult } from "@testing-library/react";
import { ConditionKind, EventType, IPushRule, MatrixEvent, ClientEvent, PushRuleKind } from "matrix-js-sdk/src/matrix";
import { MediaHandler } from "matrix-js-sdk/src/webrtc/mediaHandler";
import { logger } from "matrix-js-sdk/src/logger";
import userEvent from "@testing-library/user-event";
import LoggedInView from "../../../src/components/structures/LoggedInView";
import { SDKContext } from "../../../src/contexts/SDKContext";
@ -26,6 +27,10 @@ import { StandardActions } from "../../../src/notifications/StandardActions";
import ResizeNotifier from "../../../src/utils/ResizeNotifier";
import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../test-utils";
import { TestSdkContext } from "../../TestSdkContext";
import defaultDispatcher from "../../../src/dispatcher/dispatcher";
import SettingsStore from "../../../src/settings/SettingsStore";
import { SettingLevel } from "../../../src/settings/SettingLevel";
import { Action } from "../../../src/dispatcher/actions";
describe("<LoggedInView />", () => {
const userId = "@alice:domain.org";
@ -384,4 +389,13 @@ describe("<LoggedInView />", () => {
});
});
});
it("should fire FocusMessageSearch on Ctrl+F when enabled", async () => {
jest.spyOn(defaultDispatcher, "fire");
await SettingsStore.setValue("ctrlFForSearch", null, SettingLevel.DEVICE, true);
getComponent();
await userEvent.keyboard("{Control>}f{/Control}");
expect(defaultDispatcher.fire).toHaveBeenCalledWith(Action.FocusMessageSearch);
});
});