mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Keep track of root insertion order in the renderer
Normally, Fibers have key or index which we'll use to match things up between reloads. However, roots don't have such a concept. We'll use their insertion order as an approximation. If it's consistent, we'll be able to restore the selection.
This commit is contained in:
1 parent
d8abecdcf9
commit
b1a7007cc5
1 file changed
+7
@@ -539,6 +539,11 @@ export function attach(
|
||||
// When a mount or update is in progress, this value tracks the root that is being operated on.
|
||||
let currentRootID: number = -1;
|
||||
|
||||
// Track the order in which roots were added.
|
||||
// We will use it to disambiguate roots when restoring selection between reloads.
|
||||
let nextRootIndex = 0;
|
||||
const rootInsertionOrder: Map<number, number> = new Map();
|
||||
|
||||
function getFiberID(primaryFiber: Fiber): number {
|
||||
if (!fiberToIDMap.has(primaryFiber)) {
|
||||
const id = getUID();
|
||||
@@ -690,6 +695,7 @@ export function attach(
|
||||
const hasOwnerMetadata = fiber.hasOwnProperty('_debugOwner');
|
||||
|
||||
if (isRoot) {
|
||||
rootInsertionOrder.set(id, nextRootIndex++);
|
||||
pushOperation(TREE_OPERATION_ADD);
|
||||
pushOperation(id);
|
||||
pushOperation(ElementTypeRoot);
|
||||
@@ -777,6 +783,7 @@ export function attach(
|
||||
}
|
||||
const id = getFiberID(primaryFiber);
|
||||
if (isRoot) {
|
||||
rootInsertionOrder.delete(id);
|
||||
// Removing a root needs to happen at the end
|
||||
// so we don't batch it with other unmounts.
|
||||
pushOperation(TREE_OPERATION_REMOVE);
|
||||
|
||||
Reference in new issue
Block a user