From 7b575036842aefd0c96768b3c9674bcf7bb5e793 Mon Sep 17 00:00:00 2001 From: crisbeto Date: Sat, 8 Feb 2020 15:02:43 +0100 Subject: [PATCH] fix(material-experimental/mdc-chips): not disabling all animations when animations are disabled Currently the MDC chip only disables the removal animation when all animations are disabled. These changes make it so that the rest of the animations are disabled as well. --- src/material-experimental/mdc-chips/chip.ts | 2 +- src/material-experimental/mdc-chips/chips.scss | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/material-experimental/mdc-chips/chip.ts b/src/material-experimental/mdc-chips/chip.ts index 4c5c73aa4f25..b2168726c8e2 100644 --- a/src/material-experimental/mdc-chips/chip.ts +++ b/src/material-experimental/mdc-chips/chip.ts @@ -405,7 +405,7 @@ export class MatChip extends _MatChipMixinBase implements AfterContentInit, Afte /** Whether or not the ripple should be disabled. */ _isRippleDisabled(): boolean { - return this.disabled || this.disableRipple || this._isBasicChip; + return this.disabled || this.disableRipple || this._animationsDisabled || this._isBasicChip; } static ngAcceptInputType_disabled: BooleanInput; diff --git a/src/material-experimental/mdc-chips/chips.scss b/src/material-experimental/mdc-chips/chips.scss index b753c3bbf80f..04bf7498a676 100644 --- a/src/material-experimental/mdc-chips/chips.scss +++ b/src/material-experimental/mdc-chips/chips.scss @@ -19,6 +19,10 @@ // Disables the chip enter animation. animation: none; + + .mdc-chip__checkmark-svg { + transition: none; + } } @include cdk-high-contrast(active, off) { @@ -57,6 +61,10 @@ pointer-events: none; opacity: 0; border-radius: inherit; + + ._mat-animation-noopable & { + transition: none; + } } } @@ -93,6 +101,10 @@ input.mat-mdc-chip-input { } .mdc-chip__checkmark-path { + ._mat-animation-noopable & { + transition: none; + } + @include cdk-high-contrast(black-on-white, off) { // SVG colors won't be changed in high contrast mode and since the checkmark is white // by default, it'll blend in with the background in black-on-white mode. Override the color