Proper children reconcile for nested tags #871
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theKashey
commented
Feb 22, 2018
| @@ -129,17 +129,19 @@ const mapChildren = (children, instances) => ({ | |||
| } | |||
| } | |||
|
|
|||
| const newChildren = asArray((child.props && child.props.children) || []) | |||
| const newChildren = asArray( | |||
| (child.props && child.props.children) || child.children || [], | |||
There was a problem hiding this comment.
When result of this function on next render iteration got in here again - it will be just ignored.
That was the first problem.
theKashey
commented
Feb 22, 2018
| // the children from an instance or rendered children | ||
| // while children from a props is just a props. | ||
| // they could not exists. they could differ. | ||
| ...(nextChildren ? { children: nextChildren } : {}), | ||
| ...(nextChildren || {}), |
There was a problem hiding this comment.
This was a second. A little "gap" in the tree
theKashey
commented
Feb 22, 2018
| @@ -213,12 +213,50 @@ describe('reconciler', () => { | |||
|
|
|||
| incrementGeneration() | |||
| wrapper.setProps({ update: 'now' }) | |||
| expect(First.rendered).toHaveBeenCalledTimes(4) | |||
| expect(First.rendered).toHaveBeenCalledTimes(3) | |||
There was a problem hiding this comment.
This means - fixed!
Codecov Report
@@ Coverage Diff @@
## next #871 +/- ##
==========================================
+ Coverage 87.22% 87.38% +0.15%
==========================================
Files 30 30
Lines 634 634
Branches 149 148 -1
==========================================
+ Hits 553 554 +1
+ Misses 65 64 -1
Partials 16 16
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proper children reconcile for nested tags, fixes #869
The way a change the tests indicates that problem was fixed.