From 1190de902898ada34be0ddf0f9f378d5d0caa5bb Mon Sep 17 00:00:00 2001 From: Florian Duros Date: Wed, 22 May 2024 14:15:07 +0200 Subject: [PATCH] Migrate `TooltipTarget` usage to compound `Tooltip` (#12542) * Use new tooltip in `RoomTopic.tsx` * Use new tooltip in `MLocationBody.tsx` * Fix room topic * Update location snapshot * Use new tooltip in `AppPermission.tsx` * Remove `TooltipTarget` * Add tests for `RoomTopic` --- ...ly-to-the-location-on-ThreadView-linux.png | Bin 21058 -> 18752 bytes .../views/elements/_AppPermission.pcss | 21 ---- .../views/elements/AppPermission.tsx | 44 ++++--- src/components/views/elements/RoomTopic.tsx | 45 +++---- .../views/elements/TooltipTarget.tsx | 92 -------------- .../views/messages/MLocationBody.tsx | 15 +-- .../__snapshots__/RoomView-test.tsx.snap | 12 -- .../views/elements/RoomTopic-test.tsx | 44 ++++++- .../views/elements/TooltipTarget-test.tsx | 82 ------------- .../__snapshots__/AppTile-test.tsx.snap | 2 - .../__snapshots__/TooltipTarget-test.tsx.snap | 112 ------------------ .../__snapshots__/MLocationBody-test.tsx.snap | 6 +- 12 files changed, 91 insertions(+), 384 deletions(-) delete mode 100644 src/components/views/elements/TooltipTarget.tsx delete mode 100644 test/components/views/elements/TooltipTarget-test.tsx delete mode 100644 test/components/views/elements/__snapshots__/TooltipTarget-test.tsx.snap diff --git a/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png b/playwright/snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png index 9fc79671a10e60c39fc55c02b454febe67e32e88..281f1cebe5b09c7d336f3b74c0e5ec45491f8596 100644 GIT binary patch literal 18752 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 literal 21058 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 kUB1*++W%HpJ56AZPc?f#0H2KA^#A|> diff --git a/res/css/components/views/elements/_AppPermission.pcss b/res/css/components/views/elements/_AppPermission.pcss index 4bbe0ac07a..3b770c7879 100644 --- a/res/css/components/views/elements/_AppPermission.pcss +++ b/res/css/components/views/elements/_AppPermission.pcss @@ -44,24 +44,3 @@ limitations under the License. } } } - -.mx_Tooltip.mx_Tooltip--appPermission { - box-shadow: none; - background-color: $tooltip-timeline-bg-color; - color: $tooltip-timeline-fg-color; - border: none; - border-radius: 3px; - padding: 6px 8px; - - &.mx_Tooltip--appPermission--dark { - .mx_Tooltip_chevron::after { - border-right-color: $tooltip-timeline-bg-color; - } - } - - ul { - list-style-position: inside; - padding-left: 2px; - margin-left: 0; - } -} diff --git a/src/components/views/elements/AppPermission.tsx b/src/components/views/elements/AppPermission.tsx index 362863fc3a..fd788290c0 100644 --- a/src/components/views/elements/AppPermission.tsx +++ b/src/components/views/elements/AppPermission.tsx @@ -18,6 +18,7 @@ limitations under the License. import React from "react"; import { RoomMember } from "matrix-js-sdk/src/matrix"; +import { Tooltip } from "@vector-im/compound-web"; import { _t } from "../../../languageHandler"; import SdkConfig from "../../../SdkConfig"; @@ -29,7 +30,6 @@ import Heading from "../typography/Heading"; import AccessibleButton from "./AccessibleButton"; import { parseUrl } from "../../../utils/UrlUtils"; import { Icon as HelpIcon } from "../../../../res/img/feather-customised/help-circle.svg"; -import TooltipTarget from "./TooltipTarget"; interface IProps { url: string; @@ -99,31 +99,27 @@ export default class AppPermission extends React.Component { ); - const warningTooltipText = ( -
- {_t("analytics|shared_data_heading")} -
    -
  • {_t("widget|shared_data_name")}
    • -
  • {_t("widget|shared_data_avatar")}
    • -
  • {_t("widget|shared_data_mxid")}
    • -
  • {_t("widget|shared_data_device_id")}
    • -
  • {_t("widget|shared_data_theme")}
    • -
  • {_t("widget|shared_data_lang")}
    • -
  • {_t("widget|shared_data_url", { brand })}
    • -
  • {_t("widget|shared_data_room_id")}
    • -
  • {_t("widget|shared_data_widget_id")}
    • -
-
- ); const warningTooltip = ( - +
  • {_t("widget|shared_data_name")}
    • +
  • {_t("widget|shared_data_avatar")}
    • +
  • {_t("widget|shared_data_mxid")}
    • +
  • {_t("widget|shared_data_device_id")}
    • +
  • {_t("widget|shared_data_theme")}
    • +
  • {_t("widget|shared_data_lang")}
    • +
  • {_t("widget|shared_data_url", { brand })}
    • +
  • {_t("widget|shared_data_room_id")}
    • +
  • {_t("widget|shared_data_widget_id")}
    • + + } > - -     +
    + +
    + ); // Due to i18n limitations, we can't dedupe the code for variables in these two messages. diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx index f926ef5cf4..9647188304 100644 --- a/src/components/views/elements/RoomTopic.tsx +++ b/src/components/views/elements/RoomTopic.tsx @@ -14,12 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, { useCallback, useContext, useRef } from "react"; +import React, { useCallback, useContext, useState } from "react"; import { Room, EventType } from "matrix-js-sdk/src/matrix"; import classNames from "classnames"; +import { Tooltip } from "@vector-im/compound-web"; import { useTopic } from "../../../hooks/room/useTopic"; -import { Alignment } from "./Tooltip"; import { _t } from "../../../languageHandler"; import dis from "../../../dispatcher/dispatcher"; import { Action } from "../../../dispatcher/actions"; @@ -28,7 +28,6 @@ import InfoDialog from "../dialogs/InfoDialog"; import { useDispatcher } from "../../../hooks/useDispatcher"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; import AccessibleButton from "./AccessibleButton"; -import TooltipTarget from "./TooltipTarget"; import { Linkify, topicToHtml } from "../../../HtmlUtils"; import { tryTransformPermalinkToLocalHref } from "../../../utils/permalinks/Permalinks"; @@ -49,10 +48,10 @@ export function onRoomTopicLinkClick(e: React.MouseEvent): void { export default function RoomTopic({ room, className, ...props }: IProps): JSX.Element { const client = useContext(MatrixClientContext); - const ref = useRef(null); + const [disableTooltip, setDisableTooltip] = useState(false); const topic = useTopic(room); - const body = topicToHtml(topic?.text, topic?.html, ref); + const body = topicToHtml(topic?.text, topic?.html); const onClick = useCallback( (e: React.MouseEvent) => { @@ -70,14 +69,14 @@ export default function RoomTopic({ room, className, ...props }: IProps): JSX.El [props], ); - const ignoreHover = (ev: React.MouseEvent): boolean => { - return (ev.target as HTMLElement).tagName.toUpperCase() === "A"; + const onHover = (ev: React.MouseEvent | React.FocusEvent): void => { + setDisableTooltip((ev.target as HTMLElement).tagName.toUpperCase() === "A"); }; useDispatcher(dis, (payload) => { if (payload.action === Action.ShowRoomTopic) { const canSetTopic = room.currentState.maySendStateEvent(EventType.RoomTopic, client.getSafeUserId()); - const body = topicToHtml(topic?.text, topic?.html, ref, true); + const body = topicToHtml(topic?.text, topic?.html, undefined, true); const modal = Modal.createDialog(InfoDialog, { title: room.name, @@ -115,18 +114,24 @@ export default function RoomTopic({ room, className, ...props }: IProps): JSX.El } }); + // Do not render the tooltip if the topic is empty + // We still need to have a div for the header buttons to be displayed correctly + if (!body) return
    ; + return ( - - {body} - + +
    + {body} +
    +     ); } diff --git a/src/components/views/elements/TooltipTarget.tsx b/src/components/views/elements/TooltipTarget.tsx deleted file mode 100644 index 89de915b45..0000000000 --- a/src/components/views/elements/TooltipTarget.tsx +++ /dev/null @@ -1,92 +0,0 @@ -/* -Copyright 2021 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, { forwardRef, HTMLAttributes, useRef } from "react"; -import { randomString } from "matrix-js-sdk/src/randomstring"; - -import useFocus from "../../../hooks/useFocus"; -import useHover from "../../../hooks/useHover"; -import Tooltip, { ITooltipProps } from "./Tooltip"; - -interface IProps - extends HTMLAttributes, - Omit { - tooltipTargetClassName?: string; - ignoreHover?: (ev: React.MouseEvent) => boolean; -} - -/** - * Generic tooltip target element that handles tooltip visibility state - * and displays children - */ -const TooltipTarget = forwardRef( - ( - { - children, - tooltipTargetClassName, - // tooltip pass through props - className, - id, - label, - alignment, - tooltipClassName, - maxParentWidth, - ignoreHover, - ...rest - }, - ref, - ) => { - const idRef = useRef("mx_TooltipTarget_" + randomString(8)); - // Use generated ID if one is not passed - if (id === undefined) { - id = idRef.current; - } - - const [isFocused, focusProps] = useFocus(); - const [isHovering, hoverProps] = useHover(ignoreHover || (() => false)); - - // No need to fill up the DOM with hidden tooltip elements. Only add the - // tooltip when we're hovering over the item (performance) - const tooltip = (isFocused || isHovering) && ( - - ); - - return ( -
    - {children} - {tooltip} -
    - ); - }, -); - -export default TooltipTarget; diff --git a/src/components/views/messages/MLocationBody.tsx b/src/components/views/messages/MLocationBody.tsx index 29c1c97e1a..eedf5a6046 100644 --- a/src/components/views/messages/MLocationBody.tsx +++ b/src/components/views/messages/MLocationBody.tsx @@ -17,6 +17,7 @@ limitations under the License. import React from "react"; import { MatrixEvent, ClientEvent, ClientEventHandlerMap } from "matrix-js-sdk/src/matrix"; import { randomString } from "matrix-js-sdk/src/randomstring"; +import { Tooltip } from "@vector-im/compound-web"; import { _t } from "../../../languageHandler"; import Modal from "../../../Modal"; @@ -27,8 +28,6 @@ import { isSelfLocation, } from "../../../utils/location"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -import TooltipTarget from "../elements/TooltipTarget"; -import { Alignment } from "../elements/Tooltip"; import { SmartMarker, Map, LocationViewDialog } from "../location"; import { IBodyProps } from "./IBodyProps"; import { createReconnectedListener } from "../../../utils/connection"; @@ -126,7 +125,7 @@ export const LocationBodyFallbackContent: React.FC<{ event: MatrixEvent; error: interface LocationBodyContentProps { mxEvent: MatrixEvent; mapId: string; - tooltip?: string; + tooltip: string; onError: (error: Error) => void; onClick?: () => void; } @@ -156,13 +155,9 @@ export const LocationBodyContent: React.FC = ({ return (
    - {tooltip ? ( - - {mapElement} - - ) : ( - mapElement - )} + +
    {mapElement}
    +
    ); }; diff --git a/test/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/components/structures/__snapshots__/RoomView-test.tsx.snap index 91bfd33e83..5134769908 100644 --- a/test/components/structures/__snapshots__/RoomView-test.tsx.snap +++ b/test/components/structures/__snapshots__/RoomView-test.tsx.snap @@ -43,10 +43,7 @@ exports[`RoomView for a local room in state CREATING should match the snapshot 1
    @@ -121,10 +118,7 @@ exports[`RoomView for a local room in state ERROR should match the snapshot 1`]
    @@ -284,10 +278,7 @@ exports[`RoomView for a local room in state NEW should match the snapshot 1`] =
    @@ -531,10 +522,7 @@ exports[`RoomView for a local room in state NEW that is encrypted should match t
    diff --git a/test/components/views/elements/RoomTopic-test.tsx b/test/components/views/elements/RoomTopic-test.tsx index dc05779794..8e62bd641f 100644 --- a/test/components/views/elements/RoomTopic-test.tsx +++ b/test/components/views/elements/RoomTopic-test.tsx @@ -16,7 +16,8 @@ limitations under the License. import React from "react"; import { Room } from "matrix-js-sdk/src/matrix"; -import { fireEvent, render, screen } from "@testing-library/react"; +import { fireEvent, render, screen, waitFor } from "@testing-library/react"; +import userEvent from "@testing-library/user-event"; import { mkEvent, stubClient } from "../../../test-utils"; import { MatrixClientPeg } from "../../../../src/MatrixClientPeg"; @@ -33,9 +34,12 @@ describe("", () => { window.location.href = originalHref; }); - function runClickTest(topic: string, clickText: string) { + /** + * Create a room with the given topic + * @param topic + */ + function createRoom(topic: string) { stubClient(); - const room = new Room("!pMBteVpcoJRdCJxDmn:matrix.org", MatrixClientPeg.safeGet(), "@alice:example.org"); const topicEvent = mkEvent({ type: "m.room.topic", @@ -45,11 +49,27 @@ describe("", () => { ts: 123, event: true, }); - room.addLiveEvents([topicEvent]); - render(); + return room; + } + /** + * Create a room and render it + * @param topic + */ + const renderRoom = (topic: string) => { + const room = createRoom(topic); + render(); + }; + + /** + * Create a room and click on the given text + * @param topic + * @param clickText + */ + function runClickTest(topic: string, clickText: string) { + renderRoom(topic); fireEvent.click(screen.getByText(clickText)); } @@ -78,4 +98,18 @@ describe("", () => { expect(window.location.href).toEqual(expectedHref); expect(dis.fire).toHaveBeenCalledWith(Action.ShowRoomTopic); }); + + it("should open the tooltip when hovering a text", async () => { + const topic = "room topic"; + renderRoom(topic); + await userEvent.hover(screen.getByText(topic)); + await waitFor(() => expect(screen.getByRole("tooltip", { name: "Click to read topic" })).toBeInTheDocument()); + }); + + it("should not open the tooltip when hovering a link", async () => { + const topic = "https://matrix.org"; + renderRoom(topic); + await userEvent.hover(screen.getByText(topic)); + await waitFor(() => expect(screen.queryByRole("tooltip", { name: "Click to read topic" })).toBeNull()); + }); }); diff --git a/test/components/views/elements/TooltipTarget-test.tsx b/test/components/views/elements/TooltipTarget-test.tsx deleted file mode 100644 index 0823229a90..0000000000 --- a/test/components/views/elements/TooltipTarget-test.tsx +++ /dev/null @@ -1,82 +0,0 @@ -/* -Copyright 2022 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 { fireEvent, render } from "@testing-library/react"; - -import { Alignment } from "../../../../src/components/views/elements/Tooltip"; -import TooltipTarget from "../../../../src/components/views/elements/TooltipTarget"; - -describe("", () => { - const defaultProps = { - "tooltipTargetClassName": "test tooltipTargetClassName", - "className": "test className", - "tooltipClassName": "test tooltipClassName", - "label": "test label", - "alignment": Alignment.Left, - "id": "test id", - "data-testid": "test", - }; - - const getComponent = (props = {}) => { - const wrapper = render( - // wrap in element so renderIntoDocument can render functional component - - - child - - , - ); - return wrapper.getByTestId("test"); - }; - - const getVisibleTooltip = () => document.querySelector(".mx_Tooltip.mx_Tooltip_visible"); - - it("renders container", () => { - const component = getComponent(); - expect(component).toMatchSnapshot(); - expect(getVisibleTooltip()).toBeFalsy(); - }); - - const alignmentKeys = Object.keys(Alignment).filter((o: any) => isNaN(o)); - it.each(alignmentKeys)("displays %s aligned tooltip on mouseover", async (alignment: any) => { - const wrapper = getComponent({ alignment: Alignment[alignment] })!; - fireEvent.mouseOver(wrapper); - expect(getVisibleTooltip()).toMatchSnapshot(); - }); - - it("hides tooltip on mouseleave", () => { - const wrapper = getComponent()!; - fireEvent.mouseOver(wrapper); - expect(getVisibleTooltip()).toBeTruthy(); - fireEvent.mouseLeave(wrapper); - expect(getVisibleTooltip()).toBeFalsy(); - }); - - it("displays tooltip on focus", () => { - const wrapper = getComponent()!; - fireEvent.focus(wrapper); - expect(getVisibleTooltip()).toBeTruthy(); - }); - - it("hides tooltip on blur", async () => { - const wrapper = getComponent()!; - fireEvent.focus(wrapper); - expect(getVisibleTooltip()).toBeTruthy(); - fireEvent.blur(wrapper); - expect(getVisibleTooltip()).toBeFalsy(); - }); -}); diff --git a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap index 8f36256547..b344e3cd58 100644 --- a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap +++ b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap @@ -288,9 +288,7 @@ exports[`AppTile for a pinned widget should render permission request 1`] = ` Using this widget may share data
    displays Bottom aligned tooltip on mouseover 1`] = ` -