Skip to content

refactor(themes): add scoped vars #8865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,9 @@ $p-test: igx-palette(#fff, #000);
@if map-has-key($map, $key) {
@if not(legacy()) {
@if not($fallback) {
@return var(--#{map-get($map, 'name')}-#{$key})
@return var(--#{$key})
}
@return var(--#{map-get($map, 'name')}-#{$key}, #{$fallback})
@return var(--#{$key}, #{$fallback})
} @else {
@return map-get($map, $key);
}
Expand Down Expand Up @@ -849,7 +849,11 @@ $p-test: igx-palette(#fff, #000);
@function str-replace($string, $search, $replace: '') {
$index: str-index($string, $search);
@if $index {
@return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
@return str-slice($string, 1, $index - 1) + $replace + str-replace(
str-slice($string, $index + str-length($search)),
$search,
$replace
);
}
@return $string;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,6 @@
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
////

/// Help debug sass maps.
/// @access privet
/// @example scss - Sample usage
/// input[type="checkbox"] {
/// @include hide-default();
/// }

//@mixin debug-map($map) {
// @at-root {
// @debug-map {
// __toString__: inspect($map);
// __length__: length($map);
// __keys__: map-keys($map);
//
// __properties__ {
// @each $key, $value in $map {
// #{$key}: inspect($value);
// }
// }
// }
// }
//}

/// Hides the element from the DOM.
/// @access public
/// @example scss - Sample usage
Expand Down Expand Up @@ -218,43 +195,39 @@
/// @include css-vars-from-theme($my-theme);
/// }
@mixin css-vars-from-theme($theme, $prefix: null) {
$name: map-get($theme, 'name');
$ignore: ('name', 'palette', 'variant', 'selector');

@each $key, $value in $theme {
@if $key != 'name' and $key != 'palette' and type-of($value) != 'map' {
@if not(index($ignore, $key)) and type-of($value) != 'map' {
@if $prefix {
--#{$prefix}-#{$key}: #{$value};
--#{$prefix}-#{$key}: var(--#{$name}-#{$key}, #{$value});
} @else {
--#{$key}: #{$value};
--#{$key}: var(--#{$name}-#{$key}, #{$value});
}
}
}
}

/// Add theme colors to the global root scope
/// Ensures the operation is done only once.
/// @access private
/// @param {map} $theme - The component theme to register as css vars.
/// @requires {mixin} css-vars-from-theme
@mixin igx-root-css-vars($theme) {
$scope: &;

@if map-get($themes, $scope) == null {
$id: unique-id();
$themes: map-merge($themes, (#{$scope}: $id)) !global;
@include igx-css-vars($theme);
}
}

/// Add theme colors to a scope.
/// @access public
/// @param {map} $theme - The component theme to be used
/// @requires {mixin} css-vars-from-theme
@mixin igx-css-vars($theme) {
$scope: if(is-root(), ':root', '&');
$prefix: map-get($theme, 'name');
@mixin igx-css-vars($theme, $scope: null, $prefix: null) {
$s: map-get($theme, 'selector');
$n: map-get($theme, 'name');
$name: if($scope, $scope, $s or $n);

@if not(legacy()) {
#{$scope} {
@include css-vars-from-theme($theme, $prefix);
@if is-root() {
#{$name} {
@include css-vars-from-theme($theme, $prefix);
}
} @else {
&,
#{$name} {
@include css-vars-from-theme($theme, $prefix);
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires rem
/// @requires --var
@mixin igx-action-strip($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$padding: (
comfortable: 0 rem(24px),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires rem
/// @requires --var
@mixin igx-avatar($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$small-size: 40px;
$medium-size: 64px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
/// // Theming using css variables (not supported in IE11):
/// @include igx-css-vars($my-badge-theme);
@function igx-badge-theme(
$palette: $default-palette,
$palette: null,
$schema: $light-schema,
$elevations: $elevations,

Expand Down Expand Up @@ -94,12 +94,12 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires igx-color
/// @requires rem
/// @requires --var
@mixin igx-badge($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$palette: map-get($theme, 'palette');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires rem
/// @requires --var
@mixin igx-banner($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$left: if-ltr(left, right);
$right: if-ltr(right, left);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires {mixin} ellipsis
/// @requires igx-bottom-nav-theme
/// @requires igx-color
Expand All @@ -79,7 +79,7 @@
/// @requires $ease-in-out-quad
/// @requires --var
@mixin igx-bottom-nav($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$menu-height: 56px;
$item-min-width: 80px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
$selected-shadow-color: null
) {
$name: 'igx-button-group';
$selector: 'igx-buttongroup';

$button-group-schema: ();

@if map-has-key($schema, $name) {
Expand Down Expand Up @@ -145,6 +147,7 @@

@return extend($theme, (
name: $name,
selector: $selector,
palette: $palette,
item-text-color: $item-text-color,
item-background: $item-background,
Expand All @@ -168,11 +171,11 @@


/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires igx-color
/// @requires --var
@mixin igx-button-group($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);
$group-item-min-width: 24px;
$group-item-border-thickness: 1px;
$group-items-margin: rem(10px, 16px);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@
$disabled-background: null,
) {
$name: 'igx-button';
$selector: '[igxButton]';

$button-schema: ();

@if map-has-key($schema, $name) {
Expand Down Expand Up @@ -335,6 +337,7 @@

@return extend($theme, (
name: $name,
selector: $selector,
palette: $palette,

flat-border-radius: $flat-border-radius,
Expand Down Expand Up @@ -409,11 +412,11 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires rem
/// @requires --var
@mixin igx-button($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$left: if-ltr(left, right);
$right: if-ltr(right, left);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,13 @@

/// @param {Map} $theme - The theme used to style the component.
/// @requires {function} text-contrast
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires em
/// @requires rem
/// @requires {mixin} ellipsis
/// @requires --var
@mixin igx-calendar($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$palette: map-get($theme, 'palette');
$cal-header-year-margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@

/// Card Component
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires em
/// @requires --var
@mixin igx-card($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$variant: map-get($theme, 'variant');
$not-material-theme: $variant != 'material';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
}

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} igx-root-css-vars
/// @requires {mixin} igx-css-vars
/// @requires igx-color
/// @requires igx-elevation
/// @requires $elevations
Expand All @@ -126,7 +126,7 @@
/// @requires {mixin} scale-out-center
/// @requires --var
@mixin igx-carousel($theme) {
@include igx-root-css-vars($theme);
@include igx-css-vars($theme);

$left: if-ltr(left, right);
$right: if-ltr(right, left);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,12 @@
$y-axis-label-styles: igx-type-scale-category($type-scale, $y-axis-label-text-style);
$y-axis-title-styles: igx-type-scale-category($type-scale, $y-axis-title-text-style);

@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
@include igx-font-var('x-axis-label-text-style', $x-axis-label-styles, $name);
@include igx-font-var('x-axis-title-text-style', $x-axis-title-styles, $name);
@include igx-font-var('y-axis-label-text-style', $y-axis-label-styles, $name);
@include igx-font-var('y-axis-title-text-style', $y-axis-title-styles, $name);
igx-category-chart {
@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
@include igx-font-var('x-axis-label-text-style', $x-axis-label-styles, $name);
@include igx-font-var('x-axis-title-text-style', $x-axis-title-styles, $name);
@include igx-font-var('y-axis-label-text-style', $y-axis-label-styles, $name);
@include igx-font-var('y-axis-title-text-style', $y-axis-title-styles, $name);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
$title-styles: igx-type-scale-category($type-scale, $title);
$subtitle-styles: igx-type-scale-category($type-scale, $subtitle);

@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
igx-data-chart {
@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,13 @@
$y-axis-label-styles: igx-type-scale-category($type-scale, $y-axis-label-text-style);
$y-axis-title-styles: igx-type-scale-category($type-scale, $y-axis-title-text-style);

@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
@include igx-font-var('x-axis-label-text-style', $x-axis-label-styles, $name);
@include igx-font-var('x-axis-title-text-style', $x-axis-title-styles, $name);
@include igx-font-var('y-axis-label-text-style', $y-axis-label-styles, $name);
@include igx-font-var('y-axis-title-text-style', $y-axis-title-styles, $name);
igx-financial-chart {
@include igx-font-var('title-text-style', $title-styles, $name);
@include igx-font-var('subtitle-text-style', $subtitle-styles, $name);
@include igx-font-var('x-axis-label-text-style', $x-axis-label-styles, $name);
@include igx-font-var('x-axis-title-text-style', $x-axis-title-styles, $name);
@include igx-font-var('y-axis-label-text-style', $y-axis-label-styles, $name);
@include igx-font-var('y-axis-title-text-style', $y-axis-title-styles, $name);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@
$outer-label: igx-type-scale-category($type-scale, $outer-label-text-style);
$text: igx-type-scale-category($type-scale, $text-style);

@include igx-font-var('outer-label-text-style', $outer-label, $name);
@include igx-font-var('text-style', $text, $name);
igx-funnel-chart {
@include igx-font-var('outer-label-text-style', $outer-label, $name);
@include igx-font-var('text-style', $text, $name);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,12 @@
/// @group typography
/// @requires {mixin} igx-type-style
@mixin igx-gauge-typography() {
$scope: if(is-root(), ':root', '&');
igx-linear-gauge {
--linear-gauge-font: var(--igx-font-family, inherit);
}

#{$scope} {
@include css-vars-from-theme((font: inherit), 'linear-gauge');
@include css-vars-from-theme((font: inherit), 'radial-gauge');
igx-radial-gauge {
--radial-gauge-font: var(--igx-font-family, inherit);
}
}

Loading