@react-md/core 1.0.0-next.1 → 1.0.0-next.2

package/src/icon/_icon.scss

@@ -1,5 +1,4 @@
 @use "sass:color";
-@use "sass:map";
 @use "../theme/theme";
 @use "../transition/transition";
 @use "../utils";
@@ -47,61 +46,31 @@ $rotate-from: 0deg !default;
 $rotate-to: 180deg !default;
 $rotate-duration: transition.$linear-duration !default;
 
-$var-lookup: (
-  color: (
-    var: --rmd-icon-color,
-    value: $color,
-  ),
-  size: (
-    var: --rmd-icon-size,
-    value: $size,
-  ),
-  spacing: (
-    var: --rmd-icon-spacing,
-    value: $spacing,
-  ),
-  rotate-from: (
-    var: --rmd-icon-rotate-from,
-    value: $rotate-from,
-  ),
-  rotate-to: (
-    var: --rmd-icon-rotate-to,
-    value: $rotate-to,
-  ),
-  symbol-fill: (
-    var: --rmd-symbol-fill,
-    value: $symbol-fill,
-  ),
-  symbol-grade: (
-    var: --rmd-symbol-grad,
-    value: $symbol-grade,
-  ),
-  symbol-weight: (
-    var: --rmd-symbol-wght,
-    value: $symbol-weight,
-  ),
-  symbol-optical-size: (
-    var: --rmd-symbol-opsz,
-    value: $symbol-optical-size,
-  ),
+$variables: (
+  color,
+  size,
+  spacing,
+  rotate-from,
+  rotate-to,
+  symbol-fill,
+  symbol-grade,
+  symbol-weight,
+  symbol-optical-size
 );
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "icon var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "icon");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "icon var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "icon")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -126,6 +95,21 @@ $var-lookup: (
   }
 }
 
+@mixin variables {
+  @if not $disable-font or not $disable-svg or not $disable-symbol {
+    @include set-var(color, $color);
+    @include set-var(size, $size);
+    @include set-var(spacing, $spacing);
+  }
+
+  @if not $disable-symbol {
+    @include set-var(symbol-fill, $symbol-fill);
+    @include set-var(symbol-grade, $symbol-grade);
+    @include set-var(symbol-weight, $symbol-weight);
+    @include set-var(symbol-optical-size, $symbol-optical-size);
+  }
+}
+
 @mixin styles {
   // shouldn't really use react-md without icons though...
   @if not $disable-font or not $disable-svg and not $disable-symbol {

package/src/interaction/_interaction.scss

@@ -117,55 +117,19 @@ $selected-background-color: theme.get-default-color(
   $dark-surface-selected-background-color
 ) !default;
 
-$var-lookup: (
-  ripple-background-color: (
-    var: --rmd-ripple-background-color,
-    value: $ripple-background-color,
-  ),
-  background-color: (
-    var: --rmd-interaction-background-color,
-    value: null,
-  ),
-  hover-background-color: (
-    var: --rmd-hover-background-color,
-    value: $hover-background-color,
-  ),
-  focus-background-color: (
-    var: --rmd-focus-background-color,
-    value: $focus-background-color,
-  ),
-  press-background-color: (
-    var: --rmd-press-background-color,
-    value: $press-background-color,
-  ),
-  selected-background-color: (
-    var: --rmd-selected-background-color,
-    value: $selected-background-color,
-  ),
-  focus-color: (
-    var: --rmd-focus-color,
-    value: $focus-color,
-  ),
-  focus-width: (
-    var: --rmd-focus-width,
-    value: $focus-width,
-  ),
-  ripple-inset: (
-    var: --rmd-ripple-inset,
-    value: 0,
-  ),
-  ripple-border-radius: (
-    var: --rmd-ripple-border-radius,
-    value: inherit,
-  ),
-  surface-inset: (
-    var: --rmd-surface-inset,
-    value: 0,
-  ),
-  surface-border-radius: (
-    var: --rmd-surface-border-radius,
-    value: inherit,
-  ),
+$variables: (
+  background-color,
+  hover-background-color,
+  focus-background-color,
+  press-background-color,
+  selected-background-color,
+  focus-color,
+  focus-width,
+  ripple-inset,
+  ripple-border-radius,
+  ripple-background-color,
+  surface-inset,
+  surface-border-radius
 );
 
 @function _is-var-disabled($name) {
@@ -189,27 +153,35 @@ $var-lookup: (
 }
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "interaction var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
+  // cannot set a custom property to `inherit` for some reason. It will not be parsed.
+  @if not
+    $fallback and
+    ($name == ripple-border-radius or $name == surface-border-radius)
+  {
+    $fallback: inherit;
+  }
+
   @if _is-var-disabled($name) {
-    @return $value;
+    @return $fallback;
   }
 
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "interaction");
+
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "interaction var"), var);
   @if _is-var-disabled($name) {
     @error '"#{$name}" is currently disabled and cannot be changed. Set "$disable-#{$name}-var" to `true` or remove it from the Sass module overrides.';
   }
 
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "interaction")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -382,6 +354,24 @@ $var-lookup: (
   }
 }
 
