Merge branch 'angular:main' into my-fix-branch

Author: DBowen33

.stylelintrc.json

@@ -81,7 +81,7 @@
 
     "unit-case": "lower",
     "unit-no-unknown": true,
-    "unit-allowed-list": ["px", "%", "deg", "s", "ms", "em", "vh", "vw", "vmin"],
+    "unit-allowed-list": ["px", "%", "deg", "s", "ms", "em", "rem", "vh", "vw", "vmin"],
 
     "value-list-comma-space-after": "always-single-line",
     "value-list-comma-space-before": "never",

.vscode/settings.json

@@ -20,5 +20,9 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true
   },
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.rulers": [100],
+  "bazel.buildifierExecutable": "node_modules/.bin/buildifier",
+  "bazel.buildifierFixOnFormat": true,
+  "bazel.executable": "node_modules/.bin/bazel"
 }

CHANGELOG.md

@@ -1,3 +1,101 @@
+<a name="18.1.0-rc.0"></a>
+# 18.1.0-rc.0 "zirconium-zoo" (2024-07-03)
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [674538b77](https://github.com/angular/components/commit/674538b778e75d229ada06d19c362752db3a18cc) | fix | **core:** add fallback if ripples get stuck ([#29323](https://github.com/angular/components/pull/29323)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.0.6"></a>
+# 18.0.6 "gallium-grape" (2024-07-03)
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [e5c5f151c](https://github.com/angular/components/commit/e5c5f151cc3a5293f629bfa84bcddb0b391cf268) | fix | **core:** add fallback if ripples get stuck ([#29323](https://github.com/angular/components/pull/29323)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.1.0-next.4"></a>
+# 18.1.0-next.4 "plastic-pliers" (2024-06-26)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [5f7680f76f](https://github.com/angular/components/commit/5f7680f76f0c6c5d81f4159fb1d103e8801f2b94) | fix | **a11y:** Make focus-trap behavior consistent across zoneful/zoneless ([#29225](https://github.com/angular/components/pull/29225)) |
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [5da528e44d](https://github.com/angular/components/commit/5da528e44d6fadca6e13f34b86f180a4b5239049) | feat | **button:** allow button color to be configured through DI ([#29297](https://github.com/angular/components/pull/29297)) |
+| [d9181b53a4](https://github.com/angular/components/commit/d9181b53a4b8bf68f5cf18c7618abffe1adadef2) | fix | **button-toggle:** skip disabled buttons during keyboard navigation ([#29308](https://github.com/angular/components/pull/29308)) |
+| [f67ffa5c0f](https://github.com/angular/components/commit/f67ffa5c0f3c45ca4ce1661b8be6356dd615feed) | fix | **button:** stack icons on top of touch target ([#29291](https://github.com/angular/components/pull/29291)) |
+| [e74065ad94](https://github.com/angular/components/commit/e74065ad9439e37eb2fd36d30ba62564c4bdcbce) | fix | **datepicker:** avoid losing focus when re-rendering the current view ([#29287](https://github.com/angular/components/pull/29287)) |
+| [36c627beaf](https://github.com/angular/components/commit/36c627beaff2dc486997d1954b36989400591dc5) | fix | **sidenav:** not closing on escape key press ([#29292](https://github.com/angular/components/pull/29292)) |
+### multiple
+| Commit | Type | Description |
+| -- | -- | -- |
+| [aa17c2d128](https://github.com/angular/components/commit/aa17c2d128c6a2e6a9a5b4b0f943b7b792ac5bea) | fix | remove workarounds for formControl directive ([#29296](https://github.com/angular/components/pull/29296)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.0.5"></a>
+# 18.0.5 "plastic-puppy" (2024-06-26)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [0be4013d90](https://github.com/angular/components/commit/0be4013d90aad3a2c4b18d2d6fccaf3a30d1830f) | fix | **a11y:** Make focus-trap behavior consistent across zoneful/zoneless ([#29225](https://github.com/angular/components/pull/29225)) |
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [fad2a074e2](https://github.com/angular/components/commit/fad2a074e2f5ee4bac9ddb68486427ae66a2433d) | fix | **button-toggle:** skip disabled buttons during keyboard navigation ([#29308](https://github.com/angular/components/pull/29308)) |
+| [e5684fe2b7](https://github.com/angular/components/commit/e5684fe2b7964fc9c614a45568b99f1d24982f3f) | fix | **button:** stack icons on top of touch target ([#29291](https://github.com/angular/components/pull/29291)) |
+| [c1a40a26d1](https://github.com/angular/components/commit/c1a40a26d164a766efd3ef863b52de18b3bb4d09) | fix | **datepicker:** avoid losing focus when re-rendering the current view ([#29287](https://github.com/angular/components/pull/29287)) |
+| [7f575daab5](https://github.com/angular/components/commit/7f575daab5de7e77ef8346c5a85eb59108b76a48) | fix | **sidenav:** not closing on escape key press ([#29292](https://github.com/angular/components/pull/29292)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.1.0-next.3"></a>
+# 18.1.0-next.3 "copper-carousel" (2024-06-20)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [b5e30156c](https://github.com/angular/components/commit/b5e30156c110b67fa5633062227b8767fe601532) | feat | **drag-drop:** add the ability to specify an alternate drop list container ([#29283](https://github.com/angular/components/pull/29283)) |
+| [09df51d8e](https://github.com/angular/components/commit/09df51d8ebb86a3ee76614b6775dd62136660567) | fix | **overlay:** incorrectly dispatching outside click for shadow DOM ([#29249](https://github.com/angular/components/pull/29249)) |
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [008212a98](https://github.com/angular/components/commit/008212a9807fd01fd32fe136a075763b7b2c854d) | fix | **autocomplete:** autocomplete panel top is cut off in landscape mode ([#28982](https://github.com/angular/components/pull/28982)) |
+| [aaea0e272](https://github.com/angular/components/commit/aaea0e272635c973f6466b3db990a459a844f1d3) | fix | **bottom-sheet:** changed after checked error with zoneless ([#29277](https://github.com/angular/components/pull/29277)) |
+| [cee9b0415](https://github.com/angular/components/commit/cee9b04156a8485e28947951aa3afcca2bcc713c) | fix | **core:** generate mat-optgroup tokens in M3 ([#29257](https://github.com/angular/components/pull/29257)) |
+| [a4846a961](https://github.com/angular/components/commit/a4846a961924442649f0b19a3979fa92922b5b5f) | fix | **core:** implement elevation classes in M3 |
+| [6318f24d5](https://github.com/angular/components/commit/6318f24d57572b9aeb1da9b4556030fd38efad8a) | fix | **form-field:** outline label position ([#29138](https://github.com/angular/components/pull/29138)) |
+| [3550a8798](https://github.com/angular/components/commit/3550a8798a5aa51e945121c0fcf4e17b4e882faa) | fix | **menu:** animation issue when same menu is used for multiple nested triggers ([#29280](https://github.com/angular/components/pull/29280)) |
+| [03d00f573](https://github.com/angular/components/commit/03d00f57347bf6f0669dd2fc8fdb70fee4b22afd) | fix | **menu:** update elevation logic for M3 |
+| [99b33120e](https://github.com/angular/components/commit/99b33120e774768467120b77703ee4fb9d98d411) | fix | **paginator:** items per page form field touch target size insufficient ([#29109](https://github.com/angular/components/pull/29109)) |
+| [43b8dcbb1](https://github.com/angular/components/commit/43b8dcbb1f17a9d5fcedc88e996c241ab9e28dd8) | fix | **tree:** aria-expanded attribute should not appear in the leaf node ([#29096](https://github.com/angular/components/pull/29096)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="18.0.4"></a>
+# 18.0.4 "caesium-carnival" (2024-06-20)
+### cdk
+| Commit | Type | Description |
+| -- | -- | -- |
+| [8e7ac0804](https://github.com/angular/components/commit/8e7ac0804844f7dee57eca2445b4a9f17a094e4d) | fix | **overlay:** incorrectly dispatching outside click for shadow DOM ([#29249](https://github.com/angular/components/pull/29249)) |
+### material
+| Commit | Type | Description |
+| -- | -- | -- |
+| [303984fd9](https://github.com/angular/components/commit/303984fd9e262e3e434afb56bf2b29c0ef79ab92) | fix | **autocomplete:** autocomplete panel top is cut off in landscape mode ([#28982](https://github.com/angular/components/pull/28982)) |
+| [69ae4040e](https://github.com/angular/components/commit/69ae4040e558d9f10004cff81bdd453ed260abd9) | fix | **bottom-sheet:** changed after checked error with zoneless ([#29277](https://github.com/angular/components/pull/29277)) |
+| [317e371f0](https://github.com/angular/components/commit/317e371f0d6e47e7bf0fff7f72ab731d0727e53a) | fix | **core:** generate mat-optgroup tokens in M3 ([#29257](https://github.com/angular/components/pull/29257)) |
+| [93bc60964](https://github.com/angular/components/commit/93bc6096463bbc33c7430b75214cbc2400ac6a91) | fix | **core:** implement elevation classes in M3 |
+| [6310016f2](https://github.com/angular/components/commit/6310016f27263f08ac449971dd50914effcd2d90) | fix | **form-field:** outline label position ([#29138](https://github.com/angular/components/pull/29138)) |
+| [ce195dee4](https://github.com/angular/components/commit/ce195dee400616afd405c26464c03a5085fe3161) | fix | **menu:** animation issue when same menu is used for multiple nested triggers ([#29280](https://github.com/angular/components/pull/29280)) |
+| [9988ef2f5](https://github.com/angular/components/commit/9988ef2f5e632cd216a29067a593957013b4f108) | fix | **menu:** update elevation logic for M3 |
+| [bad8f6ad4](https://github.com/angular/components/commit/bad8f6ad4472c7533990c05589ce134c925314dd) | fix | **paginator:** items per page form field touch target size insufficient ([#29109](https://github.com/angular/components/pull/29109)) |
+| [f834a11d2](https://github.com/angular/components/commit/f834a11d2c9216daf0c7f9e23a7f1bbc67b40591) | fix | **tree:** aria-expanded attribute should not appear in the leaf node ([#29096](https://github.com/angular/components/pull/29096)) |
+
+<!-- CHANGELOG SPLIT MARKER -->
+
 <a name="18.1.0-next.2"></a>
 # 18.1.0-next.2 "ivory-infinity" (2024-06-12)
 ### cdk

guides/typography.md

@@ -122,7 +122,7 @@ The `.mat-h5` and `.mat-h6` styles don't directly correspond to a specific Mater
 typography level. The `.mat-h5` style uses the `body-2` level with the font-size scaled down by
 `0.83`. The `.mat-h6` style uses the `body-2` level with the font-size scaled down by `0.67`.
 
-The `button` and `input` typography levels do not map to CSS classes.
+The `button` typography level does not map to a CSS class.
 
 The following example demonstrates usage of the typography styles emitted by the
 `typography-hierarchy` mixin.

integration/harness-e2e-cli/package.json

@@ -44,7 +44,11 @@
     "karma-jasmine-html-reporter": "~1.7.0",
     "selenium-webdriver": "3.6.0",
     "ts-node": "~10.9.1",
-    "typescript": "~5.4.2",
+    "typescript": "~5.5.2",
     "wait-on": "^6.0.0"
+  },
+  "resolutions": {
+    "string-width": "4.2.3",
+    "wrap-ansi": "7.0.0"
   }
 }