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(drawer): respect NoopAnimationsModule and @.disabled binding #12839

Merged

Conversation

devversion
Copy link
Member

@devversion devversion commented Aug 26, 2018

  • Custom CSS transitions should not run for the MatDrawer, if the NoopAnimationsModule or the [@.disabled] binding is being used.

Related to #12829

@devversion devversion added the target: major This PR is targeted for the next major release label Aug 26, 2018
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Aug 26, 2018
@devversion devversion changed the title fix: missing components not respecting disabled animations fix: remaining components not respecting disabled animations Aug 26, 2018
@devversion devversion force-pushed the fix/missing-comps-disabled-animations branch from e052fd5 to 651188b Compare August 26, 2018 14:04
@@ -137,6 +137,10 @@ $mat-badge-large-size: $mat-badge-default-size + 6;
white-space: nowrap;
text-overflow: ellipsis;
pointer-events: none;

._mat-animation-noopable &, .ng-animate-disabled & {
Copy link
Member

Choose a reason for hiding this comment

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

I've had this one open for a while now that handles the badge: #11408.

Copy link
Member Author

@devversion devversion Aug 26, 2018

Choose a reason for hiding this comment

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

I see, though it does not handle the @.disabled binding and is not aligned with the way we go with #12829.

Same applies for comments below.

I can remove the cases where you already have a PR, but you should update your PRs to respect [@.disabled] then.

@@ -16,6 +16,10 @@ $mat-card-header-size: 40px !default;
padding: $mat-card-default-padding;
border-radius: $mat-card-border-radius;

&._mat-animation-noopable, &.ng-animate-disabled, .ng-animate-disabled & {
Copy link
Member

Choose a reason for hiding this comment

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

Handled by #11538.

@@ -40,6 +40,10 @@ $mat-chip-remove-size: 18px;
height: $mat-chip-remove-size;
}

&._mat-animation-noopable, &.ng-animate-disabled, .ng-animate-disabled & {
transition: none;
Copy link
Member

Choose a reason for hiding this comment

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

Handled by #11546.

@@ -13,6 +13,10 @@
transition: margin 225ms $mat-fast-out-slow-in-timing-function;
border-radius: $border-radius;

&._mat-animation-noopable, &.ng-animate-disabled, .ng-animate-disabled & {
transition: none;
Copy link
Member

Choose a reason for hiding this comment

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

Handled by #11576.

* Custom CSS transitions should not run if the `NoopAnimationsModule` or the `[@.disabled]` binding is being used.
@devversion devversion force-pushed the fix/missing-comps-disabled-animations branch from 34d7d54 to 71fdd69 Compare August 26, 2018 14:34
@devversion devversion changed the title fix: remaining components not respecting disabled animations fix(drawer): respect NoopAnimationsModule and @.disabled binding Aug 26, 2018
@devversion
Copy link
Member Author

devversion commented Aug 26, 2018

@crisbeto I've removed the changes that will be replaced by your related PRs. This is now only updating the MatDrawer custom CSS transition.

You should update your PRs to respect the @.disabled binding and also avoid using the noop-animation mixin (in favor of #12829)

Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Aug 26, 2018
@jelbourn jelbourn merged commit 23df492 into angular:master Sep 14, 2018
@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 9, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: major This PR is targeted for the next major release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants