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

chore: add reconcile bug test #4287

Merged
merged 14 commits into from
Feb 22, 2024
Merged

chore: add reconcile bug test #4287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3e85030
chore: add reconcile bug test
marvinhagemeister Feb 21, 2024
72235da
chore: remove test focus
marvinhagemeister Feb 21, 2024
fc95ec8
add fix
JoviDeCroock Feb 21, 2024
6b1ae4a
chore: fix typo in test name
marvinhagemeister Feb 21, 2024
a8c1ee6
chore: add another test case
marvinhagemeister Feb 21, 2024
474d00e
chore: add another testcase
marvinhagemeister Feb 21, 2024
8cc2d87
push fix
JoviDeCroock Feb 21, 2024
cf7a22f
chore: update test assertion
marvinhagemeister Feb 21, 2024
a600efa
fix: invalid vnode id for text nodes
marvinhagemeister Feb 21, 2024
b7b8d16
chore: add another test case
marvinhagemeister Feb 21, 2024
84ac10e
Merge branch 'main' into reconcile-test
marvinhagemeister Feb 22, 2024
aca34a0
fix it
JoviDeCroock Feb 22, 2024
92380e4
Merge branch 'main' into reconcile-test
JoviDeCroock Feb 22, 2024
0435d0c
see if adding this branch back affects perf
JoviDeCroock Feb 22, 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
8 changes: 4 additions & 4 deletions src/diff/children.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,11 @@ function constructNewChildrenArray(newParentVNode, renderResult, oldChildren) {
if (remainingOldChildren > newChildrenLength - skewedIndex) {
skew += matchingIndex - skewedIndex;
} else {
// ### Change from keyed: I think this was missing from the algo...
skew--;
}
} else if (matchingIndex < skewedIndex) {
if (matchingIndex == skewedIndex - 1) {
skew = matchingIndex - skewedIndex;
} else {
skew = 0;
}
} else {
skew = 0;
Expand Down Expand Up @@ -429,7 +426,10 @@ function findMatchingIndex(

if (
oldVNode === null ||
(oldVNode && key == oldVNode.key && type === oldVNode.type)
(oldVNode &&
key == oldVNode.key &&
type === oldVNode.type &&
(oldVNode._flags & MATCHED) === 0)
) {
return skewedIndex;
} else if (shouldSearch) {
Expand Down
127 changes: 127 additions & 0 deletions test/browser/render.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,6 +1357,133 @@ describe('render()', () => {
expect(scratch.innerHTML).to.equal('<div><div></div><div>B</div></div>');
});

it('should reconcile children in right order', () => {
let data = ['A', 'B', 'C', 'D', 'E'];
render(
<ul>
{data.map(d => (
<li key={d}>{d}</li>
))}
</ul>,
scratch
);

expect(scratch.textContent).to.equal('ABCDE');

data = ['B', 'E', 'C', 'D'];
render(
<ul>
{data.map(d => (
<li key={d}>{d}</li>
))}
</ul>,
scratch
);
expect(scratch.textContent).to.equal('BECD');
});

it('should reconcile children in right order #2', () => {
let data = ['A', 'B', 'C', 'D', 'E'];
render(
<ul>
{data.map(d => (
<li key={d}>{d}</li>
))}
</ul>,
scratch
);

expect(scratch.textContent).to.equal('ABCDE');

data = ['B', 'E', 'D', 'C'];
render(
<ul>
{data.map(d => (
<li key={d}>{d}</li>
))}
</ul>,
scratch
);
expect(scratch.textContent).to.equal('BEDC');
});

it('should reconcile children in right order #3', () => {
render(
<div>
<p>_A1</p>
<p>_A2</p>
<h2>_A3</h2>
<p>_A4</p>
<h2>_A5</h2>
<p>_A6</p>
<h2>_A7</h2>
<p>_A8</p>
</div>,
scratch
);

render(
<div>
<p>_B1</p>
<p>_B2</p>
<p>_B3</p>
<h2>_B4</h2>
<p>_B5</p>
<p>_B6</p>
<h2>_B7</h2>
<p>_B8</p>
</div>,
scratch
);

expect(serializeHtml(scratch)).to.equal(
'<div><p>_B1</p><p>_B2</p><p>_B3</p><h2>_B4</h2><p>_B5</p><p>_B6</p><h2>_B7</h2><p>_B8</p></div>'
);
});

it('should reconcile children in right order #4', () => {
render(
<div>
<p>_A1</p>
<p>_A2</p>
<div>_A3</div>
<h2>_A4</h2>
<p>_A5</p>
<div>_A6</div>
<h2>_A7</h2>
<p>_A8</p>
<div>_A9</div>
<h2>_A10</h2>
<p>_A11</p>
<div>_A12</div>
</div>,
scratch
);

render(
<div>
<p>_B1</p>
<p>_B2</p>
<p>_B3</p>
<h2>_B4</h2>
<p>_B5</p>
<p>_B6</p>
<p>_B7</p>
<h2>_B8</h2>
<p>_B9</p>
<p>_B10</p>
<p>_B11</p>
<p>_B12</p>
<h2>_B13</h2>
</div>,
scratch
);

expect(serializeHtml(scratch)).to.equal(
'<div><p>_B1</p><p>_B2</p><p>_B3</p><h2>_B4</h2><p>_B5</p><p>_B6</p><p>_B7</p><h2>_B8</h2><p>_B9</p><p>_B10</p><p>_B11</p><p>_B12</p><h2>_B13</h2></div>'
);
});

it('should not crash or repeatedly add the same child when replacing a matched vnode with null (mixed dom-types)', () => {
const B = () => <div>B</div>;

Expand Down
Loading