Skip to content
Merged
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
110 changes: 110 additions & 0 deletions packages/react-dom/src/__tests__/ReactDOMFragmentRefs-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,116 @@ describe('FragmentRefs', () => {
);
});

// @gate enableFragmentRefs
it('compares a root-level Fragment', async () => {
const fragmentRef = React.createRef();
const emptyFragmentRef = React.createRef();
const childRef = React.createRef();
const siblingPrecedingRef = React.createRef();
const siblingFollowingRef = React.createRef();
const root = ReactDOMClient.createRoot(container);

function Test() {
return (
<Fragment>
<div ref={siblingPrecedingRef} />
<Fragment ref={fragmentRef}>
<div ref={childRef} />
</Fragment>
<Fragment ref={emptyFragmentRef} />
<div ref={siblingFollowingRef} />
</Fragment>
);
}

await act(() => root.render(<Test />));

const fragmentInstance = fragmentRef.current;
if (fragmentInstance == null) {
throw new Error('Expected fragment instance to be non-null');
}
const emptyFragmentInstance = emptyFragmentRef.current;
if (emptyFragmentInstance == null) {
throw new Error('Expected empty fragment instance to be non-null');
}

expectPosition(
fragmentInstance.compareDocumentPosition(childRef.current),
{
preceding: false,
following: false,
contains: false,
containedBy: true,
disconnected: false,
implementationSpecific: false,
},
);

expectPosition(
fragmentInstance.compareDocumentPosition(siblingPrecedingRef.current),
{
preceding: true,
following: false,
contains: false,
containedBy: false,
disconnected: false,
implementationSpecific: false,
},
);

expectPosition(
fragmentInstance.compareDocumentPosition(siblingFollowingRef.current),
{
preceding: false,
following: true,
contains: false,
containedBy: false,
disconnected: false,
implementationSpecific: false,
},
);

expectPosition(
emptyFragmentInstance.compareDocumentPosition(childRef.current),
{
preceding: true,
following: false,
contains: false,
containedBy: false,
disconnected: false,
implementationSpecific: true,
},
);

expectPosition(
emptyFragmentInstance.compareDocumentPosition(
siblingPrecedingRef.current,
),
{
preceding: true,
following: false,
contains: false,
containedBy: false,
disconnected: false,
implementationSpecific: true,
},
);

expectPosition(
emptyFragmentInstance.compareDocumentPosition(
siblingFollowingRef.current,
),
{
preceding: false,
following: true,
contains: false,
containedBy: false,
disconnected: false,
implementationSpecific: true,
},
);
});

describe('with portals', () => {
// @gate enableFragmentRefs
it('handles portaled elements', async () => {
Expand Down
17 changes: 11 additions & 6 deletions packages/react-native-renderer/src/ReactFiberConfigFabric.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import type {Fiber} from 'react-reconciler/src/ReactInternalTypes';
import {HostText} from 'react-reconciler/src/ReactWorkTags';
import {
getFragmentParentHostFiber,
getInstanceFromHostFiber,
traverseFragmentInstance,
} from 'react-reconciler/src/ReactFiberTreeReflection';

Expand Down Expand Up @@ -303,6 +302,13 @@ export function getPublicInstance(instance: Instance): null | PublicInstance {
return instance.canonical.publicInstance;
}

// Handle root containers
if (instance.containerInfo != null) {
if (instance.containerInfo.publicInstance != null) {
return instance.containerInfo.publicInstance;
}
}
Comment on lines +306 to +310
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively if theres a concern with allowing this on all getPublicInstance calls we can move this logic to the callsite in compareDocumentInstance


// For compatibility with the legacy renderer, in case it's used with Fabric
// in the same app.
// $FlowExpectedError[prop-missing]
Expand Down Expand Up @@ -347,9 +353,8 @@ export function getPublicInstanceFromInternalInstanceHandle(
}

function getPublicInstanceFromHostFiber(fiber: Fiber): PublicInstance {
const instance = getInstanceFromHostFiber<Instance>(fiber);
const publicInstance = getPublicInstance(instance);
if (publicInstance == null) {
const publicInstance = getPublicInstance(fiber.stateNode);
if (publicInstance === null) {
throw new Error('Expected to find a host node. This is a bug in React.');
}
return publicInstance;
Expand Down Expand Up @@ -691,11 +696,11 @@ FragmentInstance.prototype.compareDocumentPosition = function (
if (parentHostFiber === null) {
return Node.DOCUMENT_POSITION_DISCONNECTED;
}
const parentHostInstance = getPublicInstanceFromHostFiber(parentHostFiber);
const children: Array<Fiber> = [];
traverseFragmentInstance(this._fragmentFiber, collectChildren, children);
if (children.length === 0) {
return compareDocumentPositionForEmptyFragment(
const parentHostInstance = getPublicInstanceFromHostFiber(parentHostFiber);
return compareDocumentPositionForEmptyFragment<PublicInstance>(
this._fragmentFiber,
parentHostInstance,
otherNode,
Expand Down
Loading