File tree Expand file tree Collapse file tree 7 files changed +519
-507
lines changed
src/material-experimental Expand file tree Collapse file tree 7 files changed +519
-507
lines changed Original file line number Diff line number Diff line change 42
42
},
43
43
"version" : " 9.0.0-rc.0" ,
44
44
"requiredAngularVersion" : " ^9.0.0-0 || ^10.0.0-0" ,
45
- "requiredMDCVersion" : " ^4.0.0-canary.062ade5c0.0 " ,
45
+ "requiredMDCVersion" : " ^4.0.0" ,
46
46
"dependencies" : {
47
47
"@angular/animations" : " ^9.0.0-rc.0" ,
48
48
"@angular/common" : " ^9.0.0-rc.0" ,
55
55
"@types/youtube" : " ^0.0.38" ,
56
56
"@webcomponents/custom-elements" : " ^1.1.0" ,
57
57
"core-js" : " ^2.6.9" ,
58
- "material-components-web" : " ^4.0.0-canary.062ade5c0.0 " ,
58
+ "material-components-web" : " ^4.0.0" ,
59
59
"rxjs" : " ^6.5.3" ,
60
60
"systemjs" : " 0.19.43" ,
61
61
"tsickle" : " ^0.37.0" ,
Original file line number Diff line number Diff line change 2
2
# all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
3
3
# version for the placeholders.
4
4
ANGULAR_PACKAGE_VERSION = "^9.0.0-0 || ^10.0.0-0"
5
- MDC_PACKAGE_VERSION = "^4.0.0-canary.062ade5c0.0 "
5
+ MDC_PACKAGE_VERSION = "^4.0.0"
6
6
VERSION_PLACEHOLDER_REPLACEMENTS = {
7
7
"0.0.0-MDC" : MDC_PACKAGE_VERSION ,
8
8
"0.0.0-NG" : ANGULAR_PACKAGE_VERSION ,
Original file line number Diff line number Diff line change @@ -47,6 +47,7 @@ sass_binary(
47
47
"external/npm/node_modules" ,
48
48
],
49
49
deps = [
50
+ "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib" ,
50
51
"//src/material-experimental/mdc-helpers:mdc_scss_deps_lib" ,
51
52
"//src/material/core:core_scss_lib" ,
52
53
],
Original file line number Diff line number Diff line change 4
4
@import ' ../../material/core/style/menu-common' ;
5
5
@import ' ../../material/core/style/button-common' ;
6
6
@import ' ../../cdk/a11y/a11y' ;
7
+ @import ' ../mdc-helpers/mdc-helpers' ;
7
8
8
9
@include mdc-menu-surface-core-styles ($query : structure);
9
10
28
29
}
29
30
30
31
.mat-mdc-menu-item {
32
+ $height : mdc-density-prop-value (
33
+ $density-config : $mdc-list-single-line-density-config ,
34
+ $density-scale : $mdc-list-single-line-density-scale ,
35
+ $property-name : height ,
36
+ );
37
+
31
38
// Note that we include this private mixin, because the public
32
39
// one adds a bunch of styles that we aren't using for the menu.
33
40
@include mdc-list-item-base_ ;
34
41
35
42
// MDC's menu items are `<li>` nodes which don't need resets, however ours
36
43
// can be anything, including buttons, so we need to do the reset ourselves.
37
44
@include mat-button-reset ;
45
+ @include mdc-list-single-line-height ($height , $query : $mat-base-styles-query );
38
46
cursor : pointer ;
39
47
width : 100% ;
40
48
text-align : left ;
Original file line number Diff line number Diff line change @@ -73,16 +73,16 @@ describe('MatProgressBar', () => {
73
73
progressElement . nativeElement . querySelector ( '.mdc-linear-progress__buffer' ) . style ;
74
74
75
75
expect ( primaryStyles . transform ) . toBe ( 'scaleX(0)' ) ;
76
- expect ( bufferStyles . transform ) . toBeFalsy ( ) ;
76
+ expect ( bufferStyles . transform ) . toBe ( 'scaleX(1)' ) ;
77
77
78
78
progressComponent . value = 40 ;
79
79
expect ( primaryStyles . transform ) . toBe ( 'scaleX(0.4)' ) ;
80
- expect ( bufferStyles . transform ) . toBeFalsy ( ) ;
80
+ expect ( bufferStyles . transform ) . toBe ( 'scaleX(1)' ) ;
81
81
82
82
progressComponent . value = 35 ;
83
83
progressComponent . bufferValue = 55 ;
84
84
expect ( primaryStyles . transform ) . toBe ( 'scaleX(0.35)' ) ;
85
- expect ( bufferStyles . transform ) . toBeFalsy ( ) ;
85
+ expect ( bufferStyles . transform ) . toBe ( 'scaleX(1)' ) ;
86
86
87
87
progressComponent . mode = 'buffer' ;
88
88
expect ( primaryStyles . transform ) . toBe ( 'scaleX(0.35)' ) ;
Original file line number Diff line number Diff line change @@ -81,18 +81,13 @@ export class MatProgressBar extends _MatProgressBarMixinBase implements AfterVie
81
81
addClass : ( className : string ) => this . _rootElement . classList . add ( className ) ,
82
82
getBuffer : ( ) => this . _bufferBar ,
83
83
getPrimaryBar : ( ) => this . _primaryBar ,
84
- // TODO(crisbeto): remove the ` as MDCLinearProgressAdapter` below once this is released:
85
- // tslint:disable-next-line:max-line-length
86
- // https://github.com/material-components/material-components-web/commit/062ade5c052cf00cefeee6e8e0acf7d16c4ce338
87
- // We add `forceLayout` before the code requiring it is in the canary
88
- // release so that our cronjob that runs against master doesn't fail.
89
84
forceLayout : ( ) => this . _platform . isBrowser && this . _rootElement . offsetWidth ,
90
85
hasClass : ( className : string ) => this . _rootElement . classList . contains ( className ) ,
91
86
removeClass : ( className : string ) => this . _rootElement . classList . remove ( className ) ,
92
87
setStyle : ( el : HTMLElement , styleProperty : string , value : string ) => {
93
88
( el . style as any ) [ styleProperty ] = value ;
94
89
}
95
- } as MDCLinearProgressAdapter ;
90
+ } ;
96
91
97
92
/** Flag that indicates whether NoopAnimations mode is set to true. */
98
93
_isNoopAnimation = false ;
You can’t perform that action at this time.
0 commit comments