diff --git a/src/material-experimental/BUILD.bazel b/src/material-experimental/BUILD.bazel index 6dbd1275218b..187e01847642 100644 --- 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 new file mode 100644 index 000000000000..dd86907ef7c4 --- /dev/null +++ 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 index 26c33fa6d079..f91607ee8367 100644 --- 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 index e4d006d86469..8d98188971e8 100644 --- 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),