+@mixin variables {
+  @include set-var(focus-color, $focus-color);
+  @include set-var(focus-width, $focus-width);
+  @include set-var(hover-background-color, $hover-background-color);
+  @include set-var(focus-background-color, $focus-background-color);
+  @include set-var(press-background-color, $press-background-color);
+  @include set-var(selected-background-color, $selected-background-color);
+
+  @if not $_disable-ripple {
+    @include set-var(ripple-background-color, $ripple-background-color);
+    @include set-var(ripple-inset, 0);
+  }
+
+  @if not $disable-surface-inset-var {
+    @include set-var(surface-inset, 0);
+  }
+}
+
 @mixin styles {
   @if not $_disable-ripple {
     .rmd-ripple-container {

package/src/layout/_layout.scss

@@ -29,39 +29,34 @@ $enter-timing-function: sheet.$enter-timing-function !default;
 $leave-duration: sheet.$leave-duration !default;
 $leave-timing-function: sheet.$leave-timing-function !default;
 
-$var-lookup: (
-  size: (
-    var: --rmd-layout-size,
-    value: $navigation-static-width,
-  ),
-  header-height: (
-    var: --rmd-layout-header-height,
-    value: $header-height,
-  ),
-);
+$variables: (size, header-height);
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "layout var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "layout");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "layout var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "layout")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
   #{$property}: get-var($name, $fallback);
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(size, $navigation-static-width);
+    @include set-var(header-height, $header-height);
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     .rmd-layout-main {

package/src/link/_link.scss

@@ -29,37 +29,21 @@ $skip-to-main-active-styles: (
   outline: 0.25rem dashed #000,
 ) !default;
 
-$var-lookup: (
-  color: (
-    var: --rmd-link-color,
-    value: $color,
-  ),
-  visited-color: (
-    var: --rmd-link-visited-color,
-    value: $visited-color,
-  ),
-  hover-color: (
-    var: --rmd-link-hover-color,
-    value: $hover-color,
-  ),
-);
+$variables: (color, visited-color, hover-color);
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "link var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "link");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "link var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "link")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -80,6 +64,14 @@ $var-lookup: (
   #{$property}: get-var(size) inset get-var(color);
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(color, $color);
+    @include set-var(visited-color, $visited-color);
+    @include set-var(hover-color, $hover-color);
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     .rmd-link {

package/src/list/_list.scss

@@ -60,77 +60,35 @@ $item-media-large-size: 6.25rem !default;
 
 $item-keyline: 4.5rem !default;
 
-$var-lookup: (
-  horizontal-padding: (
-    var: --rmd-list-padding-h,
-    value: $horizontal-padding,
-  ),
-  vertical-padding: (
-    var: --rmd-list-padding-v,
-    value: $vertical-padding,
-  ),
-  item-keyline: (
-    var: --rmd-list-item-keyline,
-    value: $item-keyline,
-  ),
-  item-horizontal-padding: (
-    var: --rmd-list-item-padding-h,
-    value: $item-horizontal-padding,
-  ),
-  item-vertical-padding: (
-    var: --rmd-list-item-padding-v,
-    value: $item-vertical-padding,
-  ),
-  item-height: (
-    var: --rmd-list-item-height,
-    value: $item-height,
-  ),
-  item-medium-height: (
-    var: --rmd-list-item-medium-height,
-    value: $item-medium-height,
-  ),
-  item-large-height: (
-    var: --rmd-list-item-large-height,
-    value: $item-large-height,
-  ),
-  item-extra-large-height: (
-    var: --rmd-list-item-extra-large-height,
-    value: $item-extra-large-height,
-  ),
-  item-three-line-height: (
-    var: --rmd-list-item-three-line-height,
-    value: $item-three-line-height,
-  ),
-  item-media-size: (
-    var: --rmd-list-item-media-size,
-    value: $item-media-size,
-  ),
-  item-media-spacing: (
-    var: --rmd-list-item-media-spacing,
-    value: $item-media-spacing,
-  ),
-  text-three-line-height: (
-    var: --rmd-list-item-text-three-line-height,
-    value: $item-secondary-text-three-line-max-height,
-  ),
+$variables: (
+  horizontal-padding,
+  vertical-padding,
+  item-keyline,
+  item-horizontal-padding,
+  item-vertical-padding,
+  item-height,
+  item-medium-height,
+  item-large-height,
+  item-extra-large-height,
+  item-three-line-height,
+  item-media-size,
+  item-media-spacing,
+  item-text-three-line-height
 );
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "list var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "list");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "list var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "list")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -147,6 +105,38 @@ $var-lookup: (
   );
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(horizontal-padding, $horizontal-padding);
+    @include set-var(vertical-padding, $vertical-padding);
+    @include set-var(item-horizontal-padding, $item-horizontal-padding);
+    @include set-var(item-vertical-padding, $item-vertical-padding);
+
+    @include set-var(item-height, $item-height);
+    @if not $disable-medium-height {
+      @include set-var(item-medium-height, $item-medium-height);
+    }
+    @if not $disable-large-height {
+      @include set-var(item-large-height, $item-large-height);
+    }
+    @if not $disable-extra-large-height {
+      @include set-var(item-extra-large-height, $item-extra-large-height);
+    }
+    @if not $disable-three-line-height {
+      @include set-var(item-three-line-height, $item-three-line-height);
+      @include set-var(
+        item-text-three-line-height,
+        $item-secondary-text-three-line-max-height
+      );
+    }
+
+    @if not $disable-item-media {
+      @include set-var(item-media-size, $item-media-size);
+      @include set-var(item-media-spacing, $item-media-spacing);
+    }
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     .rmd-list {
@@ -243,7 +233,7 @@ $var-lookup: (
 
         &--clamped {
           @include typography.line-clamp;
-          @include use-var(max-height, text-three-line-height);
+          @include use-var(max-height, item-text-three-line-height);
 
           line-height: $item-secondary-text-line-height;
           white-space: normal;

package/src/menu/_menu.scss

@@ -20,41 +20,21 @@ $min-width: 7rem !default;
 
 $spacing: 1rem !default;
 
-$var-lookup: (
-  background-color: (
-    var: --rmd-menu-background-color,
-    value: $background-color,
-  ),
-  color: (
-    var: --rmd-menu-color,
-    value: $color,
-  ),
-  min-width: (
-    var: --rmd-menu-min-width,
-    value: $min-width,
-  ),
-  spacing: (
-    var: --rmd-menu-spacing,
-    value: $spacing,
-  ),
-);
+$variables: (background-color, color, min-width, spacing);
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "dialog var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "menu");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "dialog var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "menu")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
@@ -122,6 +102,15 @@ $var-lookup: (
   }
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(background-color, $background-color);
+    @include set-var(color, $color);
+    @include set-var(min-width, $min-width);
+    @include set-var(spacing, $spacing);
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     @include menu-styles;

package/src/overlay/_overlay.scss

@@ -9,39 +9,34 @@ $z-index: utils.$temporary-element-z-index !default;
 $transition-duration: transition.$linear-duration !default;
 $transition-timing-function: transition.$linear-timing-function !default;
 
-$var-lookup: (
-  background-color: (
-    var: --rmd-overlay-background-color,
-    value: $background-color,
-  ),
-  z-index: (
-    var: --rmd-overlay-z-index,
-    value: $z-index,
-  ),
-);
+$variables: (background-color, z-index);
 
 @function get-var($name, $fallback: null) {
-  $found: utils.validate($var-lookup, $name, "overlay var");
-  $var: map.get($found, var);
-  $value: if($fallback, $fallback, map.get($found, value));
-
-  @if $value {
-    @return var(#{$var}, #{$value});
+  $var: utils.get-var-name($variables, $name, "overlay");
+  @if $fallback {
+    @return var(#{$var}, #{$fallback});
   }
 
   @return var(#{$var});
 }
 
 @mixin set-var($name, $value) {
-  $var: map.get(utils.validate($var-lookup, $name, "overlay var"), var);
-
-  #{$var}: #{$value};
+  @if $value {
+    #{utils.get-var-name($variables, $name, "overlay")}: #{$value};
+  }
 }
 
 @mixin use-var($property, $name: $property, $fallback: null) {
   #{$property}: get-var($name, $fallback);
 }
 
+@mixin variables {
+  @if not $disable-everything {
+    @include set-var(background-color, $background-color);
+    @include set-var(z-index, $z-index);
+  }
+}
+
 @mixin styles {
   @if not $disable-everything {
     .rmd-overlay {