@@ -114,21 +114,25 @@ export class MatChipTrailingIcon {}
114
114
} )
115
115
export class MatChip extends _MatChipMixinBase implements FocusableOption , OnDestroy , CanColor ,
116
116
CanDisable , CanDisableRipple , RippleTarget {
117
+
118
+ /** Reference to the RippleRenderer for the chip. */
119
+ private _chipRipple : RippleRenderer ;
120
+
121
+ /** Whether the ripples are globally disabled through the RippleGlobalOptions */
122
+ private _ripplesGloballyDisabled = false ;
123
+
117
124
/**
118
125
* Ripple configuration for ripples that are launched on pointer down.
119
126
* @docs -private
120
127
*/
121
128
rippleConfig : RippleConfig = { } ;
122
129
123
- /** Reference to the RippleRenderer for the chip. */
124
- private _chipRipple : RippleRenderer ;
125
-
126
130
/**
127
131
* Whether ripples are disabled on interaction
128
132
* @docs -private
129
133
*/
130
134
get rippleDisabled ( ) : boolean {
131
- return this . disabled || this . disableRipple ;
135
+ return this . disabled || this . disableRipple || this . _ripplesGloballyDisabled ;
132
136
}
133
137
134
138
/** Whether the chip has focus. */
@@ -225,6 +229,8 @@ export class MatChip extends _MatChipMixinBase implements FocusableOption, OnDes
225
229
this . _chipRipple . setupTriggerEvents ( _elementRef . nativeElement ) ;
226
230
227
231
if ( globalOptions ) {
232
+ this . _ripplesGloballyDisabled = ! ! globalOptions . disabled ;
233
+ // TODO(paul): Once the speedFactor is removed, we no longer need to copy each single option.
228
234
this . rippleConfig = {
229
235
speedFactor : globalOptions . baseSpeedFactor ,
230
236
animation : globalOptions . animation ,
0 commit comments