Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/react-aria/src/utils/useId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ if (typeof FinalizationRegistry !== 'undefined') {
idsUpdaterMap.delete(heldValue);
});
}
let registeredIds = new WeakMap<object, string>();

/**
* If a default is not provided, generate an id.
Expand All @@ -44,8 +45,13 @@ export function useId(defaultId?: string): string {
let res = useSSRSafeId(value);
let cleanupRef = useRef(null);

if (registry) {
registry.register(cleanupRef, res);
let registeredId = registeredIds.get(cleanupRef);
if (registry && registeredId !== res) {
if (registeredId != null) {
registry.unregister(cleanupRef);
}
registry.register(cleanupRef, res, cleanupRef);
registeredIds.set(cleanupRef, res);
}

if (canUseDOM) {
Expand All @@ -64,6 +70,7 @@ export function useId(defaultId?: string): string {
// when it is though, also remove it from the finalization registry.
if (registry) {
registry.unregister(cleanupRef);
registeredIds.delete(cleanupRef);
}
idsUpdaterMap.delete(r);
};
Expand Down
89 changes: 89 additions & 0 deletions packages/react-aria/test/utils/useId.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
/*
* Copyright 2026 Adobe. All rights reserved.
* This file is licensed to you 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 REPRESENTATIONS
* OF ANY KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/

describe('useId', function () {
let OriginalFinalizationRegistry = global.FinalizationRegistry;

afterEach(() => {
global.FinalizationRegistry = OriginalFinalizationRegistry;
jest.resetModules();
});

it('registers once per mounted id and uses an unregister token', function () {
let register = jest.fn();
let unregister = jest.fn();

global.FinalizationRegistry = jest.fn(function () {
this.register = register;
this.unregister = unregister;
});

jest.isolateModules(() => {
let React = require('react');
let ReactDOM = require('react-dom');
let {act} = require('react-dom/test-utils');
let {useId} = require('../../src/utils/useId');
let isReact18OrHigher = parseInt(React.version, 10) >= 18;

function Test({tick}) {
let id = useId();
return React.createElement('div', {'data-id': id}, tick);
}

let container = document.createElement('div');
document.body.appendChild(container);

// Use createRoot for React 18+ and ReactDOM.render for older
let renderElement;
let unmount;
if (isReact18OrHigher) {
let {createRoot} = require('react-dom/client');
global.IS_REACT_ACT_ENVIRONMENT = true;
let root = createRoot(container);
renderElement = (el) => root.render(el);
unmount = () => root.unmount();
} else {
renderElement = (el) => ReactDOM.render(el, container);
unmount = () => ReactDOM.unmountComponentAtNode(container);
}

act(() => {
renderElement(React.createElement(Test, {tick: 0}));
});

act(() => {
renderElement(React.createElement(Test, {tick: 1}));
});

act(() => {
renderElement(React.createElement(Test, {tick: 2}));
});

// Re-rendering the same mounted hook should not add more registry entries.
expect(register).toHaveBeenCalledTimes(1);
// The held value should be the generated id string, and the unregister token should match
// the target object so useId can remove the same registration during cleanup.
expect(register.mock.calls[0][1]).toEqual(expect.any(String));
expect(register.mock.calls[0][2]).toBe(register.mock.calls[0][0]);

act(() => {
unmount();
});

document.body.removeChild(container);

// Unmount should remove the specific registration created for this hook instance.
expect(unregister).toHaveBeenCalledTimes(1);
expect(unregister).toHaveBeenCalledWith(register.mock.calls[0][2]);
});
});
});
Loading