fixup! Add the new mat.theme API

angular · May 17, 2023 · b1d8437 · b1d8437
1 parent 2ce0c77
commit b1d8437
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel
@@ -19,7 +19,9 @@ ts_library(
 
 sass_library(
     name = "theming_scss_lib",
-    srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS,
+    srcs = MATERIAL_EXPERIMENTAL_SCSS_LIBS + [
+        "//src/material-experimental/theming:theming_scss_lib",
+    ],
 )
 
 sass_library(

diff --git a/src/material-experimental/theming/BUILD.bazel b/src/material-experimental/theming/BUILD.bazel
@@ -0,0 +1,9 @@
+load("//tools:defaults.bzl", "sass_library")
+
+package(default_visibility = ["//visibility:public"])
+
+sass_library(
+    name = "theming_scss_lib",
+    srcs = glob(["**/_*.scss"]),
+    deps = ["//src/material:sass_lib"],
+)
diff --git a/src/material/BUILD.bazel b/src/material/BUILD.bazel
@@ -24,6 +24,7 @@ sass_library(
     srcs = [
         "_index.scss",
         "_theming.scss",
+        "_token-theming.scss",
     ],
     deps = [
         "//src/material/core:core_scss_lib",

diff --git a/src/material/core/tokens/m2/mdc/_chip.scss b/src/material/core/tokens/m2/mdc/_chip.scss
@@ -2,6 +2,7 @@
 @use 'sass:map';
 @use '../../token-utils';
 @use '../../../mdc-helpers/mdc-helpers';
+@use '../../../style/sass-utils';
 @use '../../../theming/theming';
 @use '../../../typography/typography-utils';
 
@@ -304,7 +305,7 @@ $prefix: (mdc, chip);
 // Combines the tokens generated by the above functions into a single map with placeholder values.
 // This is used to create token slots.
 @function get-token-slots() {
-  @return token-utils.merge-all(
+  @return sass-utils.deep-merge-all(
     get-unthemable-tokens(),
     get-color-tokens(token-utils.$placeholder-color-config),
     get-typography-tokens(token-utils.$placeholder-typography-config),