Redesign room search interface (#12677)
* Extract SearchInfo interface and SearchScope enum Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix in-progress and update behaviour of RoomSearchView Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove search button from legacy header Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Move search from aux panel to room summary card Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Wire up Cmd/Ctrl F for moved search field Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Use cpd space tokens Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove stale props Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix ctrl/cmd f search shortcut Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update Compound Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Revert the back button for now Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Cancel search on escape Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix missing X Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Extract SearchScope and SearchInfo into Searching Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix test Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Switch to icon button for cancel search Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * yarn.lock Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * lint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update locators Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Revert screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update screenshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update snapshots * Discard changes to package.json * i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Snapshots Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Handle narrow viewports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Improve coverage Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Revert copy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
GitHub
parent
596ad38260
commit
2a26afe438
33 changed files with 675 additions and 499 deletions
95
test/components/views/rooms/RoomSearchAuxPanel-test.tsx
Normal file
95
test/components/views/rooms/RoomSearchAuxPanel-test.tsx
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
/*
|
||||
Copyright 2024 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React from "react";
|
||||
import { render, screen } from "@testing-library/react";
|
||||
|
||||
import RoomSearchAuxPanel from "../../../../src/components/views/rooms/RoomSearchAuxPanel";
|
||||
import { SearchScope } from "../../../../src/Searching";
|
||||
|
||||
describe("RoomSearchAuxPanel", () => {
|
||||
it("should render the count of results", () => {
|
||||
render(
|
||||
<RoomSearchAuxPanel
|
||||
searchInfo={{
|
||||
searchId: 1234,
|
||||
count: 5,
|
||||
term: "abcd",
|
||||
scope: SearchScope.Room,
|
||||
promise: new Promise(() => {}),
|
||||
}}
|
||||
isRoomEncrypted={false}
|
||||
onSearchScopeChange={jest.fn()}
|
||||
onCancelClick={jest.fn()}
|
||||
/>,
|
||||
);
|
||||
|
||||
expect(screen.getByText("5 results found for", { exact: false })).toHaveTextContent(
|
||||
"5 results found for “abcd”",
|
||||
);
|
||||
});
|
||||
|
||||
it("should allow the user to toggle to all rooms search", async () => {
|
||||
const onSearchScopeChange = jest.fn();
|
||||
|
||||
render(
|
||||
<RoomSearchAuxPanel
|
||||
isRoomEncrypted={false}
|
||||
onSearchScopeChange={onSearchScopeChange}
|
||||
onCancelClick={jest.fn()}
|
||||
/>,
|
||||
);
|
||||
|
||||
screen.getByText("Search all rooms").click();
|
||||
expect(onSearchScopeChange).toHaveBeenCalledWith(SearchScope.All);
|
||||
});
|
||||
|
||||
it("should allow the user to toggle back to room-specific search", async () => {
|
||||
const onSearchScopeChange = jest.fn();
|
||||
|
||||
render(
|
||||
<RoomSearchAuxPanel
|
||||
searchInfo={{
|
||||
searchId: 1234,
|
||||
term: "abcd",
|
||||
scope: SearchScope.All,
|
||||
promise: new Promise(() => {}),
|
||||
}}
|
||||
isRoomEncrypted={false}
|
||||
onSearchScopeChange={onSearchScopeChange}
|
||||
onCancelClick={jest.fn()}
|
||||
/>,
|
||||
);
|
||||
|
||||
screen.getByText("Search this room").click();
|
||||
expect(onSearchScopeChange).toHaveBeenCalledWith(SearchScope.Room);
|
||||
});
|
||||
|
||||
it("should allow the user to cancel a search", async () => {
|
||||
const onCancelClick = jest.fn();
|
||||
|
||||
render(
|
||||
<RoomSearchAuxPanel
|
||||
isRoomEncrypted={false}
|
||||
onSearchScopeChange={jest.fn()}
|
||||
onCancelClick={onCancelClick}
|
||||
/>,
|
||||
);
|
||||
|
||||
screen.getByLabelText("Cancel").click();
|
||||
expect(onCancelClick).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue