This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Render custom images in reactions (#11087)
* Add support for rendering custom emojis in reactions Signed-off-by: Sumner Evans <[email protected]> * Include custom reaction short names in tooltips Signed-off-by: Sumner Evans <[email protected]> * Use custom reaction shortcode for accessibility This uses the shortcode in the following places: * The aria-label of the reaction buttons * The alt text for the reaction image Signed-off-by: Sumner Evans <[email protected]> * Remove explicit instantiation of `customReactionName` variable and add types Co-authored-by: Šimon Brandner <[email protected]> * Put custom reaction images behind a labs flag Signed-off-by: Sumner Evans <[email protected]> * Use UnstableValue for finding the shortcode Co-authored-by: Michael Telatynski <[email protected]> Signed-off-by: Sumner Evans <[email protected]> * Move calculation of whether to render custom reaction images up to ReactionRow Signed-off-by: Sumner Evans <[email protected]> * Make alt text more friendly when custom reaction doesn't have shortcode Signed-off-by: Sumner Evans <[email protected]> * Add test for ReactionsRowButton Signed-off-by: Sumner Evans <[email protected]> * Apply suggestions from code review Co-authored-by: Šimon Brandner <[email protected]> * Don't use Optional Signed-off-by: Sumner Evans <[email protected]> * Fix ReactionsRowButton test Co-authored-by: Michael Telatynski <[email protected]> Signed-off-by: Sumner Evans <[email protected]> --------- Signed-off-by: Sumner Evans <[email protected]> Co-authored-by: Tulir Asokan <[email protected]> Co-authored-by: Šimon Brandner <[email protected]> Co-authored-by: Michael Telatynski <[email protected]>
- Loading branch information
4 people
authored
Sep 1, 2023
1 parent
d551469
commit a54f2ff
Showing
8 changed files
with
283 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
test/components/views/messages/ReactionsRowButton-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| Copyright 2023 Beeper | ||
| 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 { IContent, MatrixEvent, Room } from "matrix-js-sdk/src/matrix"; | ||
| import { render } from "@testing-library/react"; | ||
|
|
||
| import MatrixClientContext from "../../../../src/contexts/MatrixClientContext"; | ||
| import { getMockClientWithEventEmitter } from "../../../test-utils"; | ||
| import ReactionsRowButton, { IProps } from "../../../../src/components/views/messages/ReactionsRowButton"; | ||
|
|
||
| describe("ReactionsRowButton", () => { | ||
| const userId = "@alice:server"; | ||
| const roomId = "!randomcharacters:aser.ver"; | ||
| const mockClient = getMockClientWithEventEmitter({ | ||
| mxcUrlToHttp: jest.fn().mockReturnValue("https://not.a.real.url"), | ||
| getRoom: jest.fn(), | ||
| }); | ||
| const room = new Room(roomId, mockClient, userId); | ||
|
|
||
| const createProps = (relationContent: IContent): IProps => ({ | ||
| mxEvent: new MatrixEvent({ | ||
| room_id: roomId, | ||
| event_id: "$test:example.com", | ||
| content: { body: "test" }, | ||
| }), | ||
| content: relationContent["m.relates_to"]?.key || "", | ||
| count: 2, | ||
| reactionEvents: [ | ||
| new MatrixEvent({ | ||
| type: "m.reaction", | ||
| sender: "@user1:example.com", | ||
| content: relationContent, | ||
| }), | ||
| new MatrixEvent({ | ||
| type: "m.reaction", | ||
| sender: "@user2:example.com", | ||
| content: relationContent, | ||
| }), | ||
| ], | ||
| customReactionImagesEnabled: true, | ||
| }); | ||
|
|
||
| beforeEach(function () { | ||
| jest.clearAllMocks(); | ||
| mockClient.credentials = { userId: userId }; | ||
| mockClient.getRoom.mockImplementation((roomId: string): Room | null => { | ||
| return roomId === room.roomId ? room : null; | ||
| }); | ||
| }); | ||
|
|
||
| it("renders reaction row button emojis correctly", () => { | ||
| const props = createProps({ | ||
| "m.relates_to": { | ||
| event_id: "$user2:example.com", | ||
| key: "👍", | ||
| rel_type: "m.annotation", | ||
| }, | ||
| }); | ||
| const root = render( | ||
| <MatrixClientContext.Provider value={mockClient}> | ||
| <ReactionsRowButton {...props} /> | ||
| </MatrixClientContext.Provider>, | ||
| ); | ||
| expect(root.asFragment()).toMatchSnapshot(); | ||
|
|
||
| // Try hover and make sure that the ReactionsRowButtonTooltip works | ||
| const reactionButton = root.getByRole("button"); | ||
| const event = new MouseEvent("mouseover", { | ||
| bubbles: true, | ||
| cancelable: true, | ||
| }); | ||
| reactionButton.dispatchEvent(event); | ||
|
|
||
| expect(root.asFragment()).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it("renders reaction row button custom image reactions correctly", () => { | ||
| const props = createProps({ | ||
| "com.beeper.reaction.shortcode": ":test:", | ||
| "shortcode": ":test:", | ||
| "m.relates_to": { | ||
| event_id: "$user1:example.com", | ||
| key: "mxc://example.com/123456789", | ||
| rel_type: "m.annotation", | ||
| }, | ||
| }); | ||
|
|
||
| const root = render( | ||
| <MatrixClientContext.Provider value={mockClient}> | ||
| <ReactionsRowButton {...props} /> | ||
| </MatrixClientContext.Provider>, | ||
| ); | ||
| expect(root.asFragment()).toMatchSnapshot(); | ||
|
|
||
| // Try hover and make sure that the ReactionsRowButtonTooltip works | ||
| const reactionButton = root.getByRole("button"); | ||
| const event = new MouseEvent("mouseover", { | ||
| bubbles: true, | ||
| cancelable: true, | ||
| }); | ||
| reactionButton.dispatchEvent(event); | ||
|
|
||
| expect(root.asFragment()).toMatchSnapshot(); | ||
| }); | ||
| }); |
Oops, something went wrong.