fix(icon): clearing all content when inserting a new SVG #11956
Merged
Conversation
This file contains hidden or 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
googlebot
added
the
cla: yes
jelbourn
reviewed
Jun 27, 2018
src/lib/icon/icon.ts
Outdated
| @@ -198,11 +206,16 @@ export class MatIcon extends _MatIconMixinBase implements OnChanges, OnInit, Can | |||
| private _clearSvgElement() { | |||
| const layoutElement: HTMLElement = this._elementRef.nativeElement; | |||
| const childCount = layoutElement.childNodes.length; | |||
| const elementNodeType = this._document ? this._document.ELEMENT_NODE : 1; | |||
There was a problem hiding this comment.
If this is the only thing document is needed for, I'm fine with just hard-coding 1 with a comment
| for (let i = 0; i < childCount; i++) { | ||
| layoutElement.removeChild(layoutElement.childNodes[i]); | ||
| const child = layoutElement.childNodes[i]; | ||
|
|
There was a problem hiding this comment.
It would be good to add a comment that elaborates on why only specific elements are removed.
crisbeto
force-pushed
the
11151/icon-clearing-content
branch
from
c75a562 to
ba89487
Compare
Currently when we insert a new SVG icon, we clear the entire content of the `mat-icon` in order to get rid of the previous icon. This is problematic, because it ends up removing other elements like `mat-badge`. These changes switch to removing all non-element nodes and all SVGs. Fixes angular#11151.
crisbeto
force-pushed
the
11151/icon-clearing-content
branch
from
ba89487 to
92a76e7
Compare
|
Addressed the feedback. |
jelbourn
added
pr: lgtm
action: merge
josephperrott
pushed a commit
that referenced
this pull request
Jun 28, 2018
victoriaaa234
pushed a commit
that referenced
this pull request
Jul 25, 2018
|
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. |
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.
Currently when we insert a new SVG icon, we clear the entire content of the
mat-iconin order to get rid of the previous icon. This is problematic, because it ends up removing other elements likemat-badge. These changes switch to removing all non-element nodes and all SVGs.Fixes #11151.