From a6ae04bcdebf7dce430b3412480c1e63c60bcd5e Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 19 Mar 2025 10:39:52 +0000 Subject: [PATCH] Update react imports (#29538) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/SlashCommands.tsx | 2 +- src/components/structures/NonUrgentToastContainer.tsx | 2 +- src/components/structures/RoomSearch.tsx | 2 +- src/components/structures/ToastContainer.tsx | 2 +- src/components/views/context_menus/DialpadContextMenu.tsx | 3 +-- src/components/views/dialogs/ModalWidgetDialog.tsx | 2 +- src/components/views/dialogs/RegistrationEmailPromptDialog.tsx | 3 +-- src/components/views/elements/DialPadBackspaceButton.tsx | 2 +- src/components/views/elements/QRCode.tsx | 2 +- test/unit-tests/async-components/structures/ErrorView-test.tsx | 2 +- test/unit-tests/components/views/auth/AuthFooter-test.tsx | 2 +- test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx | 2 +- test/unit-tests/components/views/auth/AuthPage-test.tsx | 2 +- test/unit-tests/components/views/rooms/EventTile-test.tsx | 2 +- .../unit-tests/components/views/rooms/MessageComposer-test.tsx | 2 +- .../components/views/rooms/SearchResultTile-test.tsx | 2 +- 16 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx index 4a4a80f723..865da9e51c 100644 --- a/src/SlashCommands.tsx +++ b/src/SlashCommands.tsx @@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { ContentHelpers, Direction, diff --git a/src/components/structures/NonUrgentToastContainer.tsx b/src/components/structures/NonUrgentToastContainer.tsx index 4e37110160..481c9f0bf9 100644 --- a/src/components/structures/NonUrgentToastContainer.tsx +++ b/src/components/structures/NonUrgentToastContainer.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { type EmptyObject } from "matrix-js-sdk/src/matrix"; import { type ComponentClass } from "../../@types/common"; diff --git a/src/components/structures/RoomSearch.tsx b/src/components/structures/RoomSearch.tsx index 439c1e47fe..2130f4fa21 100644 --- a/src/components/structures/RoomSearch.tsx +++ b/src/components/structures/RoomSearch.tsx @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. */ import classNames from "classnames"; -import * as React from "react"; +import React from "react"; import { ALTERNATE_KEY_NAME } from "../../accessibility/KeyboardShortcuts"; import defaultDispatcher from "../../dispatcher/dispatcher"; diff --git a/src/components/structures/ToastContainer.tsx b/src/components/structures/ToastContainer.tsx index 43c12d9cf6..649cd1dc59 100644 --- a/src/components/structures/ToastContainer.tsx +++ b/src/components/structures/ToastContainer.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import classNames from "classnames"; import { Text } from "@vector-im/compound-web"; import { type EmptyObject } from "matrix-js-sdk/src/matrix"; diff --git a/src/components/views/context_menus/DialpadContextMenu.tsx b/src/components/views/context_menus/DialpadContextMenu.tsx index 12fc19781c..d194d02656 100644 --- a/src/components/views/context_menus/DialpadContextMenu.tsx +++ b/src/components/views/context_menus/DialpadContextMenu.tsx @@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; -import { createRef } from "react"; +import React, { createRef } from "react"; import { type MatrixCall } from "matrix-js-sdk/src/webrtc/call"; import AccessibleButton, { type ButtonEvent } from "../elements/AccessibleButton"; diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx index e6506b4258..0d06706ade 100644 --- a/src/components/views/dialogs/ModalWidgetDialog.tsx +++ b/src/components/views/dialogs/ModalWidgetDialog.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { ClientWidgetApi, type IModalWidgetCloseRequest, diff --git a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx index 755d1a5116..b798035ab9 100644 --- a/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx +++ b/src/components/views/dialogs/RegistrationEmailPromptDialog.tsx @@ -6,8 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; -import { type SyntheticEvent, useRef, useState } from "react"; +import React, { type SyntheticEvent, useRef, useState } from "react"; import { _t, _td } from "../../../languageHandler"; import type Field from "../elements/Field"; diff --git a/src/components/views/elements/DialPadBackspaceButton.tsx b/src/components/views/elements/DialPadBackspaceButton.tsx index 3cdf1135e1..2a3b7df5e5 100644 --- a/src/components/views/elements/DialPadBackspaceButton.tsx +++ b/src/components/views/elements/DialPadBackspaceButton.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { _t } from "../../../languageHandler"; import AccessibleButton, { type ButtonEvent } from "./AccessibleButton"; diff --git a/src/components/views/elements/QRCode.tsx b/src/components/views/elements/QRCode.tsx index 805774ba52..18458126f3 100644 --- a/src/components/views/elements/QRCode.tsx +++ b/src/components/views/elements/QRCode.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { toDataURL, type QRCodeSegment, type QRCodeToDataURLOptions, type QRCodeRenderersOptions } from "qrcode"; import classNames from "classnames"; diff --git a/test/unit-tests/async-components/structures/ErrorView-test.tsx b/test/unit-tests/async-components/structures/ErrorView-test.tsx index da4ff9c8e0..aeb0e0c2a5 100644 --- a/test/unit-tests/async-components/structures/ErrorView-test.tsx +++ b/test/unit-tests/async-components/structures/ErrorView-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { render } from "jest-matrix-react"; import SdkConfig from "../../../../src/SdkConfig"; diff --git a/test/unit-tests/components/views/auth/AuthFooter-test.tsx b/test/unit-tests/components/views/auth/AuthFooter-test.tsx index f92a304299..e1d5260cd0 100644 --- a/test/unit-tests/components/views/auth/AuthFooter-test.tsx +++ b/test/unit-tests/components/views/auth/AuthFooter-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { render } from "jest-matrix-react"; import AuthFooter from "../../../../../src/components/views/auth/AuthFooter"; diff --git a/test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx b/test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx index 706e4d5d39..d0cb9ad8b2 100644 --- a/test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx +++ b/test/unit-tests/components/views/auth/AuthHeaderLogo-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { render } from "jest-matrix-react"; import AuthHeaderLogo from "../../../../../src/components/views/auth/AuthHeaderLogo"; diff --git a/test/unit-tests/components/views/auth/AuthPage-test.tsx b/test/unit-tests/components/views/auth/AuthPage-test.tsx index 543342661e..1c5b856946 100644 --- a/test/unit-tests/components/views/auth/AuthPage-test.tsx +++ b/test/unit-tests/components/views/auth/AuthPage-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { render } from "jest-matrix-react"; import AuthPage from "../../../../../src/components/views/auth/AuthPage"; diff --git a/test/unit-tests/components/views/rooms/EventTile-test.tsx b/test/unit-tests/components/views/rooms/EventTile-test.tsx index 90ff709c5a..0a9a53d60a 100644 --- a/test/unit-tests/components/views/rooms/EventTile-test.tsx +++ b/test/unit-tests/components/views/rooms/EventTile-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { act, fireEvent, render, screen, waitFor } from "jest-matrix-react"; import { mocked } from "jest-mock"; import { diff --git a/test/unit-tests/components/views/rooms/MessageComposer-test.tsx b/test/unit-tests/components/views/rooms/MessageComposer-test.tsx index 49521422c6..c12aa7e7e4 100644 --- a/test/unit-tests/components/views/rooms/MessageComposer-test.tsx +++ b/test/unit-tests/components/views/rooms/MessageComposer-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { EventType, type MatrixEvent, RoomMember, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix"; import { act, fireEvent, render, screen, waitFor } from "jest-matrix-react"; import userEvent from "@testing-library/user-event"; diff --git a/test/unit-tests/components/views/rooms/SearchResultTile-test.tsx b/test/unit-tests/components/views/rooms/SearchResultTile-test.tsx index c12aa15eae..fb211f8fb6 100644 --- a/test/unit-tests/components/views/rooms/SearchResultTile-test.tsx +++ b/test/unit-tests/components/views/rooms/SearchResultTile-test.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import * as React from "react"; +import React from "react"; import { MatrixEvent, Room, EventType } from "matrix-js-sdk/src/matrix"; import { render, type RenderResult } from "jest-matrix-react";