Skip to content

Fiber: Fix reconciling after null #8202

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

Merged
sophiebits merged 1 commit into from
Nov 4, 2016
Merged

Fiber: Fix reconciling after null #8202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions scripts/fiber/tests-failing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,6 @@ src/renderers/shared/stack/reconciler/__tests__/ReactEmptyComponent-test.js
src/renderers/shared/stack/reconciler/__tests__/ReactMultiChild-test.js
* should warn for duplicated keys with component stack info

src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildReconcile-test.js
* should insert non-empty children in middle where nulls were

src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildText-test.js
* should correctly handle all possible children for render and update
* should throw if rendering both HTML and children
Expand Down
1 change: 1 addition & 0 deletions scripts/fiber/tests-passing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,7 @@ src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildReconcile-test.js
* should not insert empty children in the middle
* should insert one new child in the middle
* should insert multiple new truthy children in the middle
* should insert non-empty children in middle where nulls were

src/renderers/shared/stack/reconciler/__tests__/ReactMultiChildText-test.js
* should render between nested components and inline children
Expand Down
3 changes: 3 additions & 0 deletions src/renderers/shared/fiber/ReactChildFiber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,9 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
// unfortunate because it triggers the slow path all the time. We need
// a better way to communicate whether this was a miss or null,
// boolean, undefined, etc.
if (!oldFiber) {
oldFiber = nextOldFiber;
}
break;
}
if (shouldTrackSideEffects) {
Expand Down