fix(core): properly get root nodes from embedded views with <ng-content> #36051
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
pkozlowski-opensource
added
area: core
pkozlowski-opensource
force-pushed
the
gh_35967
branch
from
c07a62f
to
3fc24ff
Compare
pkozlowski-opensource
force-pushed
the
gh_35967
branch
2 times, most recently
from
bb22920
to
5aac6fc
Compare
pkozlowski-opensource
changed the title
pkozlowski-opensource
force-pushed
the
gh_35967
branch
from
5aac6fc
to
27f9534
Compare
Shijir
reviewed
Apr 13, 2020
There was a problem hiding this comment.
Thank you, @pkozlowski-opensource! This is awesome. Looking forward to its merge.
pkozlowski-opensource
force-pushed
the
gh_35967
branch
2 times, most recently
from
c296f72
to
b9d5a68
Compare
mhevery
suggested changes
Apr 16, 2020
| const projectionSlots = componentHost.projection; | ||
| const slotIdx = tNode.projection as number; | ||
|
|
||
| if (projectionSlots !== null && projectionSlots.length > slotIdx) { |
There was a problem hiding this comment.
Could you add a comment explaining this condition.
There was a problem hiding this comment.
Simplified the code - turns out that most of checks were not necessary (added an assert). This code is gone so things should be easier to reason about.
| if (Array.isArray(nodesInSlot)) { | ||
| result.push(...nodesInSlot); | ||
| } else { | ||
| const parentView = getLViewParent(componentView); |
There was a problem hiding this comment.
comments what is going on here would be helpfull.
There was a problem hiding this comment.
Simplified the code and added an assert that should serve as documentation.
mhevery
added
action: cleanup
pkozlowski-opensource
force-pushed
the
gh_35967
branch
2 times, most recently
from
1a420b0
to
444ec96
Compare
This commit fixes 2 separate issues related to root nodes retrieval from embedded views with `<ng-content>`: 1) we did not account for the case where there were no projectable nodes for a given `<ng-content>`; 2) we did not account for the case where projectable nodes for a given `<ng-content>` were represented as an array of native nodes (happens in the case of dynamically created components with projectable nodes); Fixes angular#35967
pkozlowski-opensource
force-pushed
the
gh_35967
branch
from
444ec96
to
85080f0
Compare
pkozlowski-opensource
added
action: review
kara
removed
the
action: review
kara
added
action: merge
|
merge-assistance: can't remove the pending review |
alxhub
pushed a commit
that referenced
this pull request
May 5, 2020
…nt> (#36051) This commit fixes 2 separate issues related to root nodes retrieval from embedded views with `<ng-content>`: 1) we did not account for the case where there were no projectable nodes for a given `<ng-content>`; 2) we did not account for the case where projectable nodes for a given `<ng-content>` were represented as an array of native nodes (happens in the case of dynamically created components with projectable nodes); Fixes #35967 PR Close #36051
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
profanis
pushed a commit
to profanis/angular
that referenced
this pull request
Sep 5, 2020
…nt> (angular#36051) This commit fixes 2 separate issues related to root nodes retrieval from embedded views with `<ng-content>`: 1) we did not account for the case where there were no projectable nodes for a given `<ng-content>`; 2) we did not account for the case where projectable nodes for a given `<ng-content>` were represented as an array of native nodes (happens in the case of dynamically created components with projectable nodes); Fixes angular#35967 PR Close angular#36051
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This commit fixes 2 separate issues related to root nodes retrieval from
embedded views with
<ng-content>:we did not account for the case where there were no projectable nodes
for a given
<ng-content>;we did not account for the case where projectable nodes for a given
<ng-content>were represented as an array of native nodes (happens inthe case of dynamically created components with projectable nodes);
Fixes #35967