From 3a386c5b6562986443d9f255b04b03325d51bc0c Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Tue, 23 Feb 2021 23:20:34 +0100 Subject: [PATCH] fix(material/core): restore private- mixin prefix * In #21204 the `private-` prefix was unintentionally removed from all of the symbols. These changes restore the prefix. * Fixes the prefixes on the expansion panel theming mixins. --- scripts/migrate-sass-modules.js | 2 +- .../column-resize/_column-resize.scss | 4 +- .../mdc-autocomplete/_autocomplete-theme.scss | 4 +- .../mdc-button/_button-theme.scss | 12 +++--- .../mdc-card/_card-theme.scss | 4 +- .../mdc-checkbox/_checkbox-theme.scss | 4 +- .../mdc-chips/_chips-theme.scss | 4 +- .../mdc-color/_all-color.scss | 2 +- .../mdc-core/_core-theme.scss | 4 +- .../mdc-core/option/_optgroup-theme.scss | 4 +- .../mdc-core/option/_option-theme.scss | 4 +- .../mdc-density/_all-density.scss | 2 +- .../mdc-dialog/_dialog-theme.scss | 4 +- .../mdc-form-field/_form-field-theme.scss | 4 +- .../mdc-helpers/_focus-indicators.scss | 5 ++- .../mdc-helpers/_mdc-helpers.scss | 4 +- .../mdc-input/_input-theme.scss | 4 +- .../mdc-list/_list-theme.scss | 4 +- .../mdc-menu/_menu-theme.scss | 4 +- .../mdc-paginator/_paginator-theme.scss | 8 ++-- .../mdc-progress-bar/_progress-bar-theme.scss | 4 +- .../_progress-spinner-theme.scss | 4 +- .../mdc-radio/_radio-theme.scss | 4 +- .../mdc-select/_select-theme.scss | 4 +- .../mdc-sidenav/_sidenav-theme.scss | 4 +- .../mdc-slide-toggle/_slide-toggle-theme.scss | 4 +- .../mdc-slider/_slider-theme.scss | 4 +- .../mdc-snack-bar/_snack-bar-theme.scss | 4 +- .../mdc-table/_table-theme.scss | 4 +- .../mdc-table/table.scss | 2 +- .../mdc-tabs/_tabs-theme.scss | 4 +- .../mdc-tabs/tab-group.scss | 2 +- .../mdc-theming/_all-theme.scss | 2 +- .../mdc-tooltip/_tooltip-theme.scss | 4 +- .../mdc-typography/_all-typography.scss | 2 +- .../popover-edit/_popover-edit.scss | 6 +-- .../selection/_selection.scss | 4 +- .../autocomplete/_autocomplete-theme.scss | 6 +-- src/material/badge/_badge-theme.scss | 4 +- .../bottom-sheet/_bottom-sheet-theme.scss | 6 +-- .../button-toggle/_button-toggle-theme.scss | 10 ++--- src/material/button/_button-base.scss | 2 +- src/material/button/_button-theme.scss | 18 ++++---- src/material/card/_card-theme.scss | 8 ++-- src/material/card/card.scss | 2 +- src/material/checkbox/_checkbox-theme.scss | 4 +- src/material/checkbox/checkbox.scss | 2 +- src/material/chips/_chips-theme.scss | 6 +-- src/material/chips/chips.scss | 2 +- src/material/core/_core.scss | 8 ++-- src/material/core/color/_all-color.scss | 2 +- .../core/density/private/_all-density.scss | 4 +- .../private/_compatibility.import.scss | 8 ++-- .../core/density/private/_compatibility.scss | 12 +++--- .../_focus-indicators.import.scss | 20 +++------ .../focus-indicators/_focus-indicators.scss | 6 +-- .../core/option/_optgroup-theme.import.scss | 10 +---- src/material/core/option/_optgroup-theme.scss | 4 +- .../core/option/_option-theme.import.scss | 10 +---- src/material/core/option/_option-theme.scss | 4 +- src/material/core/ripple/_ripple.import.scss | 10 +---- src/material/core/ripple/_ripple.scss | 4 +- .../_pseudo-checkbox-theme.import.scss | 10 +---- .../_pseudo-checkbox-theme.scss | 4 +- .../pseudo-checkbox/pseudo-checkbox.scss | 2 +- .../core/style/_form-common.import.scss | 12 ++---- src/material/core/style/_form-common.scss | 4 +- src/material/core/style/_private.import.scss | 2 +- src/material/core/style/_private.scss | 6 +-- src/material/core/theming/_all-theme.scss | 4 +- .../core/theming/_theming.import.scss | 21 +++------- src/material/core/theming/_theming.scss | 42 +++++++++---------- .../core/theming/tests/test-theming-api.scss | 2 +- .../core/typography/_all-typography.scss | 4 +- .../core/typography/_typography.import.scss | 9 ++-- src/material/core/typography/_typography.scss | 12 +++--- .../datepicker/_datepicker-theme.scss | 8 ++-- src/material/dialog/_dialog-theme.scss | 6 +-- src/material/divider/_divider-theme.scss | 4 +- .../expansion/_expansion-mixins.import.scss | 2 +- src/material/expansion/_expansion-mixins.scss | 2 +- .../expansion/_expansion-theme.import.scss | 6 +-- src/material/expansion/_expansion-theme.scss | 32 +++++++------- .../_expansion-variables.import.scss | 2 +- .../expansion/_expansion-variables.scss | 32 +++++++------- .../expansion/expansion-panel-header.scss | 4 +- .../_form-field-fill-theme.import.scss | 9 ++-- .../form-field/_form-field-fill-theme.scss | 8 ++-- .../_form-field-legacy-theme.import.scss | 14 +++---- .../form-field/_form-field-legacy-theme.scss | 10 ++--- .../_form-field-outline-theme.import.scss | 13 +++--- .../form-field/_form-field-outline-theme.scss | 8 ++-- .../_form-field-standard-theme.import.scss | 6 +-- .../_form-field-standard-theme.scss | 10 ++--- .../form-field/_form-field-theme.import.scss | 25 +++++------ .../form-field/_form-field-theme.scss | 12 +++--- src/material/grid-list/_grid-list-theme.scss | 4 +- src/material/icon/_icon-theme.scss | 4 +- src/material/input/_input-theme.scss | 6 +-- src/material/list/_list-theme.scss | 4 +- src/material/menu/_menu-theme.scss | 6 +-- src/material/paginator/_paginator-theme.scss | 10 ++--- .../progress-bar/_progress-bar-theme.scss | 4 +- src/material/progress-bar/progress-bar.scss | 2 +- .../_progress-spinner-theme.scss | 4 +- .../progress-spinner/progress-spinner.scss | 10 ++--- src/material/radio/_radio-theme.scss | 4 +- src/material/select/_select-theme.scss | 8 ++-- src/material/sidenav/_sidenav-theme.scss | 6 +-- .../slide-toggle/_slide-toggle-theme.scss | 6 +-- src/material/slider/_slider-theme.scss | 4 +- src/material/snack-bar/_snack-bar-theme.scss | 6 +-- src/material/sort/_sort-theme.scss | 4 +- src/material/stepper/_stepper-theme.scss | 10 ++--- .../table/_table-flex-styles.import.scss | 4 +- src/material/table/_table-flex-styles.scss | 2 +- src/material/table/_table-theme.scss | 4 +- src/material/table/table.scss | 2 +- src/material/tabs/_tabs-common.scss | 2 +- src/material/tabs/_tabs-theme.scss | 4 +- src/material/tabs/tab-group.scss | 2 +- src/material/tabs/tab-header.scss | 2 +- src/material/toolbar/_toolbar-theme.scss | 10 ++--- src/material/tooltip/_tooltip-theme.scss | 4 +- src/material/tree/_tree-theme.scss | 9 ++-- 125 files changed, 380 insertions(+), 435 deletions(-) diff --git a/scripts/migrate-sass-modules.js b/scripts/migrate-sass-modules.js index 577aee1f5fd3..c7c5863f4eb9 100644 --- a/scripts/migrate-sass-modules.js +++ b/scripts/migrate-sass-modules.js @@ -27,7 +27,7 @@ const materialPrefixes = [ 'mat-pseudo-checkbox-', 'mat-elevation-', 'mat-optgroup-', - 'mat-private-' + 'mat-expansion-panel-' ]; const mdcPrefixes = [ ...getPrefixes('material-experimental', 'mat'), diff --git a/src/material-experimental/column-resize/_column-resize.scss b/src/material-experimental/column-resize/_column-resize.scss index b6e12da597d6..411c239f2c59 100644 --- a/src/material-experimental/column-resize/_column-resize.scss +++ b/src/material-experimental/column-resize/_column-resize.scss @@ -105,8 +105,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-column-resize') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-column-resize') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss index 7bbaeb9308a5..02d961eb5cb9 100644 --- a/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss +++ b/src/material-experimental/mdc-autocomplete/_autocomplete-theme.scss @@ -27,8 +27,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-autocomplete') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-autocomplete') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-button/_button-theme.scss b/src/material-experimental/mdc-button/_button-theme.scss index 4077b6e1da0c..31e9679d0efb 100644 --- a/src/material-experimental/mdc-button/_button-theme.scss +++ b/src/material-experimental/mdc-button/_button-theme.scss @@ -190,8 +190,8 @@ $mat-button-state-target: '.mdc-button__ripple'; } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-button') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-button') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -269,8 +269,8 @@ $mat-button-state-target: '.mdc-button__ripple'; @mixin fab-density($config-or-theme) {} @mixin fab-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-fab') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-fab') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -347,8 +347,8 @@ $mat-button-state-target: '.mdc-button__ripple'; } @mixin icon-button-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-icon-button') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-icon-button') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-card/_card-theme.scss b/src/material-experimental/mdc-card/_card-theme.scss index b34b07d9be8d..6a471487574e 100644 --- a/src/material-experimental/mdc-card/_card-theme.scss +++ b/src/material-experimental/mdc-card/_card-theme.scss @@ -54,8 +54,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-card') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-card') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss index 38f904eefc05..99845dfc699a 100644 --- a/src/material-experimental/mdc-checkbox/_checkbox-theme.scss +++ b/src/material-experimental/mdc-checkbox/_checkbox-theme.scss @@ -144,8 +144,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-checkbox') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-checkbox') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-chips/_chips-theme.scss b/src/material-experimental/mdc-chips/_chips-theme.scss index de648f89c2ff..27693afa84fd 100644 --- a/src/material-experimental/mdc-chips/_chips-theme.scss +++ b/src/material-experimental/mdc-chips/_chips-theme.scss @@ -91,8 +91,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-chips') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-chips') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-color/_all-color.scss b/src/material-experimental/mdc-color/_all-color.scss index 50df454fff06..9d4276e7d107 100644 --- a/src/material-experimental/mdc-color/_all-color.scss +++ b/src/material-experimental/mdc-color/_all-color.scss @@ -4,7 +4,7 @@ @mixin angular-material-mdc-color($config-or-theme) { // In case a theme object has been passed instead of a configuration for // the color system, extract the color config from the theme object. - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-color-config($config-or-theme), $config-or-theme); @if $config == null { diff --git a/src/material-experimental/mdc-core/_core-theme.scss b/src/material-experimental/mdc-core/_core-theme.scss index 2aa513b764e6..fd97952723d7 100644 --- a/src/material-experimental/mdc-core/_core-theme.scss +++ b/src/material-experimental/mdc-core/_core-theme.scss @@ -4,11 +4,11 @@ // Mixin that renders all of the core styles that depend on the theme. @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); + $theme: theming.private-legacy-get-theme($theme-or-color-config); // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that // there won't be multiple warnings. e.g. if `mat-mdc-core-theme` reports a warning, then // the imported themes (such as `mat-ripple-theme`) should not report again. - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-core') { + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-core') { @include option-theme.option-theme($theme); @include optgroup-theme.theme($theme); } diff --git a/src/material-experimental/mdc-core/option/_optgroup-theme.scss b/src/material-experimental/mdc-core/option/_optgroup-theme.scss index 99c4a72248a8..9a09d756735a 100644 --- a/src/material-experimental/mdc-core/option/_optgroup-theme.scss +++ b/src/material-experimental/mdc-core/option/_optgroup-theme.scss @@ -28,8 +28,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-optgroup') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-optgroup') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-core/option/_option-theme.scss b/src/material-experimental/mdc-core/option/_option-theme.scss index 46bb19235206..40f124eadef1 100644 --- a/src/material-experimental/mdc-core/option/_option-theme.scss +++ b/src/material-experimental/mdc-core/option/_option-theme.scss @@ -62,8 +62,8 @@ } @mixin option-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-option') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-option') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-density/_all-density.scss b/src/material-experimental/mdc-density/_all-density.scss index f98c504678c4..3c4cac9001e9 100644 --- a/src/material-experimental/mdc-density/_all-density.scss +++ b/src/material-experimental/mdc-density/_all-density.scss @@ -4,7 +4,7 @@ @mixin angular-material-mdc-density($config-or-theme) { // In case a theme object has been passed instead of a configuration for // the density system, extract the density config from the theme object. - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-density-config($config-or-theme), $config-or-theme); @if $config == null { diff --git a/src/material-experimental/mdc-dialog/_dialog-theme.scss b/src/material-experimental/mdc-dialog/_dialog-theme.scss index 277076baf2fb..474a6bfe911f 100644 --- a/src/material-experimental/mdc-dialog/_dialog-theme.scss +++ b/src/material-experimental/mdc-dialog/_dialog-theme.scss @@ -22,8 +22,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-dialog') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-dialog') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-form-field/_form-field-theme.scss b/src/material-experimental/mdc-form-field/_form-field-theme.scss index a45ccf471427..b6af728250ba 100644 --- a/src/material-experimental/mdc-form-field/_form-field-theme.scss +++ b/src/material-experimental/mdc-form-field/_form-field-theme.scss @@ -88,8 +88,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-form-field') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-form-field') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-helpers/_focus-indicators.scss b/src/material-experimental/mdc-helpers/_focus-indicators.scss index 7013125b919f..d0db70b52458 100644 --- a/src/material-experimental/mdc-helpers/_focus-indicators.scss +++ b/src/material-experimental/mdc-helpers/_focus-indicators.scss @@ -122,8 +122,9 @@ @include _mat-mdc-strong-focus-indicators-border-color($theme-or-color); } @else { - $theme: theming.legacy-get-theme($theme-or-color); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-strong-focus-indicators') { + $theme: theming.private-legacy-get-theme($theme-or-color); + @include theming.private-check-duplicate-theme-styles($theme, + 'mat-mdc-strong-focus-indicators') { $color: theming.get-color-config($theme); @if $color != null { @include strong-focus-indicators-color($color); diff --git a/src/material-experimental/mdc-helpers/_mdc-helpers.scss b/src/material-experimental/mdc-helpers/_mdc-helpers.scss index d2c4a61ef6de..004b7ea7f5a7 100644 --- a/src/material-experimental/mdc-helpers/_mdc-helpers.scss +++ b/src/material-experimental/mdc-helpers/_mdc-helpers.scss @@ -94,7 +94,7 @@ $mat-typography-2018-level-mappings: ( // Converts an Angular Material typography level config to an MDC one. @function mat-typography-level-config-to-mdc($mat-config, $mat-level) { - $mappings: if(typography.typography-is-2018-config($mat-config), + $mappings: if(typography.private-typography-is-2018-config($mat-config), $mat-typography-2018-level-mappings, $mat-typography-2014-level-mappings); $mdc-level: map.get(map.get($mappings, mat-to-mdc), $mat-level); @@ -133,7 +133,7 @@ $mat-typography-2018-level-mappings: ( @function mat-typography-config-to-mdc($mat-config: typography.config()) { $mdc-config: (); - $mappings: if(typography.typography-is-2018-config($mat-config), + $mappings: if(typography.private-typography-is-2018-config($mat-config), $mat-typography-2018-level-mappings, $mat-typography-2014-level-mappings); @each $mdc-level, $mat-level in map.get($mappings, mdc-to-mat) { diff --git a/src/material-experimental/mdc-input/_input-theme.scss b/src/material-experimental/mdc-input/_input-theme.scss index 00e132da0c9a..835644729995 100644 --- a/src/material-experimental/mdc-input/_input-theme.scss +++ b/src/material-experimental/mdc-input/_input-theme.scss @@ -14,8 +14,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-input') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-input') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-list/_list-theme.scss b/src/material-experimental/mdc-list/_list-theme.scss index 5c5ffdeac976..30091a36427f 100644 --- a/src/material-experimental/mdc-list/_list-theme.scss +++ b/src/material-experimental/mdc-list/_list-theme.scss @@ -61,8 +61,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-list') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-list') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-menu/_menu-theme.scss b/src/material-experimental/mdc-menu/_menu-theme.scss index 8b3804be4e76..ac9524020a88 100644 --- a/src/material-experimental/mdc-menu/_menu-theme.scss +++ b/src/material-experimental/mdc-menu/_menu-theme.scss @@ -66,8 +66,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-menu') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-menu') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-paginator/_paginator-theme.scss b/src/material-experimental/mdc-paginator/_paginator-theme.scss index 2f8e732f4df5..eb41e907b121 100644 --- a/src/material-experimental/mdc-paginator/_paginator-theme.scss +++ b/src/material-experimental/mdc-paginator/_paginator-theme.scss @@ -64,10 +64,10 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $height: compatibility.density-prop-value( + $height: compatibility.private-density-prop-value( paginator-variables.$density-config, $density-scale, height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-mdc-paginator-container { min-height: $height; } @@ -75,8 +75,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-paginator') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-paginator') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss index 4a476d1dfa8c..43a8511ae855 100644 --- a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss +++ b/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss @@ -37,8 +37,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-progress-bar') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-progress-bar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss index 13cdcbeece7a..65808ef3c94f 100644 --- a/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss +++ b/src/material-experimental/mdc-progress-spinner/_progress-spinner-theme.scss @@ -28,8 +28,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-progress-spinner') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-progress-spinner') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-radio/_radio-theme.scss b/src/material-experimental/mdc-radio/_radio-theme.scss index 737eed25a84b..8d1ff8245c7f 100644 --- a/src/material-experimental/mdc-radio/_radio-theme.scss +++ b/src/material-experimental/mdc-radio/_radio-theme.scss @@ -58,8 +58,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-radio') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-radio') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-select/_select-theme.scss b/src/material-experimental/mdc-select/_select-theme.scss index a0ba05173b79..3f7bd8ea261c 100644 --- a/src/material-experimental/mdc-select/_select-theme.scss +++ b/src/material-experimental/mdc-select/_select-theme.scss @@ -101,8 +101,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-select') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-select') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss index effe81c9dc23..53d24118739b 100644 --- a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss +++ b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss @@ -10,8 +10,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-sidenav') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-sidenav') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss index ed6b57f3302e..3e26d0635861 100644 --- a/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss +++ b/src/material-experimental/mdc-slide-toggle/_slide-toggle-theme.scss @@ -96,8 +96,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-slide-toggle') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-slide-toggle') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-slider/_slider-theme.scss b/src/material-experimental/mdc-slider/_slider-theme.scss index 2bb2ff428b41..3dbbfd2d4a90 100644 --- a/src/material-experimental/mdc-slider/_slider-theme.scss +++ b/src/material-experimental/mdc-slider/_slider-theme.scss @@ -34,8 +34,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-slider') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-slider') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss index 98f57baeb83f..f2904b37b9c3 100644 --- a/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss +++ b/src/material-experimental/mdc-snack-bar/_snack-bar-theme.scss @@ -53,8 +53,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-snack-bar') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-snack-bar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-table/_table-theme.scss b/src/material-experimental/mdc-table/_table-theme.scss index 1b3a1ba9c517..e557f1f60aa9 100644 --- a/src/material-experimental/mdc-table/_table-theme.scss +++ b/src/material-experimental/mdc-table/_table-theme.scss @@ -59,8 +59,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-table') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-table') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-table/table.scss b/src/material-experimental/mdc-table/table.scss index 8a39895e7e08..b9ebf3745a3b 100644 --- a/src/material-experimental/mdc-table/table.scss +++ b/src/material-experimental/mdc-table/table.scss @@ -4,7 +4,7 @@ @import '@material/data-table/mixins.import'; @include mdc-data-table-core-styles($query: mdc-helpers.$mat-base-styles-without-animation-query); -@include table-flex-styles.table-flex-styles(); +@include table-flex-styles.private-table-flex-styles(); .mat-mdc-table-sticky { // Note that the table can either set this class or an inline style to make something sticky. diff --git a/src/material-experimental/mdc-tabs/_tabs-theme.scss b/src/material-experimental/mdc-tabs/_tabs-theme.scss index cb529272e52a..8bf747cc2f03 100644 --- a/src/material-experimental/mdc-tabs/_tabs-theme.scss +++ b/src/material-experimental/mdc-tabs/_tabs-theme.scss @@ -118,8 +118,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-tabs') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-tabs') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-tabs/tab-group.scss b/src/material-experimental/mdc-tabs/tab-group.scss index 6ecb4117808d..e2b826c2e3d2 100644 --- a/src/material-experimental/mdc-tabs/tab-group.scss +++ b/src/material-experimental/mdc-tabs/tab-group.scss @@ -39,7 +39,7 @@ // The bottom section of the view; contains the tab bodies .mat-mdc-tab-body-wrapper { - @include private.animation-noop(); + @include private.private-animation-noop(); position: relative; overflow: hidden; display: flex; diff --git a/src/material-experimental/mdc-theming/_all-theme.scss b/src/material-experimental/mdc-theming/_all-theme.scss index 9d2b2129a562..843410f23827 100644 --- a/src/material-experimental/mdc-theming/_all-theme.scss +++ b/src/material-experimental/mdc-theming/_all-theme.scss @@ -24,7 +24,7 @@ @mixin angular-material-mdc-theme($theme-or-color-config) { $dedupe-key: 'angular-material-mdc-theme'; - @include theming.check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) { + @include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) { @include core-theme.theme($theme-or-color-config); @include autocomplete-theme.theme($theme-or-color-config); @include button-theme.theme($theme-or-color-config); diff --git a/src/material-experimental/mdc-tooltip/_tooltip-theme.scss b/src/material-experimental/mdc-tooltip/_tooltip-theme.scss index e90bed1b10e2..d4d59ef669d7 100644 --- a/src/material-experimental/mdc-tooltip/_tooltip-theme.scss +++ b/src/material-experimental/mdc-tooltip/_tooltip-theme.scss @@ -21,8 +21,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-mdc-tooltip') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-tooltip') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/mdc-typography/_all-typography.scss b/src/material-experimental/mdc-typography/_all-typography.scss index fd2a00b37692..db9999880e4f 100644 --- a/src/material-experimental/mdc-typography/_all-typography.scss +++ b/src/material-experimental/mdc-typography/_all-typography.scss @@ -73,7 +73,7 @@ } @mixin angular-material-mdc-typography($config-or-theme: null) { - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-typography-config($config-or-theme), $config-or-theme); // If no actual color configuration has been specified, create a default one. diff --git a/src/material-experimental/popover-edit/_popover-edit.scss b/src/material-experimental/popover-edit/_popover-edit.scss index e5588d0f139c..5f97dee6bce8 100644 --- a/src/material-experimental/popover-edit/_popover-edit.scss +++ b/src/material-experimental/popover-edit/_popover-edit.scss @@ -78,7 +78,7 @@ } .mat-edit-pane { - @include private.theme-elevation(2, $config); + @include private.private-theme-elevation(2, $config); background: $background-color; color: theming.color($foreground, text); display: block; @@ -155,8 +155,8 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-popover-edit') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-popover-edit') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material-experimental/selection/_selection.scss b/src/material-experimental/selection/_selection.scss index 3e8e24935b3c..d870cf9642d2 100644 --- a/src/material-experimental/selection/_selection.scss +++ b/src/material-experimental/selection/_selection.scss @@ -1,8 +1,8 @@ @use '../../material/core/theming/theming'; @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-selection'); + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-selection'); } @mixin typography($config-or-theme) {} diff --git a/src/material/autocomplete/_autocomplete-theme.scss b/src/material/autocomplete/_autocomplete-theme.scss index f33ff6192a63..3ad133584f68 100644 --- a/src/material/autocomplete/_autocomplete-theme.scss +++ b/src/material/autocomplete/_autocomplete-theme.scss @@ -8,7 +8,7 @@ $background: map.get($config, background); .mat-autocomplete-panel { - @include private.theme-overridable-elevation(4, $config); + @include private.private-theme-overridable-elevation(4, $config); background: theming.color($background, card); color: theming.color($foreground, text); @@ -32,8 +32,8 @@ @mixin _mat-autocomplete-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-autocomplete') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-autocomplete') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/badge/_badge-theme.scss b/src/material/badge/_badge-theme.scss index 8ef6800a4de5..af8032037c1d 100644 --- a/src/material/badge/_badge-theme.scss +++ b/src/material/badge/_badge-theme.scss @@ -211,8 +211,8 @@ $large-size: $default-size + 6; @mixin _mat-badge-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-badge') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-badge') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/bottom-sheet/_bottom-sheet-theme.scss b/src/material/bottom-sheet/_bottom-sheet-theme.scss index 93d9ca69137a..0dab4d39a7d2 100644 --- a/src/material/bottom-sheet/_bottom-sheet-theme.scss +++ b/src/material/bottom-sheet/_bottom-sheet-theme.scss @@ -10,7 +10,7 @@ $foreground: map.get($config, foreground); .mat-bottom-sheet-container { - @include private.theme-elevation(16, $config); + @include private.private-theme-elevation(16, $config); background: theming.color($background, dialog); color: theming.color($foreground, text); } @@ -26,8 +26,8 @@ @mixin _mat-bottom-sheet-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-bottom-sheet') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-bottom-sheet') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/button-toggle/_button-toggle-theme.scss b/src/material/button-toggle/_button-toggle-theme.scss index 0c5d74ca502f..6ee77a4ed4d7 100644 --- a/src/material/button-toggle/_button-toggle-theme.scss +++ b/src/material/button-toggle/_button-toggle-theme.scss @@ -15,7 +15,7 @@ .mat-button-toggle-standalone, .mat-button-toggle-group { - @include private.theme-elevation(2, $config); + @include private.private-theme-elevation(2, $config); } .mat-button-toggle-standalone.mat-button-toggle-appearance-standard, @@ -94,10 +94,10 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $standard-height: compatibility.density-prop-value( + $standard-height: compatibility.private-density-prop-value( button-toggle-variables.$standard-density-config, $density-scale, height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { line-height: $standard-height; } @@ -105,8 +105,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-button-toggle') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-button-toggle') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/button/_button-base.scss b/src/material/button/_button-base.scss index 2037c8a034ff..35a276e60f5e 100644 --- a/src/material/button/_button-base.scss +++ b/src/material/button/_button-base.scss @@ -76,7 +76,7 @@ $mini-fab-padding: 8px !default; // Applies styles to buttons with backgrounds: raised, fab, and mini-fab @mixin raised-button { @include base; - @include private.animation-noop(); + @include private.private-animation-noop(); // Force hardware acceleration. transform: translate3d(0, 0, 0); diff --git a/src/material/button/_button-theme.scss b/src/material/button/_button-theme.scss index 83b150e6e6ae..8d761bc667b1 100644 --- a/src/material/button/_button-theme.scss +++ b/src/material/button/_button-theme.scss @@ -134,30 +134,30 @@ $_mat-button-ripple-opacity: 0.1; } .mat-stroked-button, .mat-flat-button { - @include private.theme-overridable-elevation(0, $config); + @include private.private-theme-overridable-elevation(0, $config); } .mat-raised-button { - @include private.theme-overridable-elevation(2, $config); + @include private.private-theme-overridable-elevation(2, $config); &:not(.mat-button-disabled):active { - @include private.theme-overridable-elevation(8, $config); + @include private.private-theme-overridable-elevation(8, $config); } &.mat-button-disabled { - @include private.theme-overridable-elevation(0, $config); + @include private.private-theme-overridable-elevation(0, $config); } } .mat-fab, .mat-mini-fab { - @include private.theme-overridable-elevation(6, $config); + @include private.private-theme-overridable-elevation(6, $config); &:not(.mat-button-disabled):active { - @include private.theme-overridable-elevation(12, $config); + @include private.private-theme-overridable-elevation(12, $config); } &.mat-button-disabled { - @include private.theme-overridable-elevation(0, $config); + @include private.private-theme-overridable-elevation(0, $config); } } } @@ -177,8 +177,8 @@ $_mat-button-ripple-opacity: 0.1; @mixin _mat-button-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-button') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-button') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/card/_card-theme.scss b/src/material/card/_card-theme.scss index c0537d452233..06e0633151ac 100644 --- a/src/material/card/_card-theme.scss +++ b/src/material/card/_card-theme.scss @@ -11,13 +11,13 @@ $foreground: map.get($config, foreground); .mat-card { - @include private.theme-overridable-elevation(1, $config); + @include private.private-theme-overridable-elevation(1, $config); background: theming.color($background, card); color: theming.color($foreground, text); // Needs extra specificity to be able to override the elevation selectors. &.mat-card-flat { - @include private.theme-overridable-elevation(0, $config); + @include private.private-theme-overridable-elevation(0, $config); } } @@ -52,8 +52,8 @@ @mixin _mat-card-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-card') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-card') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/card/card.scss b/src/material/card/card.scss index de52746bc386..d53ad1cff994 100644 --- a/src/material/card/card.scss +++ b/src/material/card/card.scss @@ -10,7 +10,7 @@ $header-size: 40px !default; .mat-card { @include elevation.transition; - @include private.animation-noop(); + @include private.private-animation-noop(); display: block; position: relative; padding: $padding; diff --git a/src/material/checkbox/_checkbox-theme.scss b/src/material/checkbox/_checkbox-theme.scss index d78f8147e7b2..f2d097a270ad 100644 --- a/src/material/checkbox/_checkbox-theme.scss +++ b/src/material/checkbox/_checkbox-theme.scss @@ -111,8 +111,8 @@ @mixin _mat-checkbox-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-checkbox') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-checkbox') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/checkbox/checkbox.scss b/src/material/checkbox/checkbox.scss index 10c52c5b9267..32f6e70f3480 100644 --- a/src/material/checkbox/checkbox.scss +++ b/src/material/checkbox/checkbox.scss @@ -177,7 +177,7 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * checkbox-common.$size !default; } .mat-checkbox { - @include private.animation-noop(); + @include private.private-animation-noop(); // The host node defaults to `diplay: inline` so // we have to change it in order for margins to work. diff --git a/src/material/chips/_chips-theme.scss b/src/material/chips/_chips-theme.scss index 55a4e4f7d81b..750c58eedacc 100644 --- a/src/material/chips/_chips-theme.scss +++ b/src/material/chips/_chips-theme.scss @@ -57,7 +57,7 @@ $chip-remove-font-size: 18px; &:not(.mat-chip-disabled) { &:active { - @include private.theme-elevation(3, $config); + @include private.private-theme-elevation(3, $config); } .mat-chip-remove:hover { @@ -105,8 +105,8 @@ $chip-remove-font-size: 18px; @mixin _mat-chips-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-chips') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-chips') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/chips/chips.scss b/src/material/chips/chips.scss index c2f407c9d928..779e71f71547 100644 --- a/src/material/chips/chips.scss +++ b/src/material/chips/chips.scss @@ -41,7 +41,7 @@ $chip-remove-size: 18px; .mat-standard-chip { @include elevation.transition; - @include private.animation-noop; + @include private.private-animation-noop; display: inline-flex; padding: $chip-vertical-padding $chip-horizontal-padding; border-radius: 16px; diff --git a/src/material/core/_core.scss b/src/material/core/_core.scss index 16ccf779c28c..49863e3bc53a 100644 --- a/src/material/core/_core.scss +++ b/src/material/core/_core.scss @@ -22,7 +22,7 @@ @include overlay.overlay(); @include text-field.text-field(); - @include focus-indicators.strong-focus-indicators-positioning(); + @include focus-indicators.private-strong-focus-indicators-positioning(); @include _mat-mdc-core(); } @@ -44,7 +44,7 @@ // elevated. @for $zValue from 0 through 24 { .#{elevation.$prefix}#{$zValue} { - @include private.theme-elevation($zValue, $config); + @include private.private-theme-elevation($zValue, $config); } } @@ -58,11 +58,11 @@ // Mixin that renders all of the core styles that depend on the theme. @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); + $theme: theming.private-legacy-get-theme($theme-or-color-config); // Wrap the sub-theme includes in the duplicate theme styles mixin. This ensures that // there won't be multiple warnings. e.g. if `mat-core-theme` reports a warning, then // the imported themes (such as `mat-ripple-theme`) should not report again. - @include theming.check-duplicate-theme-styles($theme, 'mat-core') { + @include theming.private-check-duplicate-theme-styles($theme, 'mat-core') { @include ripple.theme($theme); @include option-theme.theme($theme); @include optgroup-theme.theme($theme); diff --git a/src/material/core/color/_all-color.scss b/src/material/core/color/_all-color.scss index 52aba06bd201..ea17021a50fb 100644 --- a/src/material/core/color/_all-color.scss +++ b/src/material/core/color/_all-color.scss @@ -5,7 +5,7 @@ @mixin angular-material-color($config-or-theme) { // In case a theme object has been passed instead of a configuration for // the color system, extract the color config from the theme object. - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-color-config($config-or-theme), $config-or-theme); @if $config == null { diff --git a/src/material/core/density/private/_all-density.scss b/src/material/core/density/private/_all-density.scss index 7034457eada1..e0638db84036 100644 --- a/src/material/core/density/private/_all-density.scss +++ b/src/material/core/density/private/_all-density.scss @@ -11,7 +11,7 @@ @mixin angular-material-density($config-or-theme) { // In case a theme object has been passed instead of a configuration for // the density system, extract the density config from the theme object. - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-density-config($config-or-theme), $config-or-theme); @if $config == null { @@ -24,7 +24,7 @@ // mixin that is transitively loaded by the `all-theme` file, imports `all-density` which // would then load `all-theme` again. This ultimately results a circular dependency. - @include expansion-theme.panel-density($config); + @include expansion-theme.density($config); @include stepper-theme.density($config); @include toolbar-theme.density($config); @include tree-theme.density($config); diff --git a/src/material/core/density/private/_compatibility.import.scss b/src/material/core/density/private/_compatibility.import.scss index ec30ae106b28..f68d97510308 100644 --- a/src/material/core/density/private/_compatibility.import.scss +++ b/src/material/core/density/private/_compatibility.import.scss @@ -1,4 +1,4 @@ -@forward 'compatibility' hide $density-generate-at-root, $density-generate-styles, -density-legacy-compatibility, density-prop-value; -@forward 'compatibility' as mat-private-* hide $mat-private-default-scale, $mat-private-interval, -$mat-private-maximum-scale, $mat-private-minimum-scale, $mat-private-supported-scales; +@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles, +private-density-legacy-compatibility, private-density-prop-value; +@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale, +$mat-minimum-scale, $mat-supported-scales; diff --git a/src/material/core/density/private/_compatibility.scss b/src/material/core/density/private/_compatibility.scss index a46544d153cf..da2da9e34d53 100644 --- a/src/material/core/density/private/_compatibility.scss +++ b/src/material/core/density/private/_compatibility.scss @@ -16,11 +16,11 @@ $_mat-density-default-scale: 0 !default; // Whether density should be generated at root. This will be temporarily set to `true` // whenever density styles for legacy themes are generated. -$density-generate-at-root: false; +$private-density-generate-at-root: false; // Whether density styles should be generated. This will be temporarily set to `false` if // duplicate density styles for a legacy theme would be generated. For legacy themes, // we always generate the default density **only once** at root. -$density-generate-styles: true; +$private-density-generate-styles: true; // Mixin that can be used to wrap density styles of given components. The mixin will // move the density styles to root if the `$mat-private-density-generate-at-root` global variable @@ -34,18 +34,18 @@ $density-generate-styles: true; // density styles. This is breaking as it increases specificity of density styles. This mixin // provides an API to control generation of density styles so that we can ensure they are only // created *once* and at root. -@mixin density-legacy-compatibility() { - @if $density-generate-styles and $density-generate-at-root { +@mixin private-density-legacy-compatibility() { + @if $private-density-generate-styles and $private-density-generate-at-root { @at-root { @content; } } - @else if $density-generate-styles { + @else if $private-density-generate-styles { @content; } } -@function density-prop-value($density-config, $density-scale, $property-name) { +@function private-density-prop-value($density-config, $density-scale, $property-name) { @if (meta.type-of($density-scale) == 'string' and list.index($list: $_mat-density-supported-scales, $value: $density-scale) == null) { @error 'mat-density: Supported density scales #{$_mat-density-supported-scales}, ' + diff --git a/src/material/core/focus-indicators/_focus-indicators.import.scss b/src/material/core/focus-indicators/_focus-indicators.import.scss index f0f04029d0cb..de94e05f2a67 100644 --- a/src/material/core/focus-indicators/_focus-indicators.import.scss +++ b/src/material/core/focus-indicators/_focus-indicators.import.scss @@ -7,22 +7,12 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward '../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../theming/theming' as mat-private-* hide $mat-private-theme-ignore-duplication-warnings, -mat-private-color, mat-private-contrast, mat-private-dark-theme, mat-private-get-color-config, -mat-private-get-density-config, mat-private-get-typography-config, mat-private-light-theme, -mat-private-palette; +@forward '../density/private/compatibility' as mat-*; +@forward '../theming/theming' as mat-*; @forward '../style/layout-common' as mat-*; -@forward 'focus-indicators' hide strong-focus-indicators, strong-focus-indicators-color, -strong-focus-indicators-positioning, strong-focus-indicators-theme; -@forward 'focus-indicators' as mat-* hide mat-strong-focus-indicators-border-color, -mat-strong-focus-indicators-positioning; -@forward 'focus-indicators' as mat-private-* hide mat-private-strong-focus-indicators, -mat-private-strong-focus-indicators-border-color, mat-private-strong-focus-indicators-color, -mat-private-strong-focus-indicators-theme; +@forward 'focus-indicators' hide private-strong-focus-indicators-positioning, +strong-focus-indicators, strong-focus-indicators-color, strong-focus-indicators-theme; +@forward 'focus-indicators' as mat-* hide mat-strong-focus-indicators-border-color; @import '../theming/theming'; @import '../style/layout-common'; diff --git a/src/material/core/focus-indicators/_focus-indicators.scss b/src/material/core/focus-indicators/_focus-indicators.scss index ce277c6a49b8..85488c3c8446 100644 --- a/src/material/core/focus-indicators/_focus-indicators.scss +++ b/src/material/core/focus-indicators/_focus-indicators.scss @@ -112,8 +112,8 @@ @include _mat-strong-focus-indicators-border-color($theme-or-color); } @else { - $theme: theming.legacy-get-theme($theme-or-color); - @include theming.check-duplicate-theme-styles($theme, 'mat-strong-focus-indicators') { + $theme: theming.private-legacy-get-theme($theme-or-color); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-strong-focus-indicators') { $color: theming.get-color-config($theme); @if $color != null { @include strong-focus-indicators-color($color); @@ -125,7 +125,7 @@ // Mixin that ensures focus indicator host elements are positioned so that the focus indicator // pseudo element within is positioned relative to the host. Private mixin included within // `mat-core`. -@mixin strong-focus-indicators-positioning() { +@mixin private-strong-focus-indicators-positioning() { .mat-focus-indicator { position: relative; } diff --git a/src/material/core/option/_optgroup-theme.import.scss b/src/material/core/option/_optgroup-theme.import.scss index 56c1e394b0c5..adc33c8718c5 100644 --- a/src/material/core/option/_optgroup-theme.import.scss +++ b/src/material/core/option/_optgroup-theme.import.scss @@ -7,14 +7,8 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward '../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../theming/theming' as mat-private-* hide $mat-private-theme-ignore-duplication-warnings, -mat-private-color, mat-private-contrast, mat-private-dark-theme, mat-private-get-color-config, -mat-private-get-density-config, mat-private-get-typography-config, mat-private-light-theme, -mat-private-palette; +@forward '../density/private/compatibility' as mat-*; +@forward '../theming/theming' as mat-*; @forward '../typography/typography-utils' as mat-* hide mat-font-shorthand, mat-height, mat-level-to-styles; @forward '../typography/typography-utils' as mat-line-* hide mat-line-font-family, diff --git a/src/material/core/option/_optgroup-theme.scss b/src/material/core/option/_optgroup-theme.scss index dc74195fe596..836d131eb96e 100644 --- a/src/material/core/option/_optgroup-theme.scss +++ b/src/material/core/option/_optgroup-theme.scss @@ -26,8 +26,8 @@ @mixin _mat-optgroup-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-optgroup') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-optgroup') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/core/option/_option-theme.import.scss b/src/material/core/option/_option-theme.import.scss index d5ea0d628d06..0f71426b0252 100644 --- a/src/material/core/option/_option-theme.import.scss +++ b/src/material/core/option/_option-theme.import.scss @@ -7,14 +7,8 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward '../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../theming/theming' as mat-private-* hide $mat-private-theme-ignore-duplication-warnings, -mat-private-color, mat-private-contrast, mat-private-dark-theme, mat-private-get-color-config, -mat-private-get-density-config, mat-private-get-typography-config, mat-private-light-theme, -mat-private-palette; +@forward '../density/private/compatibility' as mat-*; +@forward '../theming/theming' as mat-*; @forward '../typography/typography-utils' as mat-* hide mat-font-shorthand, mat-height, mat-level-to-styles; @forward '../typography/typography-utils' as mat-line-* hide mat-line-font-family, diff --git a/src/material/core/option/_option-theme.scss b/src/material/core/option/_option-theme.scss index 86067802e9e0..be3ea6890f35 100644 --- a/src/material/core/option/_option-theme.scss +++ b/src/material/core/option/_option-theme.scss @@ -60,8 +60,8 @@ @mixin _mat-option-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-option') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-option') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/core/ripple/_ripple.import.scss b/src/material/core/ripple/_ripple.import.scss index 9d62afca5d7c..af13cce67e5a 100644 --- a/src/material/core/ripple/_ripple.import.scss +++ b/src/material/core/ripple/_ripple.import.scss @@ -7,14 +7,8 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward '../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../theming/theming' as mat-private-* hide $mat-private-theme-ignore-duplication-warnings, -mat-private-color, mat-private-contrast, mat-private-dark-theme, mat-private-get-color-config, -mat-private-get-density-config, mat-private-get-typography-config, mat-private-light-theme, -mat-private-palette; +@forward '../density/private/compatibility' as mat-*; +@forward '../theming/theming' as mat-*; @forward '../../../cdk/a11y/a11y.import'; @forward 'ripple' as mat-* hide $mat-color-opacity, mat-color, mat-theme; @forward 'ripple' as mat-ripple-* hide mat-ripple-ripple; diff --git a/src/material/core/ripple/_ripple.scss b/src/material/core/ripple/_ripple.scss index 4868dba5a15a..4c3cbefb6f0d 100644 --- a/src/material/core/ripple/_ripple.scss +++ b/src/material/core/ripple/_ripple.scss @@ -65,8 +65,8 @@ $color-opacity: 0.1; } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-ripple') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-ripple') { $color: theming.get-color-config($theme); @if $color != null { @include color($color); diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss index 789f1398f50a..bbccc7375bea 100644 --- a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss +++ b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss @@ -7,14 +7,8 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../../density/private/compatibility' as mat-private-*; -@forward '../../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../../theming/theming' as mat-private-* hide -$mat-private-theme-ignore-duplication-warnings, mat-private-color, mat-private-contrast, -mat-private-dark-theme, mat-private-get-color-config, mat-private-get-density-config, -mat-private-get-typography-config, mat-private-light-theme, mat-private-palette; +@forward '../../density/private/compatibility' as mat-*; +@forward '../../theming/theming' as mat-*; @forward 'pseudo-checkbox-theme' hide color, theme, typography; @forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density; diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss index a2efb593417a..dd1b373029c8 100644 --- a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss +++ b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.scss @@ -64,8 +64,8 @@ @mixin _mat-pseudo-checkbox-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-pseudo-checkbox') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-pseudo-checkbox') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/core/selection/pseudo-checkbox/pseudo-checkbox.scss b/src/material/core/selection/pseudo-checkbox/pseudo-checkbox.scss index f5d440965c43..b5f903246ecc 100644 --- a/src/material/core/selection/pseudo-checkbox/pseudo-checkbox.scss +++ b/src/material/core/selection/pseudo-checkbox/pseudo-checkbox.scss @@ -38,7 +38,7 @@ $_mat-pseudo-checkmark-size: checkbox-common.$size - (2 * $_mat-pseudo-checkbox- border-color: transparent; } - @include private.animation-noop { + @include private.private-animation-noop { &::after { transition: none; } diff --git a/src/material/core/style/_form-common.import.scss b/src/material/core/style/_form-common.import.scss index e74d81aad1d5..327882578125 100644 --- a/src/material/core/style/_form-common.import.scss +++ b/src/material/core/style/_form-common.import.scss @@ -7,14 +7,8 @@ $mat-black-87-opacity, $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-fo $mat-dark-primary-text, $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward '../theming/theming' as mat-* hide mat-check-duplicate-theme-styles, -mat-create-backwards-compatibility-theme, mat-is-legacy-constructed-theme, mat-is-theme-object, -mat-legacy-get-theme; -@forward '../theming/theming' as mat-private-* hide $mat-private-theme-ignore-duplication-warnings, -mat-private-color, mat-private-contrast, mat-private-dark-theme, mat-private-get-color-config, -mat-private-get-density-config, mat-private-get-typography-config, mat-private-light-theme, -mat-private-palette; -@forward 'form-common' as mat-private-*; +@forward '../density/private/compatibility' as mat-*; +@forward '../theming/theming' as mat-*; +@forward 'form-common' as mat-*; @import '../theming/theming'; diff --git a/src/material/core/style/_form-common.scss b/src/material/core/style/_form-common.scss index a482ddec9d09..a9a0ac3412dd 100644 --- a/src/material/core/style/_form-common.scss +++ b/src/material/core/style/_form-common.scss @@ -4,7 +4,7 @@ // Renders a gradient for showing the dashed line when the input is disabled. // Unlike using a border, a gradient allows us to adjust the spacing of the dotted line // to match the Material Design spec. -@mixin control-disabled-underline($color) { +@mixin private-control-disabled-underline($color) { background-image: linear-gradient(to right, $color 0%, $color 33%, transparent 0%); background-size: 4px 100%; background-repeat: repeat-x; @@ -13,7 +13,7 @@ // Figures out the color of the placeholder for a form control. // Used primarily to prevent the various form controls from // becoming out of sync since these colors aren't in a palette. -@function control-placeholder-color($config) { +@function private-control-placeholder-color($config) { $foreground: map.get($config, foreground); $is-dark-theme: map.get($config, is-dark); @return theming.color($foreground, secondary-text, if($is-dark-theme, 0.5, 0.42)); diff --git a/src/material/core/style/_private.import.scss b/src/material/core/style/_private.import.scss index af8654301147..4a0d646c3120 100644 --- a/src/material/core/style/_private.import.scss +++ b/src/material/core/style/_private.import.scss @@ -10,6 +10,6 @@ $mat-z-index-fab; $mat-transition-timing-function, mat-transition, mat-transition-property-value; @forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-overridable-elevation; -@forward 'private' as mat-private-*; +@forward 'private' as mat-*; @import './elevation'; diff --git a/src/material/core/style/_private.scss b/src/material/core/style/_private.scss index ad340a756f2a..2eecc6c575a3 100644 --- a/src/material/core/style/_private.scss +++ b/src/material/core/style/_private.scss @@ -1,7 +1,7 @@ @use 'sass:map'; @use './elevation'; -@mixin theme-elevation($zValue, $config, $opacity: elevation.$opacity) { +@mixin private-theme-elevation($zValue, $config, $opacity: elevation.$opacity) { $foreground: map.get($config, foreground); $elevation-color: map.get($foreground, elevation); $elevation-color-or-default: if($elevation-color == null, elevation.$color, $elevation-color); @@ -9,7 +9,7 @@ @include elevation.elevation($zValue, $elevation-color-or-default, $opacity); } -@mixin theme-overridable-elevation($zValue, $config, $opacity: elevation.$opacity) { +@mixin private-theme-overridable-elevation($zValue, $config, $opacity: elevation.$opacity) { $foreground: map.get($config, foreground); $elevation-color: map.get($foreground, elevation); $elevation-color-or-default: if($elevation-color == null, elevation.$color, $elevation-color); @@ -21,7 +21,7 @@ // prevent non css animations from running. // NOTE: Currently this mixin should only be used with components that do not // have any projected content. -@mixin animation-noop() { +@mixin private-animation-noop() { // @at-root is used to steps outside of the hierarchy of the scss rules. This is // done to allow a class to be added to be added to base of the scss nesting // context. diff --git a/src/material/core/theming/_all-theme.scss b/src/material/core/theming/_all-theme.scss index d8ea61e7ba4d..8f4d443bfc7b 100644 --- a/src/material/core/theming/_all-theme.scss +++ b/src/material/core/theming/_all-theme.scss @@ -39,7 +39,7 @@ // Create a theme. @mixin angular-material-theme($theme-or-color-config) { $dedupe-key: 'angular-material-theme'; - @include theming.check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) { + @include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) { @include core.theme($theme-or-color-config); @include autocomplete-theme.theme($theme-or-color-config); @include badge-theme.theme($theme-or-color-config); @@ -53,7 +53,7 @@ @include datepicker-theme.theme($theme-or-color-config); @include dialog-theme.theme($theme-or-color-config); @include divider-theme.theme($theme-or-color-config); - @include expansion-theme.panel-theme($theme-or-color-config); + @include expansion-theme.theme($theme-or-color-config); @include form-field-theme.theme($theme-or-color-config); @include grid-list-theme.theme($theme-or-color-config); @include icon-theme.theme($theme-or-color-config); diff --git a/src/material/core/theming/_theming.import.scss b/src/material/core/theming/_theming.import.scss index 114449b449da..e2dc1caed9f7 100644 --- a/src/material/core/theming/_theming.import.scss +++ b/src/material/core/theming/_theming.import.scss @@ -7,23 +7,14 @@ $mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primar $mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity, $mat-white-87-opacity; -@forward '../density/private/compatibility' as mat-private-*; -@forward 'theming' hide $theme-ignore-duplication-warnings, check-duplicate-theme-styles, color, -contrast, create-backwards-compatibility-theme, dark-theme, get-color-config, get-density-config, -get-typography-config, is-legacy-constructed-theme, is-theme-object, legacy-get-theme, light-theme, -palette; +@forward '../density/private/compatibility' as mat-*; +@forward 'theming' hide $theme-ignore-duplication-warnings, color, contrast, dark-theme, +get-color-config, get-density-config, get-typography-config, light-theme, palette, +private-check-duplicate-theme-styles, private-create-backwards-compatibility-theme, +private-is-legacy-constructed-theme, private-is-theme-object, private-legacy-get-theme; @forward 'theming' as mat-* hide $mat-theme-duplicate-warning, $mat-theme-emitted-color, $mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density, -mat-check-duplicate-theme-styles, mat-create-backwards-compatibility-theme, -mat-create-dark-color-config, mat-create-light-color-config, mat-is-legacy-constructed-theme, -mat-is-theme-object, mat-legacy-get-theme, mat-validate-theme; -@forward 'theming' as mat-private-* hide $mat-private-theme-duplicate-warning, -$mat-private-theme-emitted-color, $mat-private-theme-emitted-density, -$mat-private-theme-emitted-typography, $mat-private-theme-generate-default-density, -$mat-private-theme-ignore-duplication-warnings, mat-private-color, mat-private-contrast, -mat-private-create-dark-color-config, mat-private-create-light-color-config, mat-private-dark-theme, -mat-private-get-color-config, mat-private-get-density-config, mat-private-get-typography-config, -mat-private-light-theme, mat-private-palette, mat-private-validate-theme; +mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme; @import 'palette'; @import '../density/private/compatibility'; diff --git a/src/material/core/theming/_theming.scss b/src/material/core/theming/_theming.scss index dd9dc0df42c2..8756b0976d20 100644 --- a/src/material/core/theming/_theming.scss +++ b/src/material/core/theming/_theming.scss @@ -147,7 +147,7 @@ $_mat-theme-emitted-density: () !default; // If the legacy pattern is used, we generate a container object only with a light-themed // configuration for the `color` theming part. @if $accent != null { - @return create-backwards-compatibility-theme(_mat-validate-theme(( + @return private-create-backwards-compatibility-theme(_mat-validate-theme(( _is-legacy-theme: true, color: _mat-create-light-color-config($primary, $accent, $warn), ))); @@ -163,7 +163,7 @@ $_mat-theme-emitted-density: () !default; $warn: map.get($color-settings, warn); $result: map.merge($result, (color: _mat-create-light-color-config($primary, $accent, $warn))); } - @return create-backwards-compatibility-theme(_mat-validate-theme($result)); + @return private-create-backwards-compatibility-theme(_mat-validate-theme($result)); } // Creates a container object for a dark theme to be given to individual component theme mixins. @@ -184,7 +184,7 @@ $_mat-theme-emitted-density: () !default; // If the legacy pattern is used, we generate a container object only with a dark-themed // configuration for the `color` theming part. @if $accent != null { - @return create-backwards-compatibility-theme(_mat-validate-theme(( + @return private-create-backwards-compatibility-theme(_mat-validate-theme(( _is-legacy-theme: true, color: _mat-create-dark-color-config($primary, $accent, $warn), ))); @@ -200,13 +200,13 @@ $_mat-theme-emitted-density: () !default; $warn: map.get($color-settings, warn); $result: map.merge($result, (color: _mat-create-dark-color-config($primary, $accent, $warn))); } - @return create-backwards-compatibility-theme(_mat-validate-theme($result)); + @return private-create-backwards-compatibility-theme(_mat-validate-theme($result)); } /// Gets the color configuration from the given theme or configuration. @function get-color-config($theme, $default: null) { // If a configuration has been passed, return the config directly. - @if not is-theme-object($theme) { + @if not private-is-theme-object($theme) { @return $theme; } // If the theme has been constructed through the legacy theming API, we use the theme object @@ -214,7 +214,7 @@ $_mat-theme-emitted-density: () !default; // backwards compatibility, we copied the color configuration from `$theme.color` to `$theme`. // Hence developers could customize the colors at top-level and want to respect these changes // TODO: Remove when legacy theming API is removed. - @if is-legacy-constructed-theme($theme) { + @if private-is-legacy-constructed-theme($theme) { @return $theme; } @if map.has-key($theme, color) { @@ -226,7 +226,7 @@ $_mat-theme-emitted-density: () !default; /// Gets the density configuration from the given theme or configuration. @function get-density-config($theme-or-config, $default: 0) { // If a configuration has been passed, return the config directly. - @if not is-theme-object($theme-or-config) { + @if not private-is-theme-object($theme-or-config) { @return $theme-or-config; } // In case a theme has been passed, extract the configuration if present, @@ -241,7 +241,7 @@ $_mat-theme-emitted-density: () !default; /// For backwards compatibility, typography is not included by default. @function get-typography-config($theme-or-config, $default: null) { // If a configuration has been passed, return the config directly. - @if not is-theme-object($theme-or-config) { + @if not private-is-theme-object($theme-or-config) { @return $theme-or-config; } // In case a theme has been passed, extract the configuration if present, @@ -269,8 +269,8 @@ $_mat-theme-emitted-density: () !default; // id. This is necessary because a given theme can be passed to multiple disjoint theme mixins // (e.g. `angular-material-theme` and `angular-material-mdc-theme`) without causing any // style duplication. -@mixin check-duplicate-theme-styles($theme-or-color-config, $id) { - $theme: legacy-get-theme($theme-or-color-config); +@mixin private-check-duplicate-theme-styles($theme-or-color-config, $id) { + $theme: private-legacy-get-theme($theme-or-color-config); $color-config: get-color-config($theme); $density-config: get-density-config($theme); $typography-config: get-typography-config($theme); @@ -307,7 +307,7 @@ $_mat-theme-emitted-density: () !default; // Only report a warning if density styles would be duplicated for non-legacy theme // definitions. For legacy themes, we have compatibility logic that avoids duplication // of default density styles. We don't want to report a warning in those cases. - @if is-legacy-constructed-theme($theme) { + @if private-is-legacy-constructed-theme($theme) { $duplicate-legacy-density: true; } @else if not $theme-ignore-duplication-warnings { @@ -339,19 +339,19 @@ $_mat-theme-emitted-density: () !default; // styles **once** and at root. This matches the old behavior where density styles were // part of the base component styles (that did not use view encapsulation). // TODO: Remove this compatibility logic when the legacy theming API is removed. - compatibility.$density-generate-at-root: is-legacy-constructed-theme($theme); - compatibility.$density-generate-styles: not $duplicate-legacy-density; + compatibility.$private-density-generate-at-root: private-is-legacy-constructed-theme($theme); + compatibility.$private-density-generate-styles: not $duplicate-legacy-density; @content; $theme-ignore-duplication-warnings: $orig-mat-theme-ignore-duplication-warnings !global; - compatibility.$density-generate-at-root: false; - compatibility.$density-generate-styles: true; + compatibility.$private-density-generate-at-root: false; + compatibility.$private-density-generate-styles: true; } // Checks whether the given value resolves to a theme object. Theme objects are always // of type `map` and can optionally only specify `color`, `density` or `typography`. -@function is-theme-object($value) { +@function private-is-theme-object($value) { @return meta.type-of($value) == 'map' and ( map.has-key($value, color) or map.has-key($value, density) or @@ -361,7 +361,7 @@ $_mat-theme-emitted-density: () !default; } // Checks whether a given value corresponds to a legacy constructed theme. -@function is-legacy-constructed-theme($value) { +@function private-is-legacy-constructed-theme($value) { @return meta.type-of($value) == 'map' and map.get($value, '_is-legacy-theme'); } @@ -382,7 +382,7 @@ $_mat-theme-emitted-density: () !default; // Note that the `$theme.primary` key does usually not exist since the color configuration // is stored in `$theme.color` which contains a property for `primary`. This method copies // the map from `$theme.color` to `$theme` for backwards compatibility. -@function create-backwards-compatibility-theme($theme) { +@function private-create-backwards-compatibility-theme($theme) { @if not map.get($theme, color) { @return $theme; } @@ -397,11 +397,11 @@ $_mat-theme-emitted-density: () !default; // construct a theme manually and pass it to a theme. We support this for backwards compatibility. // TODO(devversion): remove this in the future. Constructing themes manually is rare, // and the code can be easily updated to the new API. -@function legacy-get-theme($theme-or-color-config) { - @if is-theme-object($theme-or-color-config) { +@function private-legacy-get-theme($theme-or-color-config) { + @if private-is-theme-object($theme-or-color-config) { @return $theme-or-color-config; } - @return create-backwards-compatibility-theme(( + @return private-create-backwards-compatibility-theme(( _is-legacy-theme: true, color: $theme-or-color-config )); diff --git a/src/material/core/theming/tests/test-theming-api.scss b/src/material/core/theming/tests/test-theming-api.scss index e024a1dc11d9..290b578fb409 100644 --- a/src/material/core/theming/tests/test-theming-api.scss +++ b/src/material/core/theming/tests/test-theming-api.scss @@ -214,7 +214,7 @@ $dark-theme-only-typography: theming.dark-theme((typography: $typography-config) // Custom theme mixin used by the custom theme backwards compatibility test. @mixin _my-custom-theme-new-api($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); + $theme: theming.private-legacy-get-theme($theme-or-color-config); $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); diff --git a/src/material/core/typography/_all-typography.scss b/src/material/core/typography/_all-typography.scss index 297ed74c971e..1111641ca6f7 100644 --- a/src/material/core/typography/_all-typography.scss +++ b/src/material/core/typography/_all-typography.scss @@ -40,7 +40,7 @@ // Includes all of the typographic styles. @mixin angular-material-typography($config-or-theme: null) { - $config: if(theming.is-theme-object($config-or-theme), + $config: if(theming.private-is-theme-object($config-or-theme), theming.get-typography-config($config-or-theme), $config-or-theme); // If no actual color configuration has been specified, create a default one. @@ -67,7 +67,7 @@ @include table-theme.typography($config); @include datepicker-theme.typography($config); @include dialog-theme.typography($config); - @include expansion-theme.panel-typography($config); + @include expansion-theme.typography($config); @include form-field-theme.typography($config); @include grid-list-theme.typography($config); @include icon-theme.typography($config); diff --git a/src/material/core/typography/_typography.import.scss b/src/material/core/typography/_typography.import.scss index bff5326441be..4654c0ff983d 100644 --- a/src/material/core/typography/_typography.import.scss +++ b/src/material/core/typography/_typography.import.scss @@ -4,12 +4,9 @@ mat-line-font-size, mat-line-font-weight, mat-line-letter-spacing, mat-line-leve @forward 'typography-utils' as mat-typography-* hide mat-typography-font-family, mat-typography-font-size, mat-typography-font-weight, mat-typography-height, mat-typography-letter-spacing; -@forward 'typography' as mat-* hide mat-config, mat-level, mat-typography-is-2014-config, -mat-typography-is-2018-config, mat-typography-to-2014-config, mat-typography-to-2018-config; -@forward 'typography' as mat-private-* hide mat-private-base-typography, mat-private-config, -mat-private-level; +@forward 'typography' as mat-* hide mat-config, mat-level; @forward 'typography' as mat-typography-* hide mat-typography-base-typography, -mat-typography-typography-is-2014-config, mat-typography-typography-is-2018-config, -mat-typography-typography-to-2014-config, mat-typography-typography-to-2018-config; +mat-typography-private-typography-is-2014-config, mat-typography-private-typography-is-2018-config, +mat-typography-private-typography-to-2014-config, mat-typography-private-typography-to-2018-config; @import 'typography-utils'; diff --git a/src/material/core/typography/_typography.scss b/src/material/core/typography/_typography.scss index 921580af35ff..4e719651bddc 100644 --- a/src/material/core/typography/_typography.scss +++ b/src/material/core/typography/_typography.scss @@ -71,12 +71,12 @@ } // Whether a config is for the Material Design 2018 typography system. -@function typography-is-2018-config($config) { +@function private-typography-is-2018-config($config) { @return map.get($config, headline-1) != null; } // Whether a config is for the Material Design 2014 typography system. -@function typography-is-2014-config($config) { +@function private-typography-is-2014-config($config) { @return map.get($config, headline) != null; } @@ -84,8 +84,8 @@ // produces a normalized typography config for the 2014 Material Design typography system. // 2014 - https://material.io/archive/guidelines/style/typography.html#typography-styles // 2018 - https://material.io/design/typography/the-type-system.html#type-scale -@function typography-to-2014-config($config) { - @if typography-is-2018-config($config) { +@function private-typography-to-2014-config($config) { + @if private-typography-is-2018-config($config) { @return config( $display-4: map.get($config, headline-1), $display-3: map.get($config, headline-2), @@ -108,8 +108,8 @@ // produces a normalized typography config for the 2018 Material Design typography system. // 2014 - https://material.io/archive/guidelines/style/typography.html#typography-styles // 2018 - https://material.io/design/typography/the-type-system.html#type-scale -@function typography-to-2018-config($config) { - @if typography-is-2014-config($config) { +@function private-typography-to-2018-config($config) { + @if private-typography-is-2014-config($config) { @return ( headline-1: map.get($config, display-4), headline-2: map.get($config, display-3), diff --git a/src/material/datepicker/_datepicker-theme.scss b/src/material/datepicker/_datepicker-theme.scss index fbc0c3204d69..719cc3725c56 100644 --- a/src/material/datepicker/_datepicker-theme.scss +++ b/src/material/datepicker/_datepicker-theme.scss @@ -148,7 +148,7 @@ $calendar-weekday-table-font-size: 11px !default; @include _mat-datepicker-color(map.get($config, primary)); .mat-datepicker-content { - @include private.theme-elevation(4, $config); + @include private.private-theme-elevation(4, $config); background-color: theming.color($background, card); color: theming.color($foreground, text); @@ -162,7 +162,7 @@ $calendar-weekday-table-font-size: 11px !default; } .mat-datepicker-content-touch { - @include private.theme-elevation(0, $config); + @include private.private-theme-elevation(0, $config); } .mat-datepicker-toggle-active { @@ -247,8 +247,8 @@ $calendar-weekday-table-font-size: 11px !default; @mixin _mat-datepicker-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-datepicker') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-datepicker') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/dialog/_dialog-theme.scss b/src/material/dialog/_dialog-theme.scss index 21c740431aad..1e1986e5a538 100644 --- a/src/material/dialog/_dialog-theme.scss +++ b/src/material/dialog/_dialog-theme.scss @@ -11,7 +11,7 @@ $foreground: map.get($config, foreground); .mat-dialog-container { - @include private.theme-elevation(24, $config); + @include private.private-theme-elevation(24, $config); background: theming.color($background, dialog); color: theming.color($foreground, text); } @@ -27,8 +27,8 @@ @mixin _mat-dialog-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-dialog') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-dialog') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/divider/_divider-theme.scss b/src/material/divider/_divider-theme.scss index e47631d8a0ee..44676a9b67f0 100644 --- a/src/material/divider/_divider-theme.scss +++ b/src/material/divider/_divider-theme.scss @@ -20,8 +20,8 @@ @mixin _mat-divider-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-divider') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-divider') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/expansion/_expansion-mixins.import.scss b/src/material/expansion/_expansion-mixins.import.scss index 210e15feaaf6..ce27c4a0ff30 100644 --- a/src/material/expansion/_expansion-mixins.import.scss +++ b/src/material/expansion/_expansion-mixins.import.scss @@ -1 +1 @@ -@forward 'expansion-mixins' as mat-private-*; +@forward 'expansion-mixins' as mat-*; diff --git a/src/material/expansion/_expansion-mixins.scss b/src/material/expansion/_expansion-mixins.scss index 3f8753addfc5..fc79d09633f8 100644 --- a/src/material/expansion/_expansion-mixins.scss +++ b/src/material/expansion/_expansion-mixins.scss @@ -1,4 +1,4 @@ -@mixin expansion-focus { +@mixin private-expansion-focus { .mat-expansion-panel { & .mat-expansion-panel-header.cdk-keyboard-focused, & .mat-expansion-panel-header.cdk-program-focused, diff --git a/src/material/expansion/_expansion-theme.import.scss b/src/material/expansion/_expansion-theme.import.scss index 881bb35d8bb0..77b02cd64727 100644 --- a/src/material/expansion/_expansion-theme.import.scss +++ b/src/material/expansion/_expansion-theme.import.scss @@ -1,9 +1,9 @@ @forward '../core/theming/theming.import'; @forward '../core/style/private.import'; -@forward 'expansion-variables' as mat-expansion-*; +@forward 'expansion-variables' as mat-expansion-panel-*; @forward '../core/typography/typography-utils.import'; -@forward 'expansion-mixins' as mat-private-*; -@forward 'expansion-theme' as mat-expansion-*; +@forward 'expansion-mixins' as mat-*; +@forward 'expansion-theme' as mat-expansion-panel-*; @import '../core/density/private/compatibility'; @import '../core/theming/palette'; diff --git a/src/material/expansion/_expansion-theme.scss b/src/material/expansion/_expansion-theme.scss index 8dfeb4164b0c..5d359924f3ad 100644 --- a/src/material/expansion/_expansion-theme.scss +++ b/src/material/expansion/_expansion-theme.scss @@ -7,13 +7,13 @@ @use './expansion-variables'; @use './expansion-mixins'; -@mixin panel-color($config-or-theme) { +@mixin color($config-or-theme) { $config: theming.get-color-config($config-or-theme); $background: map.get($config, background); $foreground: map.get($config, foreground); .mat-expansion-panel { - @include private.theme-overridable-elevation(2, $config); + @include private.private-theme-overridable-elevation(2, $config); background: theming.color($background, card); color: theming.color($foreground, text); } @@ -22,7 +22,7 @@ border-top-color: theming.color($foreground, divider); } - @include expansion-mixins.expansion-focus { + @include expansion-mixins.private-expansion-focus { background: theming.color($background, hover); } @@ -54,7 +54,7 @@ } } -@mixin panel-typography($config-or-theme) { +@mixin typography($config-or-theme) { $config: theming.get-typography-config($config-or-theme); .mat-expansion-panel-header { font: { @@ -69,14 +69,14 @@ } } -@mixin panel-density($config-or-theme) { +@mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $expanded-height: compatibility.density-prop-value( - expansion-variables.$panel-header-density-config, $density-scale, expanded-height); - $collapsed-height: compatibility.density-prop-value( - expansion-variables.$panel-header-density-config, $density-scale, collapsed-height); + $expanded-height: compatibility.private-density-prop-value( + expansion-variables.$header-density-config, $density-scale, expanded-height); + $collapsed-height: compatibility.private-density-prop-value( + expansion-variables.$header-density-config, $density-scale, collapsed-height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-expansion-panel-header { height: $collapsed-height; @@ -87,21 +87,21 @@ } } -@mixin panel-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-expansion-panel') { +@mixin theme($theme-or-color-config) { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-expansion-panel') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @if $color != null { - @include panel-color($color); + @include color($color); } @if $density != null { - @include panel-density($density); + @include density($density); } @if $typography != null { - @include panel-typography($typography); + @include typography($typography); } } } diff --git a/src/material/expansion/_expansion-variables.import.scss b/src/material/expansion/_expansion-variables.import.scss index 87333b8a8fa6..0c0f688c395b 100644 --- a/src/material/expansion/_expansion-variables.import.scss +++ b/src/material/expansion/_expansion-variables.import.scss @@ -1 +1 @@ -@forward 'expansion-variables' as mat-expansion-*; +@forward 'expansion-variables' as mat-expansion-panel-*; diff --git a/src/material/expansion/_expansion-variables.scss b/src/material/expansion/_expansion-variables.scss index 19d0aa0eee33..d69761731484 100644 --- a/src/material/expansion/_expansion-variables.scss +++ b/src/material/expansion/_expansion-variables.scss @@ -1,30 +1,30 @@ // Default minimum and maximum height for collapsed panel headers. -$panel-header-collapsed-height: 48px !default; -$panel-header-collapsed-minimum-height: 36px !default; -$panel-header-collapsed-maximum-height: - $panel-header-collapsed-height !default; +$header-collapsed-height: 48px !default; +$header-collapsed-minimum-height: 36px !default; +$header-collapsed-maximum-height: + $header-collapsed-height !default; // Default minimum and maximum height for expanded panel headers. -$panel-header-expanded-height: 64px !default; -$panel-header-expanded-minimum-height: 48px !default; -$panel-header-expanded-maximum-height: - $panel-header-expanded-height !default; +$header-expanded-height: 64px !default; +$header-expanded-minimum-height: 48px !default; +$header-expanded-maximum-height: + $header-expanded-height !default; // Density configuration for the expansion panel. Captures the // height for both expanded and collapsed panel headers. -$panel-header-density-config: ( +$header-density-config: ( collapsed-height: ( - default: $panel-header-collapsed-height, - maximum: $panel-header-collapsed-maximum-height, - minimum: $panel-header-collapsed-minimum-height, + default: $header-collapsed-height, + maximum: $header-collapsed-maximum-height, + minimum: $header-collapsed-minimum-height, ), expanded-height: ( - default: $panel-header-expanded-height, - maximum: $panel-header-expanded-maximum-height, - minimum: $panel-header-expanded-minimum-height, + default: $header-expanded-height, + maximum: $header-expanded-maximum-height, + minimum: $header-expanded-minimum-height, ) ) !default; // Note: Keep this in sync with the animation timing for the toggle indicator // and body expansion. These are animated using Angular animations. -$panel-header-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1); +$header-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1); diff --git a/src/material/expansion/expansion-panel-header.scss b/src/material/expansion/expansion-panel-header.scss index 2895e9cf0dd7..278c281f1764 100644 --- a/src/material/expansion/expansion-panel-header.scss +++ b/src/material/expansion/expansion-panel-header.scss @@ -9,7 +9,7 @@ align-items: center; padding: 0 24px; border-radius: inherit; - transition: height expansion-variables.$panel-header-transition; + transition: height expansion-variables.$header-transition; // If the `NoopAnimationsModule` is used, disable the height transition. &._mat-animation-noopable { @@ -81,7 +81,7 @@ } @include a11y.high-contrast(active, off) { - @include expansion-mixins.expansion-focus { + @include expansion-mixins.private-expansion-focus { &::before { // These styles are identical to the ones generated for all // `.mat-focus-indicator` when strong focus indication is enabled. diff --git a/src/material/form-field/_form-field-fill-theme.import.scss b/src/material/form-field/_form-field-fill-theme.import.scss index 8e8f7148187d..3d26f476e65f 100644 --- a/src/material/form-field/_form-field-fill-theme.import.scss +++ b/src/material/form-field/_form-field-fill-theme.import.scss @@ -1,12 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; @forward 'form-field-fill-theme' hide $fill-dedupe, fill-color, fill-theme, fill-typography, -form-field-fill-density; +private-form-field-fill-density; +@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color, +mat-fill-label-floating, mat-fill-theme, mat-fill-typography; @forward 'form-field-fill-theme' as mat-form-field-* hide mat-form-field-fill-label-floating, -mat-form-field-form-field-fill-density; -@forward 'form-field-fill-theme' as mat-private-* hide $mat-private-fill-dedupe, -mat-private-fill-color, mat-private-fill-label-floating, mat-private-fill-theme, -mat-private-fill-typography; +mat-form-field-private-form-field-fill-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-fill-theme.scss b/src/material/form-field/_form-field-fill-theme.scss index c57f2b88c709..b562ddc1a5cf 100644 --- a/src/material/form-field/_form-field-fill-theme.scss +++ b/src/material/form-field/_form-field-fill-theme.scss @@ -102,11 +102,11 @@ $fill-dedupe: 0; } } -@mixin form-field-fill-density($config-or-theme) {} +@mixin private-form-field-fill-density($config-or-theme) {} @mixin fill-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-form-field-fill') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field-fill') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -115,7 +115,7 @@ $fill-dedupe: 0; @include fill-color($color); } @if $density != null { - @include form-field-fill-density($density); + @include private-form-field-fill-density($density); } @if $typography != null { @include fill-typography($typography); diff --git a/src/material/form-field/_form-field-legacy-theme.import.scss b/src/material/form-field/_form-field-legacy-theme.import.scss index 22967e290c25..5ddf9b7bbfea 100644 --- a/src/material/form-field/_form-field-legacy-theme.import.scss +++ b/src/material/form-field/_form-field-legacy-theme.import.scss @@ -1,13 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward 'form-field-legacy-theme' hide $legacy-dedupe, form-field-legacy-density, legacy-color, -legacy-theme, legacy-typography; -@forward 'form-field-legacy-theme' as mat-form-field-* hide -mat-form-field-form-field-legacy-density, mat-form-field-legacy-label-floating, -mat-form-field-legacy-label-floating-print; -@forward 'form-field-legacy-theme' as mat-private-* hide $mat-private-legacy-dedupe, -mat-private-legacy-color, mat-private-legacy-label-floating, -mat-private-legacy-label-floating-print, mat-private-legacy-theme, mat-private-legacy-typography; +@forward 'form-field-legacy-theme' hide $legacy-dedupe, legacy-color, legacy-theme, +legacy-typography, private-form-field-legacy-density; +@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color, +mat-legacy-label-floating, mat-legacy-label-floating-print, mat-legacy-theme, mat-legacy-typography; +@forward 'form-field-legacy-theme' as mat-form-field-* hide mat-form-field-legacy-label-floating, +mat-form-field-legacy-label-floating-print, mat-form-field-private-form-field-legacy-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-legacy-theme.scss b/src/material/form-field/_form-field-legacy-theme.scss index a4975dc05e7e..980f874c07ae 100644 --- a/src/material/form-field/_form-field-legacy-theme.scss +++ b/src/material/form-field/_form-field-legacy-theme.scss @@ -29,7 +29,7 @@ } &.mat-form-field-disabled .mat-form-field-underline { - @include form-common.control-disabled-underline($underline-color); + @include form-common.private-control-disabled-underline($underline-color); } } } @@ -175,11 +175,11 @@ $legacy-dedupe: 0; } } -@mixin form-field-legacy-density($config-or-theme) {} +@mixin private-form-field-legacy-density($config-or-theme) {} @mixin legacy-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-form-field-legacy') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field-legacy') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -188,7 +188,7 @@ $legacy-dedupe: 0; @include legacy-color($color); } @if $density != null { - @include form-field-legacy-density($density); + @include private-form-field-legacy-density($density); } @if $typography != null { @include legacy-typography($typography); diff --git a/src/material/form-field/_form-field-outline-theme.import.scss b/src/material/form-field/_form-field-outline-theme.import.scss index ee99b0c26c1f..f4ad9ac8d6c5 100644 --- a/src/material/form-field/_form-field-outline-theme.import.scss +++ b/src/material/form-field/_form-field-outline-theme.import.scss @@ -1,12 +1,11 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; -@forward 'form-field-outline-theme' hide $outline-dedupe, form-field-outline-density, outline-color, -outline-theme, outline-typography; -@forward 'form-field-outline-theme' as mat-form-field-* hide -mat-form-field-form-field-outline-density, mat-form-field-outline-label-floating; -@forward 'form-field-outline-theme' as mat-private-* hide $mat-private-outline-dedupe, -mat-private-outline-color, mat-private-outline-label-floating, mat-private-outline-theme, -mat-private-outline-typography; +@forward 'form-field-outline-theme' hide $outline-dedupe, outline-color, outline-theme, +outline-typography, private-form-field-outline-density; +@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color, +mat-outline-label-floating, mat-outline-theme, mat-outline-typography; +@forward 'form-field-outline-theme' as mat-form-field-* hide mat-form-field-outline-label-floating, +mat-form-field-private-form-field-outline-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-outline-theme.scss b/src/material/form-field/_form-field-outline-theme.scss index 1b5d1c94e2dc..60cfaf3a0713 100644 --- a/src/material/form-field/_form-field-outline-theme.scss +++ b/src/material/form-field/_form-field-outline-theme.scss @@ -132,11 +132,11 @@ $outline-dedupe: 0; } } -@mixin form-field-outline-density($config-or-theme) {} +@mixin private-form-field-outline-density($config-or-theme) {} @mixin outline-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-form-field-outline') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field-outline') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -145,7 +145,7 @@ $outline-dedupe: 0; @include outline-color($color); } @if $density != null { - @include form-field-outline-density($density); + @include private-form-field-outline-density($density); } @if $typography != null { @include outline-typography($typography); diff --git a/src/material/form-field/_form-field-standard-theme.import.scss b/src/material/form-field/_form-field-standard-theme.import.scss index 65daf33fd065..e47749fe3563 100644 --- a/src/material/form-field/_form-field-standard-theme.import.scss +++ b/src/material/form-field/_form-field-standard-theme.import.scss @@ -1,9 +1,9 @@ @forward '../core/style/form-common.import'; @forward '../core/typography/typography-utils.import'; +@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme, +mat-standard-typography; @forward 'form-field-standard-theme' as mat-form-field-* hide -mat-form-field-form-field-standard-density; -@forward 'form-field-standard-theme' as mat-private-* hide mat-private-standard-color, -mat-private-standard-theme, mat-private-standard-typography; +mat-form-field-private-form-field-standard-density; @import '../core/theming/palette'; @import '../core/theming/theming'; diff --git a/src/material/form-field/_form-field-standard-theme.scss b/src/material/form-field/_form-field-standard-theme.scss index 5ead8bcdd228..a96685bd8df1 100644 --- a/src/material/form-field/_form-field-standard-theme.scss +++ b/src/material/form-field/_form-field-standard-theme.scss @@ -20,18 +20,18 @@ } &.mat-form-field-disabled .mat-form-field-underline { - @include form-common.control-disabled-underline($underline-color); + @include form-common.private-control-disabled-underline($underline-color); } } } @mixin standard-typography($config-or-theme) {} -@mixin form-field-standard-density($config-or-theme) {} +@mixin private-form-field-standard-density($config-or-theme) {} @mixin standard-theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-form-field-standard') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field-standard') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); @@ -40,7 +40,7 @@ @include standard-color($color); } @if $density != null { - @include form-field-standard-density($density); + @include private-form-field-standard-density($density); } @if $typography != null { @include standard-typography($typography); diff --git a/src/material/form-field/_form-field-theme.import.scss b/src/material/form-field/_form-field-theme.import.scss index 127147cf9a9b..36523a2d3eb4 100644 --- a/src/material/form-field/_form-field-theme.import.scss +++ b/src/material/form-field/_form-field-theme.import.scss @@ -1,20 +1,21 @@ @forward '../core/style/form-common.import'; -@forward 'form-field-fill-theme' as mat-form-field-* hide mat-form-field-form-field-fill-density; -@forward 'form-field-fill-theme' as mat-private-* hide $mat-private-fill-dedupe, -mat-private-fill-color, mat-private-fill-theme, mat-private-fill-typography; +@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color, mat-fill-theme, +mat-fill-typography; +@forward 'form-field-fill-theme' as mat-form-field-* hide +mat-form-field-private-form-field-fill-density; +@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color, +mat-legacy-theme, mat-legacy-typography; @forward 'form-field-legacy-theme' as mat-form-field-* hide -mat-form-field-form-field-legacy-density; -@forward 'form-field-legacy-theme' as mat-private-* hide $mat-private-legacy-dedupe, -mat-private-legacy-color, mat-private-legacy-theme, mat-private-legacy-typography; +mat-form-field-private-form-field-legacy-density; +@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color, +mat-outline-theme, mat-outline-typography; @forward 'form-field-outline-theme' as mat-form-field-* hide -mat-form-field-form-field-outline-density; -@forward 'form-field-outline-theme' as mat-private-* hide $mat-private-outline-dedupe, -mat-private-outline-color, mat-private-outline-theme, mat-private-outline-typography; +mat-form-field-private-form-field-outline-density; @forward '../core/typography/typography-utils.import'; +@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme, +mat-standard-typography; @forward 'form-field-standard-theme' as mat-form-field-* hide -mat-form-field-form-field-standard-density; -@forward 'form-field-standard-theme' as mat-private-* hide mat-private-standard-color, -mat-private-standard-theme, mat-private-standard-typography; +mat-form-field-private-form-field-standard-density; @forward 'form-field-theme' hide $dedupe, color, density, theme, typography; @forward 'form-field-theme' as mat-form-field-* hide mat-form-field-label-floating; diff --git a/src/material/form-field/_form-field-theme.scss b/src/material/form-field/_form-field-theme.scss index 2803f2d4792a..230066e6c4c3 100644 --- a/src/material/form-field/_form-field-theme.scss +++ b/src/material/form-field/_form-field-theme.scss @@ -240,15 +240,15 @@ $dedupe: 0; @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - @include form-field-legacy-theme.form-field-legacy-density($density-scale); - @include form-field-standard-theme.form-field-standard-density($density-scale); - @include form-field-fill-theme.form-field-fill-density($density-scale); - @include form-field-outline-theme.form-field-outline-density($density-scale); + @include form-field-legacy-theme.private-form-field-legacy-density($density-scale); + @include form-field-standard-theme.private-form-field-standard-density($density-scale); + @include form-field-fill-theme.private-form-field-fill-density($density-scale); + @include form-field-outline-theme.private-form-field-outline-density($density-scale); } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-form-field') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-form-field') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/grid-list/_grid-list-theme.scss b/src/material/grid-list/_grid-list-theme.scss index 07060468def8..929d07a74520 100644 --- a/src/material/grid-list/_grid-list-theme.scss +++ b/src/material/grid-list/_grid-list-theme.scss @@ -19,8 +19,8 @@ @mixin _mat-grid-list-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-grid-list') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-grid-list') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/icon/_icon-theme.scss b/src/material/icon/_icon-theme.scss index 0cad37daa214..83eb97750390 100644 --- a/src/material/icon/_icon-theme.scss +++ b/src/material/icon/_icon-theme.scss @@ -29,8 +29,8 @@ @mixin _mat-icon-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-icon') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-icon') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/input/_input-theme.scss b/src/material/input/_input-theme.scss index 45ab7cce5cf5..8a44e884c02d 100644 --- a/src/material/input/_input-theme.scss +++ b/src/material/input/_input-theme.scss @@ -26,7 +26,7 @@ caret-color: theming.color($primary, text); @include vendor-prefixes.input-placeholder { - color: form-common.control-placeholder-color($config); + color: form-common.private-control-placeholder-color($config); } // On dark themes we set the native `select` color to some shade of white, @@ -78,8 +78,8 @@ @mixin _mat-input-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-input') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-input') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/list/_list-theme.scss b/src/material/list/_list-theme.scss index b616d6754479..e3a5b25d5737 100644 --- a/src/material/list/_list-theme.scss +++ b/src/material/list/_list-theme.scss @@ -97,8 +97,8 @@ @mixin _mat-list-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-list') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-list') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/menu/_menu-theme.scss b/src/material/menu/_menu-theme.scss index 52ff0c4ac41e..603c36650b6f 100644 --- a/src/material/menu/_menu-theme.scss +++ b/src/material/menu/_menu-theme.scss @@ -11,7 +11,7 @@ $foreground: map.get($config, foreground); .mat-menu-panel { - @include private.theme-overridable-elevation(4, $config); + @include private.private-theme-overridable-elevation(4, $config); background: theming.color($background, 'card'); } @@ -57,8 +57,8 @@ @mixin _mat-menu-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-menu') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-menu') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/paginator/_paginator-theme.scss b/src/material/paginator/_paginator-theme.scss index cabcf7c759b1..960c4e14bdf1 100644 --- a/src/material/paginator/_paginator-theme.scss +++ b/src/material/paginator/_paginator-theme.scss @@ -53,10 +53,10 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $height: compatibility.density-prop-value(paginator-variables.$density-config, $density-scale, - height); + $height: compatibility.private-density-prop-value(paginator-variables.$density-config, + $density-scale, height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-paginator-container { min-height: $height; } @@ -64,8 +64,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-paginator') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-paginator') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/progress-bar/_progress-bar-theme.scss b/src/material/progress-bar/_progress-bar-theme.scss index 8567895b96ca..b6d45d754405 100644 --- a/src/material/progress-bar/_progress-bar-theme.scss +++ b/src/material/progress-bar/_progress-bar-theme.scss @@ -54,8 +54,8 @@ @mixin _mat-progress-bar-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-progress-bar') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-progress-bar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/progress-bar/progress-bar.scss b/src/material/progress-bar/progress-bar.scss index 1f550d5a49e1..4664fc643d52 100644 --- a/src/material/progress-bar/progress-bar.scss +++ b/src/material/progress-bar/progress-bar.scss @@ -9,7 +9,7 @@ $piece-animation-duration: 250ms !default; .mat-progress-bar { - @include private.animation-noop(); + @include private.private-animation-noop(); display: block; // Height is provided for mat-progress-bar to act as a default. height: $height; diff --git a/src/material/progress-spinner/_progress-spinner-theme.scss b/src/material/progress-spinner/_progress-spinner-theme.scss index 11077d716bd0..752668cd6cf3 100644 --- a/src/material/progress-spinner/_progress-spinner-theme.scss +++ b/src/material/progress-spinner/_progress-spinner-theme.scss @@ -28,8 +28,8 @@ @mixin _mat-progress-spinner-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-progress-spinner') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-progress-spinner') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/progress-spinner/progress-spinner.scss b/src/material/progress-spinner/progress-spinner.scss index a5f20d1b094d..4be9b25ad9e7 100644 --- a/src/material/progress-spinner/progress-spinner.scss +++ b/src/material/progress-spinner/progress-spinner.scss @@ -29,7 +29,7 @@ $_mat-progress-spinner-default-circumference: } circle { - @include private.animation-noop(); + @include private.private-animation-noop(); fill: transparent; transform-origin: center; transition: stroke-dashoffset 225ms linear; @@ -43,13 +43,13 @@ $_mat-progress-spinner-default-circumference: &.mat-progress-spinner-indeterminate-animation[mode='indeterminate'] { svg { - @include private.animation-noop(); + @include private.private-animation-noop(); animation: mat-progress-spinner-linear-rotate variables.$swift-ease-in-out-duration * 4 linear infinite; } circle { - @include private.animation-noop(); + @include private.private-animation-noop(); transition-property: stroke; // Note: we multiply the duration by 8, because the animation is spread out in 8 stages. animation-duration: variables.$swift-ease-in-out-duration * 8; @@ -60,7 +60,7 @@ $_mat-progress-spinner-default-circumference: &.mat-progress-spinner-indeterminate-fallback-animation[mode='indeterminate'] { svg { - @include private.animation-noop(); + @include private.private-animation-noop(); animation: mat-progress-spinner-stroke-rotate-fallback $stroke-rotate-fallback-duration $stroke-rotate-fallback-ease @@ -68,7 +68,7 @@ $_mat-progress-spinner-default-circumference: } circle { - @include private.animation-noop(); + @include private.private-animation-noop(); transition-property: stroke; } } diff --git a/src/material/radio/_radio-theme.scss b/src/material/radio/_radio-theme.scss index ef53db2a7184..ce847cd9a4a4 100644 --- a/src/material/radio/_radio-theme.scss +++ b/src/material/radio/_radio-theme.scss @@ -78,8 +78,8 @@ @mixin _mat-radio-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-radio') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-radio') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/select/_select-theme.scss b/src/material/select/_select-theme.scss index de5c67a52873..fb1a4879ca04 100644 --- a/src/material/select/_select-theme.scss +++ b/src/material/select/_select-theme.scss @@ -19,7 +19,7 @@ } .mat-select-placeholder { - color: form-common.control-placeholder-color($config); + color: form-common.private-control-placeholder-color($config); } .mat-select-disabled .mat-select-value { @@ -32,7 +32,7 @@ .mat-select-panel { background: theming.color($background, card); - @include private.theme-overridable-elevation(4, $config); + @include private.private-theme-overridable-elevation(4, $config); .mat-option.mat-selected:not(.mat-option-multiple) { background: theming.color($background, hover, 0.12); @@ -81,8 +81,8 @@ @mixin _mat-select-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-select') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-select') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/sidenav/_sidenav-theme.scss b/src/material/sidenav/_sidenav-theme.scss index 689cc3fae42a..bd67b7da7b07 100644 --- a/src/material/sidenav/_sidenav-theme.scss +++ b/src/material/sidenav/_sidenav-theme.scss @@ -34,7 +34,7 @@ &:not(.mat-drawer-side) { // The elevation of z-16 is noted in the design specifications. // See https://material.io/design/components/navigation-drawer.html - @include private.theme-elevation(16, $config); + @include private.private-theme-elevation(16, $config); } } @@ -81,8 +81,8 @@ @mixin _mat-sidenav-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-sidenav') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-sidenav') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/slide-toggle/_slide-toggle-theme.scss b/src/material/slide-toggle/_slide-toggle-theme.scss index 1b12b1f3c571..75b26a131d72 100644 --- a/src/material/slide-toggle/_slide-toggle-theme.scss +++ b/src/material/slide-toggle/_slide-toggle-theme.scss @@ -64,7 +64,7 @@ } .mat-slide-toggle-thumb { - @include private.theme-elevation(1, $config); + @include private.private-theme-elevation(1, $config); background-color: theming.color(palette.$grey, $thumb-unchecked-hue); } @@ -83,8 +83,8 @@ @mixin _mat-slide-toggle-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-slide-toggle') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-slide-toggle') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/slider/_slider-theme.scss b/src/material/slider/_slider-theme.scss index bed3d377bba7..4bad53aeae6c 100644 --- a/src/material/slider/_slider-theme.scss +++ b/src/material/slider/_slider-theme.scss @@ -179,8 +179,8 @@ @mixin _mat-slider-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-slider') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-slider') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/snack-bar/_snack-bar-theme.scss b/src/material/snack-bar/_snack-bar-theme.scss index 4c98160d3586..5f5cf2aaf9b8 100644 --- a/src/material/snack-bar/_snack-bar-theme.scss +++ b/src/material/snack-bar/_snack-bar-theme.scss @@ -15,7 +15,7 @@ color: if($is-dark-theme, palette.$dark-primary-text, palette.$light-secondary-text); background: if($is-dark-theme, map.get(palette.$grey, 50), #323232); - @include private.theme-elevation(6, $config); + @include private.private-theme-elevation(6, $config); } .mat-simple-snackbar-action { @@ -45,8 +45,8 @@ @mixin _mat-snack-bar-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-snack-bar') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-snack-bar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/sort/_sort-theme.scss b/src/material/sort/_sort-theme.scss index e6ae6d405296..1cb5d157b7d5 100644 --- a/src/material/sort/_sort-theme.scss +++ b/src/material/sort/_sort-theme.scss @@ -33,8 +33,8 @@ @mixin _mat-sort-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-sort') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-sort') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/stepper/_stepper-theme.scss b/src/material/stepper/_stepper-theme.scss index 50ba996be2f0..2b690ec29d7f 100644 --- a/src/material/stepper/_stepper-theme.scss +++ b/src/material/stepper/_stepper-theme.scss @@ -136,11 +136,11 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $height: compatibility.density-prop-value(stepper-variables.$density-config, $density-scale, - height); + $height: compatibility.private-density-prop-value(stepper-variables.$density-config, + $density-scale, height); $vertical-padding: ($height - stepper-variables.$label-header-height) / 2; - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-horizontal-stepper-header { height: $height; } @@ -172,8 +172,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-stepper') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-stepper') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/table/_table-flex-styles.import.scss b/src/material/table/_table-flex-styles.import.scss index e1dd51a6834f..ce779389f77e 100644 --- a/src/material/table/_table-flex-styles.import.scss +++ b/src/material/table/_table-flex-styles.import.scss @@ -1,3 +1 @@ -@forward 'table-flex-styles' as mat-* hide mat-table-flex-styles; -@forward 'table-flex-styles' as mat-private-* hide $mat-private-header-row-height, -$mat-private-row-height, $mat-private-row-horizontal-padding; +@forward 'table-flex-styles' as mat-*; diff --git a/src/material/table/_table-flex-styles.scss b/src/material/table/_table-flex-styles.scss index 00a955b880ce..78029f9cd535 100644 --- a/src/material/table/_table-flex-styles.scss +++ b/src/material/table/_table-flex-styles.scss @@ -6,7 +6,7 @@ $row-height: 48px; $row-horizontal-padding: 24px; // Only use tag name selectors here since the styles are shared between MDC and non-MDC -@mixin table-flex-styles { +@mixin private-table-flex-styles { mat-table { display: block; } diff --git a/src/material/table/_table-theme.scss b/src/material/table/_table-theme.scss index 658703296bce..7bbb605daa0e 100644 --- a/src/material/table/_table-theme.scss +++ b/src/material/table/_table-theme.scss @@ -52,8 +52,8 @@ @mixin _mat-table-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-table') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-table') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/table/table.scss b/src/material/table/table.scss index 8ceb817a75dd..214ac957d24d 100644 --- a/src/material/table/table.scss +++ b/src/material/table/table.scss @@ -1,7 +1,7 @@ @use '../core/style/vendor-prefixes'; @use './table-flex-styles'; -@include table-flex-styles.table-flex-styles(); +@include table-flex-styles.private-table-flex-styles(); /** * Native HTML table structure diff --git a/src/material/tabs/_tabs-common.scss b/src/material/tabs/_tabs-common.scss index 7d946109410a..126bb34733b4 100644 --- a/src/material/tabs/_tabs-common.scss +++ b/src/material/tabs/_tabs-common.scss @@ -58,7 +58,7 @@ $tab-animation-duration: 500ms !default; @mixin ink-bar { $height: 2px; - @include private.animation-noop(); + @include private.private-animation-noop(); position: absolute; bottom: 0; height: $height; diff --git a/src/material/tabs/_tabs-theme.scss b/src/material/tabs/_tabs-theme.scss index b5b831811b97..fbd9f5a29374 100644 --- a/src/material/tabs/_tabs-theme.scss +++ b/src/material/tabs/_tabs-theme.scss @@ -153,8 +153,8 @@ @mixin _mat-tabs-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-tabs') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-tabs') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/tabs/tab-group.scss b/src/material/tabs/tab-group.scss index 1fa6618ee3ad..9ec6edb6c400 100644 --- a/src/material/tabs/tab-group.scss +++ b/src/material/tabs/tab-group.scss @@ -38,7 +38,7 @@ // The bottom section of the view; contains the tab bodies .mat-tab-body-wrapper { - @include private.animation-noop(); + @include private.private-animation-noop(); position: relative; overflow: hidden; display: flex; diff --git a/src/material/tabs/tab-header.scss b/src/material/tabs/tab-header.scss index 9a1474395c73..1cb81c98363d 100644 --- a/src/material/tabs/tab-header.scss +++ b/src/material/tabs/tab-header.scss @@ -17,7 +17,7 @@ } .mat-tab-list { - @include private.animation-noop(); + @include private.private-animation-noop(); } // Wraps each tab label diff --git a/src/material/toolbar/_toolbar-theme.scss b/src/material/toolbar/_toolbar-theme.scss index 02d24694d9af..b1b0bf3918b4 100644 --- a/src/material/toolbar/_toolbar-theme.scss +++ b/src/material/toolbar/_toolbar-theme.scss @@ -84,12 +84,12 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $height-desktop: compatibility.density-prop-value( + $height-desktop: compatibility.private-density-prop-value( toolbar-variables.$desktop-density-config, $density-scale, height); - $height-mobile: compatibility.density-prop-value( + $height-mobile: compatibility.private-density-prop-value( toolbar-variables.$mobile-density-config, $density-scale, height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { // Set the default height for the toolbar. @include _mat-toolbar-height($height-desktop); @@ -103,8 +103,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-toolbar') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-toolbar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/tooltip/_tooltip-theme.scss b/src/material/tooltip/_tooltip-theme.scss index 67ccf6bb2de0..6fd688d21c4e 100644 --- a/src/material/tooltip/_tooltip-theme.scss +++ b/src/material/tooltip/_tooltip-theme.scss @@ -40,8 +40,8 @@ $handset-vertical-padding: @mixin _mat-tooltip-density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-tooltip') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-tooltip') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/tree/_tree-theme.scss b/src/material/tree/_tree-theme.scss index 8019796356e2..5fb19cffd34f 100644 --- a/src/material/tree/_tree-theme.scss +++ b/src/material/tree/_tree-theme.scss @@ -35,9 +35,10 @@ @mixin density($config-or-theme) { $density-scale: theming.get-density-config($config-or-theme); - $height: compatibility.density-prop-value(tree-variables.$density-config, $density-scale, height); + $height: compatibility.private-density-prop-value(tree-variables.$density-config, + $density-scale, height); - @include compatibility.density-legacy-compatibility() { + @include compatibility.private-density-legacy-compatibility() { .mat-tree-node { min-height: $height; } @@ -45,8 +46,8 @@ } @mixin theme($theme-or-color-config) { - $theme: theming.legacy-get-theme($theme-or-color-config); - @include theming.check-duplicate-theme-styles($theme, 'mat-tree') { + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-tree') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme);