Fix typing issues

test/components/structures/auth/ForgotPassword-test.tsx

@@ -19,7 +19,6 @@ import { mocked } from "jest-mock";
 import { act, render, RenderResult, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { MatrixClient, createClient } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import ForgotPassword from "../../../../src/components/structures/auth/ForgotPassword";
 import { ValidatedServerConfig } from "../../../../src/utils/ValidatedServerConfig";
@@ -103,7 +102,6 @@ describe("<ForgotPassword>", () => {
         beforeEach(() => {
             renderResult = render(
                 <ForgotPassword serverConfig={serverConfig} onComplete={onComplete} onLoginClick={onLoginClick} />,
-                ,
             );
         });
 

test/components/views/avatars/DecoratedRoomAvatar-test.tsx

@@ -19,7 +19,6 @@ import { mocked } from "jest-mock";
 import { JoinRule, MatrixClient, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
 import React from "react";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import { stubClient } from "../../../test-utils";
@@ -39,9 +38,7 @@ describe("DecoratedRoomAvatar", () => {
     let room: Room;
 
     function renderComponent() {
-        return render(<DecoratedRoomAvatar room={room} size="32px" />, {
+        return render(<DecoratedRoomAvatar room={room} size="32px" />);
-            wrapper: TooltipProvider,
-        });
     }
 
     beforeEach(() => {

test/components/views/beacon/BeaconViewDialog-test.tsx

@@ -19,7 +19,6 @@ import { act, fireEvent, render, RenderResult } from "@testing-library/react";
 import { MatrixClient, MatrixEvent, Room, RoomMember, getBeaconInfoIdentifier } from "matrix-js-sdk/src/matrix";
 import * as maplibregl from "maplibre-gl";
 import { mocked } from "jest-mock";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import BeaconViewDialog from "../../../../src/components/views/beacon/BeaconViewDialog";
 import {

test/components/views/beacon/DialogSidebar-test.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { ComponentProps } from "react";
 import { act, fireEvent, render } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import DialogSidebar from "../../../../src/components/views/beacon/DialogSidebar";
 import MatrixClientContext from "../../../../src/contexts/MatrixClientContext";
@@ -53,9 +52,7 @@ describe("<DialogSidebar />", () => {
 
     const getComponent = (props = {}) => (
         <MatrixClientContext.Provider value={client}>
-            <TooltipProvider>
+            <DialogSidebar {...defaultProps} {...props} />
-                <DialogSidebar {...defaultProps} {...props} />
-            </TooltipProvider>
         </MatrixClientContext.Provider>
     );
 

test/components/views/dialogs/ShareDialog-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { EventTimeline, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
 import { render, RenderOptions } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
 import SettingsStore from "../../../../src/settings/SettingsStore";
@@ -31,11 +30,7 @@ jest.mock("../../../../src/utils/ShieldUtils");
 function getWrapper(): RenderOptions {
     return {
         wrapper: ({ children }) => (
-            <TooltipProvider>
+            <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>{children}</MatrixClientContext.Provider>
-                <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>
-                    {children}
-                </MatrixClientContext.Provider>
-            </TooltipProvider>
         ),
     };
 }

test/components/views/elements/InfoTooltip-test.tsx

@@ -17,15 +17,12 @@ limitations under the License.
 import React from "react";
 import userEvent from "@testing-library/user-event";
 import { render, waitFor } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import InfoTooltip from "../../../../src/components/views/elements/InfoTooltip";
 
 describe("InfoTooltip", () => {
     it("should show tooltip on hover", async () => {
-        const { getByText, asFragment } = render(<InfoTooltip tooltip="Tooltip text">Trigger text</InfoTooltip>, {
+        const { getByText, asFragment } = render(<InfoTooltip tooltip="Tooltip text">Trigger text</InfoTooltip>);
-            wrapper: TooltipProvider,
-        });
 
         const trigger = getByText("Trigger text");
         expect(trigger).toBeVisible();

test/components/views/elements/Pill-test.tsx

@@ -19,7 +19,6 @@ import { act, render, RenderResult, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { mocked, Mocked } from "jest-mock";
 import { MatrixClient, MatrixEvent, Room } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import dis from "../../../../src/dispatcher/dispatcher";
 import { Pill, PillProps, PillType } from "../../../../src/components/views/elements/Pill";
@@ -65,7 +64,6 @@ describe("<Pill>", () => {
             <div onClick={pillParentClickHandler}>
                 <Pill {...withDefault} />
             </div>,
-            ,
         );
     };
 

test/components/views/elements/RoomFacePile-test.tsx

@@ -14,7 +14,6 @@ limitations under the License.
 
 import { render } from "@testing-library/react";
 import React from "react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 
 import { mkRoom, mkRoomMember, stubClient, withClientContextRenderOptions } from "../../../test-utils";
@@ -33,9 +32,7 @@ describe("<RoomFacePile />", () => {
         ]);
 
         const { asFragment } = render(
-            <TooltipProvider>
+            <RoomFacePile onlyKnownUsers={false} room={room} />,
-                <RoomFacePile onlyKnownUsers={false} room={room} />
-            </TooltipProvider>,
             withClientContextRenderOptions(MatrixClientPeg.get()!),
         );
 

test/components/views/messages/CallEvent-test.tsx

@@ -19,7 +19,6 @@ import { render, screen, act, cleanup, fireEvent, waitFor } from "@testing-libra
 import { mocked, Mocked } from "jest-mock";
 import { Room, RoomStateEvent, MatrixClient, PendingEventOrdering } from "matrix-js-sdk/src/matrix";
 import { ClientWidgetApi, Widget } from "matrix-widget-api";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import type { RoomMember } from "matrix-js-sdk/src/matrix";
 import {

test/components/views/messages/MessageTimestamp-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import MessageTimestamp from "../../../../src/components/views/messages/MessageTimestamp";
 
@@ -31,7 +30,7 @@ describe("MessageTimestamp", () => {
     const DAY_MS = HOUR_MS * 24;
 
     it("should render HH:MM", () => {
-        const { asFragment } = render(<MessageTimestamp ts={nowDate.getTime()} />, );
+        const { asFragment } = render(<MessageTimestamp ts={nowDate.getTime()} />);
         expect(asFragment()).toMatchInlineSnapshot(`
             <DocumentFragment>
               <span
@@ -47,7 +46,7 @@ describe("MessageTimestamp", () => {
     });
 
     it("should show full date & time on hover", async () => {
-        const { container } = render(<MessageTimestamp ts={nowDate.getTime()} />, );
+        const { container } = render(<MessageTimestamp ts={nowDate.getTime()} />);
         await userEvent.hover(container.querySelector(".mx_MessageTimestamp")!);
         expect((await screen.findByRole("tooltip")).textContent).toMatchInlineSnapshot(`"Fri, Dec 17, 2021, 08:09:00"`);
     });
@@ -55,7 +54,6 @@ describe("MessageTimestamp", () => {
     it("should show sent & received time on hover if passed", async () => {
         const { container } = render(
             <MessageTimestamp ts={nowDate.getTime()} receivedTs={nowDate.getTime() + DAY_MS} />,
-            ,
         );
         await userEvent.hover(container.querySelector(".mx_MessageTimestamp")!);
         expect((await screen.findByRole("tooltip")).textContent).toMatchInlineSnapshot(

test/components/views/polls/pollHistory/PollHistory-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { act, fireEvent, render } from "@testing-library/react";
 import { Filter, EventTimeline, Room, MatrixEvent, M_POLL_START } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { PollHistory } from "../../../../../src/components/views/polls/pollHistory/PollHistory";
 import {
@@ -68,9 +67,7 @@ describe("<PollHistory />", () => {
     const getComponent = () =>
         render(<PollHistory {...defaultProps} />, {
             wrapper: ({ children }) => (
-                <MatrixClientContext.Provider value={mockClient}>
+                <MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </MatrixClientContext.Provider>
             ),
         });
 

test/components/views/polls/pollHistory/PollListItemEnded-test.tsx

@@ -17,7 +17,6 @@ limitations under the License.
 import React from "react";
 import { render } from "@testing-library/react";
 import { MatrixEvent, Poll, Room, M_TEXT } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { PollListItemEnded } from "../../../../../src/components/views/polls/pollHistory/PollListItemEnded";
 import {

test/components/views/right_panel/RoomSummaryCard-test.tsx

@@ -19,7 +19,6 @@ import { render, fireEvent, screen } from "@testing-library/react";
 import { EventType, MatrixEvent, Room, MatrixClient, JoinRule } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { mocked, MockedObject } from "jest-mock";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import DMRoomMap from "../../../../src/utils/DMRoomMap";
 import RoomSummaryCard from "../../../../src/components/views/right_panel/RoomSummaryCard";
@@ -57,9 +56,7 @@ describe("<RoomSummaryCard />", () => {
 
         return render(<RoomSummaryCard {...defaultProps} {...props} />, {
             wrapper: ({ children }) => (
-                <MatrixClientContext.Provider value={mockClient}>
+                <MatrixClientContext.Provider value={mockClient}>{children}</MatrixClientContext.Provider>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </MatrixClientContext.Provider>
             ),
         });
     };

test/components/views/right_panel/UserInfo-test.tsx

@@ -38,7 +38,6 @@ import {
     VerificationPhase as Phase,
     VerificationRequestEvent,
 } from "matrix-js-sdk/src/crypto-api";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import UserInfo, {
     BanToggleButton,
@@ -206,11 +205,7 @@ describe("<UserInfo />", () => {
 
     const renderComponent = (props = {}) => {
         const Wrapper = (wrapperProps = {}) => {
-            return (
+            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-                <TooltipProvider>
-                    <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
-                </TooltipProvider>
-            );
         };
 
         return render(<UserInfo {...defaultProps} {...props} />, {
@@ -454,11 +449,7 @@ describe("<UserInfoHeader />", () => {
 
     const renderComponent = (props = {}) => {
         const Wrapper = (wrapperProps = {}) => {
-            return (
+            return <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />;
-                <TooltipProvider>
-                    <MatrixClientContext.Provider value={mockClient} {...wrapperProps} />
-                </TooltipProvider>
-            );
         };
 
         return render(<UserInfoHeader {...defaultProps} {...props} />, {

test/components/views/rooms/EventTile-test.tsx

@@ -29,7 +29,6 @@ import {
     TweakName,
 } from "matrix-js-sdk/src/matrix";
 import { EventEncryptionInfo, EventShieldColour, EventShieldReason } from "matrix-js-sdk/src/crypto-api";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { mkEncryptedMatrixEvent } from "matrix-js-sdk/src/testing";
 
 import EventTile, { EventTileProps } from "../../../../src/components/views/rooms/EventTile";
@@ -59,13 +58,11 @@ describe("EventTile", () => {
         return (
             <MatrixClientContext.Provider value={client}>
                 <RoomContext.Provider value={props.roomContext}>
-                    <TooltipProvider>
+                    <EventTile
-                        <EventTile
+                        mxEvent={mxEvent}
-                            mxEvent={mxEvent}
+                        replacingEventId={mxEvent.replacingEventId()}
-                            replacingEventId={mxEvent.replacingEventId()}
+                        {...(props.eventTilePropertyOverrides ?? {})}
-                            {...(props.eventTilePropertyOverrides ?? {})}
+                    />
-                        />
-                    </TooltipProvider>
                 </RoomContext.Provider>
             </MatrixClientContext.Provider>
         );

test/components/views/rooms/LegacyRoomHeader-test.tsx

@@ -32,7 +32,6 @@ import { ClientWidgetApi, Widget } from "matrix-widget-api";
 import EventEmitter from "events";
 import { setupJestCanvasMock } from "jest-canvas-mock";
 import { ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
-import { TooltipProvider } from "@vector-im/compound-web";
 // eslint-disable-next-line no-restricted-imports
 import { MatrixRTCSessionManagerEvents } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSessionManager";
 // eslint-disable-next-line no-restricted-imports
@@ -226,7 +225,6 @@ describe("LegacyRoomHeader", () => {
                     {...props}
                 />
             </RoomContext.Provider>,
-            ,
         );
     };
 
@@ -870,7 +868,6 @@ function mountHeader(room: Room, propsOverride = {}, roomContext?: Partial<IRoom
         <RoomContext.Provider value={{ ...roomContext, room } as IRoomState}>
             <RoomHeader {...props} />
         </RoomContext.Provider>,
-        ,
     );
 }
 

test/components/views/rooms/RoomHeader-test.tsx

@@ -40,7 +40,6 @@ import {
     waitFor,
 } from "@testing-library/react";
 import { ViewRoomOpts } from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { filterConsole, mkEvent, stubClient } from "../../../test-utils";
 import RoomHeader from "../../../../src/components/views/rooms/RoomHeader";
@@ -67,11 +66,7 @@ jest.mock("../../../../src/utils/ShieldUtils");
 function getWrapper(): RenderOptions {
     return {
         wrapper: ({ children }) => (
-            <TooltipProvider>
+            <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>{children}</MatrixClientContext.Provider>
-                <MatrixClientContext.Provider value={MatrixClientPeg.safeGet()}>
-                    {children}
-                </MatrixClientContext.Provider>
-            </TooltipProvider>
         ),
     };
 }

test/components/views/rooms/RoomHeader/CallGuestLinkButton-test.tsx

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import React from "react";
-import { TooltipProvider } from "@vector-im/compound-web";
 import { fireEvent, getByLabelText, getByText, render, screen, waitFor } from "@testing-library/react";
 import { EventTimeline, JoinRule, Room } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
@@ -75,11 +74,7 @@ describe("<CallGuestLinkButton />", () => {
 
     const getComponent = (room: Room) =>
         render(<CallGuestLinkButton room={room} />, {
-            wrapper: ({ children }) => (
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
-                <SDKContext.Provider value={sdkContext}>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </SDKContext.Provider>
-            ),
         });
 
     const oldGet = SdkConfig.get;
@@ -225,11 +220,7 @@ describe("<CallGuestLinkButton />", () => {
 
         const getComponent = (room: Room, canInvite: boolean = true) =>
             render(<JoinRuleDialog room={room} canInvite={canInvite} onFinished={onFinished} />, {
-                wrapper: ({ children }) => (
+                wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
-                    <SDKContext.Provider value={sdkContext}>
-                        <TooltipProvider>{children}</TooltipProvider>
-                    </SDKContext.Provider>
-                ),
             });
 
         beforeEach(() => {

test/components/views/rooms/RoomHeader/VideoRoomChatButton-test.tsx

@@ -18,7 +18,6 @@ import React from "react";
 import { MockedObject } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
 import { fireEvent, render, screen } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { VideoRoomChatButton } from "../../../../../src/components/views/rooms/RoomHeader/VideoRoomChatButton";
 import { SDKContext, SdkContextClass } from "../../../../../src/contexts/SDKContext";
@@ -57,11 +56,7 @@ describe("<VideoRoomChatButton />", () => {
 
     const getComponent = (room: Room) =>
         render(<VideoRoomChatButton room={room} />, {
-            wrapper: ({ children }) => (
+            wrapper: ({ children }) => <SDKContext.Provider value={sdkContext}>{children}</SDKContext.Provider>,
-                <SDKContext.Provider value={sdkContext}>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </SDKContext.Provider>
-            ),
         });
 
     beforeEach(() => {

test/components/views/rooms/RoomList-test.tsx

@@ -20,7 +20,6 @@ import { cleanup, queryByRole, render, screen, within } from "@testing-library/r
 import userEvent from "@testing-library/user-event";
 import { mocked } from "jest-mock";
 import { Room } from "matrix-js-sdk/src/matrix";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import RoomList from "../../../../src/components/views/rooms/RoomList";
 import ResizeNotifier from "../../../../src/utils/ResizeNotifier";
@@ -56,18 +55,16 @@ describe("RoomList", () => {
 
     function getComponent(props: Partial<ComponentProps<typeof RoomList>> = {}): JSX.Element {
         return (
-            <TooltipProvider>
+            <RoomList
-                <RoomList
+                onKeyDown={jest.fn()}
-                    onKeyDown={jest.fn()}
+                onFocus={jest.fn()}
-                    onFocus={jest.fn()}
+                onBlur={jest.fn()}
-                    onBlur={jest.fn()}
+                onResize={jest.fn()}
-                    onResize={jest.fn()}
+                resizeNotifier={new ResizeNotifier()}
-                    resizeNotifier={new ResizeNotifier()}
+                isMinimized={false}
-                    isMinimized={false}
+                activeSpace={MetaSpace.Home}
-                    activeSpace={MetaSpace.Home}
+                {...props}
-                    {...props}
+            />
-                />
-            </TooltipProvider>
         );
     }
 

test/components/views/settings/devices/FilteredDeviceList-test.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import React, { ComponentProps } from "react";
 import { act, fireEvent, render } from "@testing-library/react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import { FilteredDeviceList } from "../../../../../src/components/views/settings/devices/FilteredDeviceList";
 import { DeviceSecurityVariation } from "../../../../../src/components/views/settings/devices/types";
@@ -82,11 +81,7 @@ describe("<FilteredDeviceList />", () => {
         supportsMSC3881: true,
     };
 
-    const getComponent = (props = {}) => (
+    const getComponent = (props = {}) => <FilteredDeviceList {...defaultProps} {...props} />;
-        <TooltipProvider>
-            <FilteredDeviceList {...defaultProps} {...props} />
-        </TooltipProvider>
-    );
 
     afterAll(() => {
         jest.spyOn(global.Date, "now").mockRestore();

test/components/views/settings/devices/FilteredDeviceListHeader-test.tsx

@@ -16,7 +16,6 @@ limitations under the License.
 
 import { fireEvent, render } from "@testing-library/react";
 import React from "react";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import FilteredDeviceListHeader from "../../../../../src/components/views/settings/devices/FilteredDeviceListHeader";
 
@@ -28,11 +27,7 @@ describe("<FilteredDeviceListHeader />", () => {
         children: <div>test</div>,
         ["data-testid"]: "test123",
     };
-    const getComponent = (props = {}) => (
+    const getComponent = (props = {}) => <FilteredDeviceListHeader {...defaultProps} {...props} />;
-        <TooltipProvider>
-            <FilteredDeviceListHeader {...defaultProps} {...props} />
-        </TooltipProvider>
-    );
 
     it("renders correctly when no devices are selected", () => {
         const { container } = render(getComponent());

test/components/views/settings/tabs/user/SessionManagerTab-test.tsx

@@ -35,7 +35,6 @@ import {
     MatrixClient,
 } from "matrix-js-sdk/src/matrix";
 import { mocked, MockedObject } from "jest-mock";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import {
     clearAllModals,
@@ -99,11 +98,9 @@ describe("<SessionManagerTab />", () => {
 
     const defaultProps = {};
     const getComponent = (props = {}): React.ReactElement => (
-        <TooltipProvider>
+        <SDKContext.Provider value={sdkContext}>
-            <SDKContext.Provider value={sdkContext}>
+            <SessionManagerTab {...defaultProps} {...props} />
-                <SessionManagerTab {...defaultProps} {...props} />
+        </SDKContext.Provider>
-            </SDKContext.Provider>
-        </TooltipProvider>
     );
 
     const toggleDeviceDetails = (

test/components/views/voip/CallView-test.tsx

@@ -20,7 +20,6 @@ import { render, screen, act, fireEvent, waitFor, cleanup } from "@testing-libra
 import { mocked, Mocked } from "jest-mock";
 import { MatrixClient, PendingEventOrdering, Room, RoomStateEvent } from "matrix-js-sdk/src/matrix";
 import { Widget } from "matrix-widget-api";
-import { TooltipProvider } from "@vector-im/compound-web";
 
 import type { RoomMember } from "matrix-js-sdk/src/matrix";
 import type { ClientWidgetApi } from "matrix-widget-api";
@@ -74,9 +73,7 @@ describe("CallView", () => {
     });
 
     const renderView = async (skipLobby = false): Promise<void> => {
-        render(<CallView room={room} resizing={false} waitForCall={false} skipLobby={skipLobby} />, {
+        render(<CallView room={room} resizing={false} waitForCall={false} skipLobby={skipLobby} />);
-            wrapper: TooltipProvider,
-        });
         await act(() => Promise.resolve()); // Let effects settle
     };