fix(material/progress-bar): account for new height token (angular#27008)

Fixes the MDC snapshot check which was failing due to a new token.
michaelfaith · Apr 30, 2023 · 5259b68 · 5259b68
1 parent 4888ffd
commit 5259b68
Show file tree

Hide file tree

Showing 4 changed files with 640 additions and 636 deletions.
diff --git a/package.json b/package.json
@@ -95,53 +95,53 @@
     "@bazel/terser": "5.8.1",
     "@bazel/worker": "5.8.1",
     "@firebase/app-types": "^0.7.0",
-    "@material/animation": "15.0.0-canary.684e33d25.0",
-    "@material/auto-init": "15.0.0-canary.684e33d25.0",
-    "@material/banner": "15.0.0-canary.684e33d25.0",
-    "@material/base": "15.0.0-canary.684e33d25.0",
-    "@material/button": "15.0.0-canary.684e33d25.0",
-    "@material/card": "15.0.0-canary.684e33d25.0",
-    "@material/checkbox": "15.0.0-canary.684e33d25.0",
-    "@material/chips": "15.0.0-canary.684e33d25.0",
-    "@material/circular-progress": "15.0.0-canary.684e33d25.0",
-    "@material/data-table": "15.0.0-canary.684e33d25.0",
-    "@material/density": "15.0.0-canary.684e33d25.0",
-    "@material/dialog": "15.0.0-canary.684e33d25.0",
-    "@material/dom": "15.0.0-canary.684e33d25.0",
-    "@material/drawer": "15.0.0-canary.684e33d25.0",
-    "@material/elevation": "15.0.0-canary.684e33d25.0",
-    "@material/fab": "15.0.0-canary.684e33d25.0",
-    "@material/feature-targeting": "15.0.0-canary.684e33d25.0",
-    "@material/floating-label": "15.0.0-canary.684e33d25.0",
-    "@material/form-field": "15.0.0-canary.684e33d25.0",
-    "@material/icon-button": "15.0.0-canary.684e33d25.0",
-    "@material/image-list": "15.0.0-canary.684e33d25.0",
-    "@material/layout-grid": "15.0.0-canary.684e33d25.0",
-    "@material/line-ripple": "15.0.0-canary.684e33d25.0",
-    "@material/linear-progress": "15.0.0-canary.684e33d25.0",
-    "@material/list": "15.0.0-canary.684e33d25.0",
-    "@material/menu": "15.0.0-canary.684e33d25.0",
-    "@material/menu-surface": "15.0.0-canary.684e33d25.0",
-    "@material/notched-outline": "15.0.0-canary.684e33d25.0",
-    "@material/radio": "15.0.0-canary.684e33d25.0",
-    "@material/ripple": "15.0.0-canary.684e33d25.0",
-    "@material/rtl": "15.0.0-canary.684e33d25.0",
-    "@material/segmented-button": "15.0.0-canary.684e33d25.0",
-    "@material/select": "15.0.0-canary.684e33d25.0",
-    "@material/shape": "15.0.0-canary.684e33d25.0",
-    "@material/slider": "15.0.0-canary.684e33d25.0",
-    "@material/snackbar": "15.0.0-canary.684e33d25.0",
-    "@material/switch": "15.0.0-canary.684e33d25.0",
-    "@material/tab": "15.0.0-canary.684e33d25.0",
-    "@material/tab-bar": "15.0.0-canary.684e33d25.0",
-    "@material/tab-indicator": "15.0.0-canary.684e33d25.0",
-    "@material/tab-scroller": "15.0.0-canary.684e33d25.0",
-    "@material/textfield": "15.0.0-canary.684e33d25.0",
-    "@material/theme": "15.0.0-canary.684e33d25.0",
-    "@material/tooltip": "15.0.0-canary.684e33d25.0",
-    "@material/top-app-bar": "15.0.0-canary.684e33d25.0",
-    "@material/touch-target": "15.0.0-canary.684e33d25.0",
-    "@material/typography": "15.0.0-canary.684e33d25.0",
+    "@material/animation": "15.0.0-canary.51f9c0c28.0",
+    "@material/auto-init": "15.0.0-canary.51f9c0c28.0",
+    "@material/banner": "15.0.0-canary.51f9c0c28.0",
+    "@material/base": "15.0.0-canary.51f9c0c28.0",
+    "@material/button": "15.0.0-canary.51f9c0c28.0",
+    "@material/card": "15.0.0-canary.51f9c0c28.0",
+    "@material/checkbox": "15.0.0-canary.51f9c0c28.0",
+    "@material/chips": "15.0.0-canary.51f9c0c28.0",
+    "@material/circular-progress": "15.0.0-canary.51f9c0c28.0",
+    "@material/data-table": "15.0.0-canary.51f9c0c28.0",
+    "@material/density": "15.0.0-canary.51f9c0c28.0",
+    "@material/dialog": "15.0.0-canary.51f9c0c28.0",
+    "@material/dom": "15.0.0-canary.51f9c0c28.0",
+    "@material/drawer": "15.0.0-canary.51f9c0c28.0",
+    "@material/elevation": "15.0.0-canary.51f9c0c28.0",
+    "@material/fab": "15.0.0-canary.51f9c0c28.0",
+    "@material/feature-targeting": "15.0.0-canary.51f9c0c28.0",
+    "@material/floating-label": "15.0.0-canary.51f9c0c28.0",
+    "@material/form-field": "15.0.0-canary.51f9c0c28.0",
+    "@material/icon-button": "15.0.0-canary.51f9c0c28.0",
+    "@material/image-list": "15.0.0-canary.51f9c0c28.0",
+    "@material/layout-grid": "15.0.0-canary.51f9c0c28.0",
+    "@material/line-ripple": "15.0.0-canary.51f9c0c28.0",
+    "@material/linear-progress": "15.0.0-canary.51f9c0c28.0",
+    "@material/list": "15.0.0-canary.51f9c0c28.0",
+    "@material/menu": "15.0.0-canary.51f9c0c28.0",
+    "@material/menu-surface": "15.0.0-canary.51f9c0c28.0",
+    "@material/notched-outline": "15.0.0-canary.51f9c0c28.0",
+    "@material/radio": "15.0.0-canary.51f9c0c28.0",
+    "@material/ripple": "15.0.0-canary.51f9c0c28.0",
+    "@material/rtl": "15.0.0-canary.51f9c0c28.0",
+    "@material/segmented-button": "15.0.0-canary.51f9c0c28.0",
+    "@material/select": "15.0.0-canary.51f9c0c28.0",
+    "@material/shape": "15.0.0-canary.51f9c0c28.0",
+    "@material/slider": "15.0.0-canary.51f9c0c28.0",
+    "@material/snackbar": "15.0.0-canary.51f9c0c28.0",
+    "@material/switch": "15.0.0-canary.51f9c0c28.0",
+    "@material/tab": "15.0.0-canary.51f9c0c28.0",
+    "@material/tab-bar": "15.0.0-canary.51f9c0c28.0",
+    "@material/tab-indicator": "15.0.0-canary.51f9c0c28.0",
+    "@material/tab-scroller": "15.0.0-canary.51f9c0c28.0",
+    "@material/textfield": "15.0.0-canary.51f9c0c28.0",
+    "@material/theme": "15.0.0-canary.51f9c0c28.0",
+    "@material/tooltip": "15.0.0-canary.51f9c0c28.0",
+    "@material/top-app-bar": "15.0.0-canary.51f9c0c28.0",
+    "@material/touch-target": "15.0.0-canary.51f9c0c28.0",
+    "@material/typography": "15.0.0-canary.51f9c0c28.0",
     "@octokit/rest": "18.3.5",
     "@rollup/plugin-commonjs": "^21.0.0",
     "@rollup/plugin-node-resolve": "^13.1.3",

diff --git a/packages.bzl b/packages.bzl
@@ -1,7 +1,7 @@
 # Each individual package uses a placeholder for the version of Angular to ensure they're
 # all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
 # version for the placeholders.
-MDC_PACKAGE_VERSION = "15.0.0-canary.684e33d25.0"
+MDC_PACKAGE_VERSION = "15.0.0-canary.51f9c0c28.0"
 TSLIB_PACKAGE_VERSION = "^2.3.0"
 RXJS_PACKAGE_VERSION = "^6.5.3 || ^7.4.0"
 

diff --git a/src/material/core/tokens/m2/mdc/_linear-progress.scss b/src/material/core/tokens/m2/mdc/_linear-progress.scss
@@ -14,9 +14,14 @@ $prefix: (mdc, linear-progress);
 // `null` indicates that we are intentionally choosing not to emit a slot or value for the token in
 // our CSS.
 @function get-unthemable-tokens() {
+  $height: 4px;
+
   @return (
-    // The height of the progress bar track.
-    track-height: 4px
+    // The height of the progress bar track. MDC has two tokens with the goal of having
+    // `track-height` apply only to the track. In our case both are always the same.
+    // Specify both while the transition is in progress.
+    bar-and-track-height: $height,
+    track-height: $height,
   );
 }