Skip to content

Commit 7e03f38

Browse files
authored
Switch to React18 useId (#28651)
Signed-off-by: Michael Telatynski <[email protected]>
1 parent 9bf3d22 commit 7e03f38

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

src/components/views/settings/AvatarSetting.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
66
Please see LICENSE files in the repository root for full details.
77
*/
88

9-
import React, { ReactNode, createRef, useCallback, useEffect, useState } from "react";
9+
import React, { ReactNode, createRef, useCallback, useEffect, useState, useId } from "react";
1010
import EditIcon from "@vector-im/compound-design-tokens/assets/web/icons/edit";
1111
import UploadIcon from "@vector-im/compound-design-tokens/assets/web/icons/share";
1212
import DeleteIcon from "@vector-im/compound-design-tokens/assets/web/icons/delete";
@@ -16,7 +16,6 @@ import classNames from "classnames";
1616
import { _t } from "../../../languageHandler";
1717
import { mediaFromMxc } from "../../../customisations/Media";
1818
import { chromeFileInputFix } from "../../../utils/BrowserWorkarounds";
19-
import { useId } from "../../../utils/useId";
2019
import AccessibleButton from "../elements/AccessibleButton";
2120
import BaseAvatar from "../avatars/BaseAvatar";
2221
import Modal from "../../../Modal.tsx";

src/components/views/settings/UserProfileSettings.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
66
Please see LICENSE files in the repository root for full details.
77
*/
88

9-
import React, { ChangeEvent, ReactNode, useCallback, useEffect, useMemo, useState } from "react";
9+
import React, { ChangeEvent, ReactNode, useCallback, useEffect, useMemo, useState, useId } from "react";
1010
import { logger } from "matrix-js-sdk/src/logger";
1111
import { EditInPlace, Alert, ErrorMessage } from "@vector-im/compound-web";
1212
import PopOutIcon from "@vector-im/compound-design-tokens/assets/web/icons/pop-out";
@@ -20,7 +20,6 @@ import { formatBytes } from "../../../utils/FormattingUtils";
2020
import { useToastContext } from "../../../contexts/ToastContext";
2121
import InlineSpinner from "../elements/InlineSpinner";
2222
import UserIdentifierCustomisations from "../../../customisations/UserIdentifier";
23-
import { useId } from "../../../utils/useId";
2423
import CopyableText from "../elements/CopyableText";
2524
import { useMatrixClientContext } from "../../../contexts/MatrixClientContext";
2625
import AccessibleButton from "../elements/AccessibleButton";

src/utils/useId.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)