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.

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

fix(ngStyle): should work with preexisting styles #939

Merged
merged 2 commits into from
Dec 18, 2018

Conversation

CaerusKaru
Copy link
Member

@CaerusKaru CaerusKaru commented Dec 18, 2018

Fixes #936

@CaerusKaru CaerusKaru added this to the 7.0.0-beta.22 milestone Dec 18, 2018
const defaultStyles = this.marshal.getValue(this.nativeElement, this.DIRECTIVE_KEY, '');
const fallback = this.buildStyleMap(defaultStyles);
this.ngStyleInstance.ngStyle = {...fallback, ...styles};
this.ngStyleInstance.ngStyle = {...this.fallbackStyles, ...styles};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ThomasBurleson ThomasBurleson merged commit 4be5cef into master Dec 18, 2018
@CaerusKaru CaerusKaru deleted the adam/fix-issue-936 branch December 20, 2018 03:24
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

style attribute is not applied anymore when using ngStyle (version 7.x)
3 participants