Skip to content

fix(material-experimental/mdc-chips): not disabling all animations when animations are disabled #18440

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 20, 2020
Merged

fix(material-experimental/mdc-chips): not disabling all animations when animations are disabled #18440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-chips/chip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 12 additions & 0 deletions src/material-experimental/mdc-chips/chips.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@

// Disables the chip enter animation.
animation: none;

.mdc-chip__checkmark-svg {
transition: none;
}
}

@include cdk-high-contrast(active, off) {
Expand Down Expand Up @@ -57,6 +61,10 @@
pointer-events: none;
opacity: 0;
border-radius: inherit;

._mat-animation-noopable & {
transition: none;
}
}
}

Expand Down Expand Up @@ -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
Expand Down