Skip to content

fix(material-experimental/mdc-button): fix ripple noop animation - #21360

Merged
mmalerba merged 1 commit into
angular:masterfrom
andrewseguin:mdc-button-anim
Dec 17, 2020
Merged

fix(material-experimental/mdc-button): fix ripple noop animation#21360
mmalerba merged 1 commit into
angular:masterfrom
andrewseguin:mdc-button-anim

Conversation

@andrewseguin

@andrewseguin andrewseguin commented Dec 15, 2020

Copy link
Copy Markdown
Contributor

Set the ripple animation to 0ms enter/exit if NoopAnimationsModule detected. Since the ripple animation must be passed it, and it overrides the module, we need to manually set this

For discussion: This may be the wrong fix. The ripple's animation input declares this:

  /**
   * Configuration for the ripple animation. Allows modifying the enter and exit animation
   * duration of the ripples. The animation durations will be overwritten if the
   * `NoopAnimationsModule` is being used.
   */
  @Input('matRippleAnimation') animation: RippleAnimationConfig;

However, the logic does not adhere to this, and instead defers preference to the this.animation input:

animation: {
        ...this._globalOptions.animation,
        ...(this._animationMode === 'NoopAnimations' ? {enterDuration: 0, exitDuration: 0} : {}),
        ...this.animation
      },

@andrewseguin andrewseguin added the target: patch This PR is targeted for the next patch release label Dec 15, 2020
@google-cla google-cla Bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 15, 2020

@crisbeto crisbeto left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Dec 15, 2020
@mmalerba
mmalerba merged commit c5a111d into angular:master Dec 17, 2020
mmalerba pushed a commit that referenced this pull request Dec 17, 2020
wagnermaciel pushed a commit to wagnermaciel/components that referenced this pull request Jan 14, 2021
@angular-automatic-lock-bot

Copy link
Copy Markdown

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 Jan 17, 2021
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: patch This PR is targeted for the next patch release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants