Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert unkeyed no-search #4604

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Revert unkeyed no-search #4604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cccb676
Revert unkeyed no-search
JoviDeCroock Dec 11, 2024
5d8d22b
Merge branch 'main' into revert-hole-unmount
JoviDeCroock Dec 11, 2024
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
10 changes: 5 additions & 5 deletions src/diff/children.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,6 @@ function findMatchingIndex(
) {
const key = childVNode.key;
const type = childVNode.type;
let x = skewedIndex - 1;
let y = skewedIndex + 1;
let oldVNode = oldChildren[skewedIndex];

// We only need to perform a search if there are more children
Expand All @@ -401,11 +399,11 @@ function findMatchingIndex(
// 1 (aka `remainingOldChildren > 0`) children to find and compare against.
//
// If there is an unkeyed functional VNode, that isn't a built-in like our Fragment,
// we should not search as we risk re-using state of an unrelated VNode.
// we should not search as we risk re-using state of an unrelated VNode. (reverted for now)
let shouldSearch =
(typeof type != 'function' || type === Fragment || key) &&
// (typeof type != 'function' || type === Fragment || key) &&
remainingOldChildren >
(oldVNode != null && (oldVNode._flags & MATCHED) == 0 ? 1 : 0);
(oldVNode != null && (oldVNode._flags & MATCHED) == 0 ? 1 : 0);

if (
oldVNode === null ||
Expand All @@ -416,6 +414,8 @@ function findMatchingIndex(
) {
return skewedIndex;
} else if (shouldSearch) {
let x = skewedIndex - 1;
let y = skewedIndex + 1;
while (x >= 0 || y < oldChildren.length) {
if (x >= 0) {
oldVNode = oldChildren[x];
Expand Down
40 changes: 39 additions & 1 deletion test/browser/render.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ describe('render()', () => {
});

// #2949
it('should not swap unkeyed chlildren', () => {
it.skip('should not swap unkeyed chlildren', () => {
class X extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -1830,6 +1830,44 @@ describe('render()', () => {
expect(scratch.textContent).to.equal('A');
});

// #2949
it.skip('should not swap unkeyed chlildren', () => {
Copy link
Member Author

Choose a reason for hiding this comment

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

Added a test highlighting the issue

const calls = [];
class X extends Component {
constructor(props) {
super(props);
calls.push(props.name);
this.name = props.name;
}
render() {
return <p>{this.name}</p>;
}
}

function Foo({ condition }) {
return (
<div>
<X name="1" />
{condition ? '' : <X name="A" />}
{condition ? <X name="B" /> : ''}
<X name="C" />
</div>
);
}

render(<Foo />, scratch);
expect(scratch.textContent).to.equal('1AC');
expect(calls).to.deep.equal(['1', 'A', 'C']);

render(<Foo condition />, scratch);
expect(scratch.textContent).to.equal('1BC');
expect(calls).to.deep.equal(['1', 'A', 'C', 'B']);

render(<Foo />, scratch);
expect(scratch.textContent).to.equal('1AC');
expect(calls).to.deep.equal(['1', 'A', 'C', 'B', 'A']);
});

it('should retain state for inserted children', () => {
class X extends Component {
constructor(props) {
Expand Down
Loading