@@ -18,16 +18,30 @@ import {VERSION as CDK_VERSION} from '@angular/cdk';
18
18
const VERSION = new Version ( '0.0.0-PLACEHOLDER' ) ;
19
19
20
20
/** @docs -private */
21
- export function MATERIAL_SANITY_CHECKS_FACTORY ( ) : boolean {
21
+ export function MATERIAL_SANITY_CHECKS_FACTORY ( ) : SanityChecks {
22
22
return true ;
23
23
}
24
24
25
25
/** Injection token that configures whether the Material sanity checks are enabled. */
26
- export const MATERIAL_SANITY_CHECKS = new InjectionToken < boolean > ( 'mat-sanity-checks' , {
26
+ export const MATERIAL_SANITY_CHECKS = new InjectionToken < SanityChecks > ( 'mat-sanity-checks' , {
27
27
providedIn : 'root' ,
28
28
factory : MATERIAL_SANITY_CHECKS_FACTORY ,
29
29
} ) ;
30
30
31
+ /**
32
+ * Possible sanity checks that can be enabled. If set to
33
+ * true/false, all checks will be enabled/disabled.
34
+ */
35
+ export type SanityChecks = boolean | GranularSanityChecks ;
36
+
37
+ /** Object that allows for the sanity checks to be configured granularly. */
38
+ export interface GranularSanityChecks {
39
+ doctype : boolean ;
40
+ theme : boolean ;
41
+ version : boolean ;
42
+ hammer : boolean ;
43
+ }
44
+
31
45
/**
32
46
* Module that captures anything that should be loaded and/or run for *all* Angular Material
33
47
* components. This includes Bidi, etc.
@@ -52,10 +66,10 @@ export class MatCommonModule {
52
66
private _window = typeof window === 'object' && window ? window : null ;
53
67
54
68
constructor (
55
- @Optional ( ) @Inject ( MATERIAL_SANITY_CHECKS ) private _sanityChecksEnabled : boolean ,
69
+ @Optional ( ) @Inject ( MATERIAL_SANITY_CHECKS ) private _sanityChecks : SanityChecks ,
56
70
@Optional ( ) @Inject ( HAMMER_LOADER ) private _hammerLoader ?: HammerLoader ) {
57
71
58
- if ( this . _areChecksEnabled ( ) && ! this . _hasDoneGlobalChecks ) {
72
+ if ( ! this . _hasDoneGlobalChecks ) {
59
73
this . _checkDoctypeIsDefined ( ) ;
60
74
this . _checkThemeIsPresent ( ) ;
61
75
this . _checkCdkVersionMatch ( ) ;
@@ -64,8 +78,13 @@ export class MatCommonModule {
64
78
}
65
79
66
80
/** Whether any sanity checks are enabled */
67
- private _areChecksEnabled ( ) : boolean {
68
- return this . _sanityChecksEnabled && isDevMode ( ) && ! this . _isTestEnv ( ) ;
81
+ private _isCheckEnabled ( check : keyof GranularSanityChecks ) : boolean {
82
+ if ( ! isDevMode ( ) || this . _isTestEnv ( ) ) {
83
+ // All checks are disabled in production mode and in test environments.
84
+ return false ;
85
+ }
86
+
87
+ return typeof this . _sanityChecks === 'boolean' ? this . _sanityChecks : this . _sanityChecks [ check ] ;
69
88
}
70
89
71
90
/** Whether the code is running in tests. */
@@ -75,7 +94,7 @@ export class MatCommonModule {
75
94
}
76
95
77
96
private _checkDoctypeIsDefined ( ) : void {
78
- if ( this . _document && ! this . _document . doctype ) {
97
+ if ( this . _isCheckEnabled ( 'doctype' ) && this . _document && ! this . _document . doctype ) {
79
98
console . warn (
80
99
'Current document does not have a doctype. This may cause ' +
81
100
'some Angular Material components not to behave as expected.'
@@ -86,7 +105,8 @@ export class MatCommonModule {
86
105
private _checkThemeIsPresent ( ) : void {
87
106
// We need to assert that the `body` is defined, because these checks run very early
88
107
// and the `body` won't be defined if the consumer put their scripts in the `head`.
89
- if ( ! this . _document || ! this . _document . body || typeof getComputedStyle !== 'function' ) {
108
+ if ( ! this . _isCheckEnabled ( 'theme' ) || ! this . _document || ! this . _document . body ||
109
+ typeof getComputedStyle !== 'function' ) {
90
110
return ;
91
111
}
92
112
@@ -113,7 +133,7 @@ export class MatCommonModule {
113
133
114
134
/** Checks whether the material version matches the cdk version */
115
135
private _checkCdkVersionMatch ( ) : void {
116
- if ( VERSION . full !== CDK_VERSION . full ) {
136
+ if ( this . _isCheckEnabled ( 'version' ) && VERSION . full !== CDK_VERSION . full ) {
117
137
console . warn (
118
138
'The Angular Material version (' + VERSION . full + ') does not match ' +
119
139
'the Angular CDK version (' + CDK_VERSION . full + ').\n' +
@@ -128,7 +148,7 @@ export class MatCommonModule {
128
148
return ;
129
149
}
130
150
131
- if ( this . _areChecksEnabled ( ) && ! ( this . _window as any ) [ 'Hammer' ] && ! this . _hammerLoader ) {
151
+ if ( this . _isCheckEnabled ( 'hammer' ) && ! ( this . _window as any ) [ 'Hammer' ] && ! this . _hammerLoader ) {
132
152
console . warn (
133
153
'Could not find HammerJS. Certain Angular Material components may not work correctly.' ) ;
134
154
}
0 commit comments