From 8b14effa1cf91994089647284656e2304d369e70 Mon Sep 17 00:00:00 2001
From: crisbeto <crisbeto@abv.bg>
Date: Mon, 27 Aug 2018 19:45:10 +0200
Subject: [PATCH] fix(expansion): disable all animations when using
 NoopAnimationsModule

Disables all of the expansion panel animations if it's inside a module with the NoopAnimationsModule. Also removes the mat-elevation-transition from the expansion panel, because it hasn't been doing anything for a while since it gets overwritten by the margin transition below.

Relates to #10590.
---
 src/lib/expansion/expansion-panel.scss | 6 ++++++
 src/lib/expansion/expansion-panel.ts   | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib/expansion/expansion-panel.scss b/src/lib/expansion/expansion-panel.scss
index 086c202372a4..7630174f18f0 100644
--- a/src/lib/expansion/expansion-panel.scss
+++ b/src/lib/expansion/expansion-panel.scss
@@ -32,6 +32,12 @@
   @include cdk-high-contrast {
     outline: solid 1px;
   }
+
+  &.ng-animate-disabled,
+  .ng-animate-disabled &,
+  &._mat-animation-noopable {
+    transition: none;
+  }
 }
 
 .mat-expansion-panel-content {
diff --git a/src/lib/expansion/expansion-panel.ts b/src/lib/expansion/expansion-panel.ts
index f435e73c08e1..cc4800ddcb92 100644
--- a/src/lib/expansion/expansion-panel.ts
+++ b/src/lib/expansion/expansion-panel.ts
@@ -33,6 +33,7 @@ import {
   ViewChild,
 } from '@angular/core';
 import {DOCUMENT} from '@angular/common';
+import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
 import {filter, startWith, take} from 'rxjs/operators';
 import {matExpansionAnimations} from './expansion-animations';
@@ -73,6 +74,7 @@ let uniqueId = 0;
   host: {
     'class': 'mat-expansion-panel',
     '[class.mat-expanded]': 'expanded',
+    '[class._mat-animation-noopable]': '_animationMode === "NoopAnimations"',
     '[class.mat-expansion-panel-spacing]': '_hasSpacing()',
   }
 })
@@ -121,7 +123,9 @@ export class MatExpansionPanel extends CdkAccordionItem implements AfterContentI
               _changeDetectorRef: ChangeDetectorRef,
               _uniqueSelectionDispatcher: UniqueSelectionDispatcher,
               private _viewContainerRef: ViewContainerRef,
-              @Inject(DOCUMENT) _document?: any) {
+              // @breaking-change 8.0.0 _document and _animationMode to be made required
+              @Inject(DOCUMENT) _document?: any,
+              @Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string) {
     super(accordion, _changeDetectorRef, _uniqueSelectionDispatcher);
     this.accordion = accordion;
     this._document = _document;