From 0f56cf6334126f7a7eb57283b1f59f006f2c5355 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 28 Feb 2024 13:44:45 -0500 Subject: [PATCH 1/4] feat(material-experimental/theming): provide hook for formatting tokens internally --- src/material-experimental/theming/_format-tokens.scss | 5 +++++ src/material-experimental/theming/_m3-tokens.scss | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/material-experimental/theming/_format-tokens.scss diff --git a/src/material-experimental/theming/_format-tokens.scss b/src/material-experimental/theming/_format-tokens.scss new file mode 100644 index 000000000000..62c0a237033a --- /dev/null +++ b/src/material-experimental/theming/_format-tokens.scss @@ -0,0 +1,5 @@ +// DO NOT REMOVE +// This function is used internally. +@function format($systems) { + @return $systems; +} diff --git a/src/material-experimental/theming/_m3-tokens.scss b/src/material-experimental/theming/_m3-tokens.scss index e6f5ee74fff9..d576b19a83a6 100644 --- a/src/material-experimental/theming/_m3-tokens.scss +++ b/src/material-experimental/theming/_m3-tokens.scss @@ -5,6 +5,7 @@ @use '@material/tokens/v0_161' as mdc-tokens; @use './m3-density'; @use './custom-tokens'; +@use './format-tokens'; // TODO(mmalerba): Split up this file into smaller pieces. @@ -500,6 +501,10 @@ ), $systems); $exclude-hardcoded: not $include-non-systemized; + // DO NOT REMOVE + // This function is used internally. + $systems: format-tokens.format($systems); + // TODO(mmalerba): Refactor this to not depend on the legacy theme when moving out of // material-experimental. This is a hack for now because there is no good way to get the token // slots in material-experimental without exposing them all from material. From 4f04f4fb40c9b4b42d7bc5d5b0fa18efa8173626 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 28 Feb 2024 15:08:26 -0500 Subject: [PATCH 2/4] fixup! feat(material-experimental/theming): provide hook for formatting tokens internally --- src/material-experimental/theming/_format-tokens.scss | 2 +- src/material-experimental/theming/_m3-tokens.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/material-experimental/theming/_format-tokens.scss b/src/material-experimental/theming/_format-tokens.scss index 62c0a237033a..e4fd5abe4f6e 100644 --- a/src/material-experimental/theming/_format-tokens.scss +++ b/src/material-experimental/theming/_format-tokens.scss @@ -1,5 +1,5 @@ // DO NOT REMOVE // This function is used internally. -@function format($systems) { +@function private-internal-format($systems) { @return $systems; } diff --git a/src/material-experimental/theming/_m3-tokens.scss b/src/material-experimental/theming/_m3-tokens.scss index d576b19a83a6..cc8ae66f4248 100644 --- a/src/material-experimental/theming/_m3-tokens.scss +++ b/src/material-experimental/theming/_m3-tokens.scss @@ -503,7 +503,7 @@ // DO NOT REMOVE // This function is used internally. - $systems: format-tokens.format($systems); + $systems: format-tokens.private-internal-format($systems); // TODO(mmalerba): Refactor this to not depend on the legacy theme when moving out of // material-experimental. This is a hack for now because there is no good way to get the token From 7932a47ff0e95c8e25c9af3f949631af08c2bac8 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 28 Feb 2024 15:22:51 -0500 Subject: [PATCH 3/4] fixup! feat(material-experimental/theming): provide hook for formatting tokens internally --- src/material-experimental/theming/_format-tokens.scss | 2 +- src/material-experimental/theming/_m3-tokens.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/material-experimental/theming/_format-tokens.scss b/src/material-experimental/theming/_format-tokens.scss index e4fd5abe4f6e..f395f654eef1 100644 --- a/src/material-experimental/theming/_format-tokens.scss +++ b/src/material-experimental/theming/_format-tokens.scss @@ -1,5 +1,5 @@ // DO NOT REMOVE // This function is used internally. -@function private-internal-format($systems) { +@function private-format-tokens($systems) { @return $systems; } diff --git a/src/material-experimental/theming/_m3-tokens.scss b/src/material-experimental/theming/_m3-tokens.scss index cc8ae66f4248..0a1501a10b0f 100644 --- a/src/material-experimental/theming/_m3-tokens.scss +++ b/src/material-experimental/theming/_m3-tokens.scss @@ -503,7 +503,7 @@ // DO NOT REMOVE // This function is used internally. - $systems: format-tokens.private-internal-format($systems); + $systems: format-tokens.private-format-tokens($systems); // TODO(mmalerba): Refactor this to not depend on the legacy theme when moving out of // material-experimental. This is a hack for now because there is no good way to get the token From d8c883694d52f78ce92c07bd7d4f19573ba19fee Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 28 Feb 2024 17:27:18 -0500 Subject: [PATCH 4/4] fixup! feat(material-experimental/theming): provide hook for formatting tokens internally --- .ng-dev/google-sync-config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.ng-dev/google-sync-config.json b/.ng-dev/google-sync-config.json index 4adf9403a5b8..3fa9468c99c6 100644 --- a/.ng-dev/google-sync-config.json +++ b/.ng-dev/google-sync-config.json @@ -33,6 +33,7 @@ "src/material/core/theming/tests/**/*", "src/material/core/tokens/tests/**", "src/material/expansion/index.ts", + "src/material-experimental/theming/_format-tokens.scss", "**/*import.scss" ] }