@ng-matero/extensions 18.0.3 → 18.1.1

package/README.md

@@ -43,18 +43,43 @@ export class YourAppModule {
 
 After import modules, you must define a theme. [More about theming](https://material.angular.io/guide/theming).
 
+### M2 theme
+
 ```scss
+@use '@angular/material' as mat;
 @use '@ng-matero/extensions' as mtx;
 
+$theme: mat.define-light-theme(...);
+
+@include mat.all-component-themes($theme);
 @include mtx.all-component-themes($theme);
 ```
 
+### M3 theme
+
+```scss
+@use '@angular/material' as mat;
+@use '@ng-matero/extensions' as mtx;
+
+$config: (...);
+
+$theme: mat.private-deep-merge-all(
+  mat.define-theme($config),
+  mtx.define-theme($config)
+);
+
+html {
+  @include mat.all-component-themes($theme);
+  @include mtx.all-component-themes($theme);
+}
+```
+
 The @use-based Sass API is only available in the version `12.0.0` and above.
 
-You can also [using a pre-built theme](https://material.angular.io/guide/theming#using-a-pre-built-theme) which in the "prebuilt-themes" directory of the npm package (@ng-matero/extensions/prebuilt-themes).
+You can also [using a pre-built theme](https://material.angular.io/guide/theming#pre-built-themes) which in the "prebuilt-themes" directory of the npm package (@ng-matero/extensions/prebuilt-themes).
 
 ```scss
-@import '@ng-matero/extensions/prebuilt-themes/indigo-pink.css'
+@import '@ng-matero/extensions/prebuilt-themes/azure-blue.css'
 ```
 
 ## Development

package/alert/alert.scss

@@ -4,8 +4,9 @@
 .mtx-alert {
   position: relative;
   display: block;
-  padding: 12px 20px;
-  margin-bottom: 16px;
+  padding: .75rem 1rem;
+  margin-bottom: 1rem;
+  line-height: 1.5;
 
   @include token-utils.use-tokens(tokens-mtx-alert.$prefix, tokens-mtx-alert.get-token-slots()) {
     $border-color: token-utils.get-token-variable(outline-color);
@@ -17,21 +18,25 @@
     @include token-utils.create-token-slot(color, text-color);
 
     &.mtx-alert-info {
+      @include token-utils.create-token-slot(border-color, info-outline-color);
       @include token-utils.create-token-slot(background-color, info-background-color);
       @include token-utils.create-token-slot(color, info-text-color);
     }
 
     &.mtx-alert-success {
+      @include token-utils.create-token-slot(border-color, success-outline-color);
       @include token-utils.create-token-slot(background-color, success-background-color);
       @include token-utils.create-token-slot(color, success-text-color);
     }
 
     &.mtx-alert-warning {
+      @include token-utils.create-token-slot(border-color, warning-outline-color);
       @include token-utils.create-token-slot(background-color, warning-background-color);
       @include token-utils.create-token-slot(color, warning-text-color);
     }
 
     &.mtx-alert-danger {
+      @include token-utils.create-token-slot(border-color, danger-outline-color);
       @include token-utils.create-token-slot(background-color, danger-background-color);
       @include token-utils.create-token-slot(color, danger-text-color);
     }
@@ -41,27 +46,19 @@
 .mtx-alert-close {
   position: absolute;
   top: 0;
-  bottom: 0;
   right: 0;
-  padding: 0 1.25rem;
-  font-size: 1.5rem;
-  line-height: 1;
-  color: inherit;
-  opacity: .5;
-  background-color: transparent;
-  border: 0;
-  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 3rem;
+  height: 3rem;
 
   [dir='rtl'] & {
     right: auto;
     left: 0;
   }
-
-  &:hover {
-    opacity: .75;
-  }
 }
 
 .mtx-alert-dismissible {
-  padding-right: 4rem;
+  padding-right: 3rem;
 }

package/colorpicker/colorpicker-toggle.scss

@@ -4,7 +4,7 @@
 
 $_tokens: tokens-mtx-colorpicker.$prefix, tokens-mtx-colorpicker.get-token-slots();
 
-// We support the case where the form field is disabled, but the datepicker is not.
+// We support the case where the form field is disabled, but the colorpicker is not.
 // MDC sets `pointer-events: none` on disabled form fields which prevents clicks on the toggle.
 .mtx-colorpicker-toggle {
   pointer-events: auto;

package/colorpicker/colorpicker.d.ts

@@ -87,7 +87,7 @@ export declare class MtxColorpicker implements OnChanges, OnDestroy {
     private _backdropHarnessClass;
     /** The input element this colorpicker is associated with. */
     pickerInput: MtxColorpickerInput;
-    /** Emits when the datepicker is disabled. */
+    /** Emits when the colorpicker is disabled. */
     readonly _disabledChange: Subject<boolean>;
     /** Emits new selected color when selected color changes. */
     readonly _selectedChanged: Subject<string>;

package/column-resize/resize-strategy.d.ts

@@ -65,7 +65,7 @@ export declare class CdkFlexTableResizeStrategy extends ResizeStrategy implement
     private _indexSequence;
     protected readonly defaultMinSize = 0;
     protected readonly defaultMaxSize: number;
-    constructor(columnResize: ColumnResize, styleScheduler: _CoalescedStyleScheduler, table: CdkTable<unknown>, document: any, _nonce?: string | null | undefined);
+    constructor(columnResize: ColumnResize, styleScheduler: _CoalescedStyleScheduler, table: CdkTable<unknown>, document: any, _nonce?: (string | null) | undefined);
     applyColumnSize(cssFriendlyColumnName: string, columnHeader: HTMLElement, sizeInPx: number, previousSizeInPx?: number): void;
     applyMinColumnSize(cssFriendlyColumnName: string, _: HTMLElement, sizeInPx: number): void;
     applyMaxColumnSize(cssFriendlyColumnName: string, _: HTMLElement, sizeInPx: number): void;

package/core/m2/_typography.scss

@@ -0,0 +1,172 @@
+@use 'sass:map';
+@use 'sass:math';
+@use 'sass:meta';
+@use 'sass:string';
+
+$_default-font-family: string.unquote('Roboto, sans-serif');
+
+@function _px-to-rem($px) {
+  @return math.div($px, 16px) * 1rem;
+}
+
+@function _get-letter-spacing($tracking, $font-size) {
+  @return math.div($tracking, $font-size * 16) * 1em;
+}
+
+$_mdc-levels: (
+  headline1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(96px),
+    line-height: _px-to-rem(96px),
+    font-weight: 300,
+    letter-spacing: _get-letter-spacing(-1.5, 6),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(60px),
+    line-height: _px-to-rem(60px),
+    font-weight: 300,
+    letter-spacing: _get-letter-spacing(-0.5, 3.75),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline3: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(48px),
+    line-height: _px-to-rem(50px),
+    font-weight: 400,
+    letter-spacing: normal,
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline4: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(34px),
+    line-height: _px-to-rem(40px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.25, 2.125),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline5: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(24px),
+    line-height: _px-to-rem(32px),
+    font-weight: 400,
+    letter-spacing: normal,
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  headline6: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(20px),
+    line-height: _px-to-rem(32px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(0.25, 1.25),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  subtitle1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(16px),
+    line-height: _px-to-rem(28px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.15, 1),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  subtitle2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(22px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(0.1, 0.875),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  body1: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(16px),
+    line-height: _px-to-rem(24px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.5, 1),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  body2: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(20px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.25, 0.875),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  caption: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(12px),
+    line-height: _px-to-rem(20px),
+    font-weight: 400,
+    letter-spacing: _get-letter-spacing(0.4, 0.75),
+    text-decoration: inherit,
+    text-transform: inherit,
+  ),
+  button: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(14px),
+    line-height: _px-to-rem(36px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(1.25, 0.875),
+    text-decoration: none,
+    text-transform: uppercase,
+  ),
+  overline: (
+    font-family: $_default-font-family,
+    font-size: _px-to-rem(12px),
+    line-height: _px-to-rem(32px),
+    font-weight: 500,
+    letter-spacing: _get-letter-spacing(2, 0.75),
+    text-decoration: none,
+    text-transform: uppercase,
+  ),
+);
+
+/// Defines a typography level from the Material Design spec.
+/// @param {String} $font-size The font-size for this level.
+/// @param {String | Number} $line-height The line-height for this level.
+/// @param {String | Number} $font-weight The font-weight for this level.
+/// @param {String} $font-family The font-family for this level.
+/// @param {String} $letter-spacing The letter-spacing for this level.
+/// @returns {Map} A map representing the definition of this typographic level.
+@function define-typography-level(
+  $font-size,
+  $line-height: $font-size,
+  $font-weight: 400,
+  $font-family: null,
+  $letter-spacing: normal) {
+
+  @return (
+    font-size: $font-size,
+    line-height: $line-height,
+    font-weight: $font-weight,
+    font-family: $font-family,
+    letter-spacing: $letter-spacing
+  );
+}
+
+// Converts an MDC typography level config to an Angular Material one.
+@function typography-config-level-from-mdc($mdc-level, $font-family: null) {
+  $mdc-level-config: map.get($_mdc-levels, $mdc-level);
+
+  // Explicitly default the font family to null since we'll apply it globally
+  // through the `define-typgraphy-config`/`define-legacy-typography-config`.
+  @return define-typography-level(
+    $font-family: $font-family,
+    $font-size: map.get($mdc-level-config, font-size),
+    $line-height: map.get($mdc-level-config, line-height),
+    $font-weight: map.get($mdc-level-config, font-weight),
+    $letter-spacing: map.get($mdc-level-config, letter-spacing)
+  );
+}

package/core/pipes/is-template-ref.pipe.d.ts

@@ -1,7 +1,7 @@
-import { PipeTransform } from '@angular/core';
+import { PipeTransform, TemplateRef } from '@angular/core';
 import * as i0 from "@angular/core";
 export declare class MtxIsTemplateRefPipe implements PipeTransform {
-    transform(obj: any): boolean;
+    transform(obj: any): obj is TemplateRef<any>;
     static ɵfac: i0.ɵɵFactoryDeclaration<MtxIsTemplateRefPipe, never>;
     static ɵpipe: i0.ɵɵPipeDeclaration<MtxIsTemplateRefPipe, "isTemplateRef", true>;
 }

package/core/style/_elevation.scss

@@ -0,0 +1,167 @@
+@use 'sass:map';
+@use 'sass:math';
+@use 'sass:meta';
+@use 'sass:string';
+
+$_umbra-opacity: 0.2;
+$_penumbra-opacity: 0.14;
+$_ambient-opacity: 0.12;
+
+$_umbra-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 2px 1px -1px',
+  2: '0px 3px 1px -2px',
+  3: '0px 3px 3px -2px',
+  4: '0px 2px 4px -1px',
+  5: '0px 3px 5px -1px',
+  6: '0px 3px 5px -1px',
+  7: '0px 4px 5px -2px',
+  8: '0px 5px 5px -3px',
+  9: '0px 5px 6px -3px',
+  10: '0px 6px 6px -3px',
+  11: '0px 6px 7px -4px',
+  12: '0px 7px 8px -4px',
+  13: '0px 7px 8px -4px',
+  14: '0px 7px 9px -4px',
+  15: '0px 8px 9px -5px',
+  16: '0px 8px 10px -5px',
+  17: '0px 8px 11px -5px',
+  18: '0px 9px 11px -5px',
+  19: '0px 9px 12px -6px',
+  20: '0px 10px 13px -6px',
+  21: '0px 10px 13px -6px',
+  22: '0px 10px 14px -6px',
+  23: '0px 11px 14px -7px',
+  24: '0px 11px 15px -7px',
+);
+
+$_penumbra-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 1px 1px 0px',
+  2: '0px 2px 2px 0px',
+  3: '0px 3px 4px 0px',
+  4: '0px 4px 5px 0px',
+  5: '0px 5px 8px 0px',
+  6: '0px 6px 10px 0px',
+  7: '0px 7px 10px 1px',
+  8: '0px 8px 10px 1px',
+  9: '0px 9px 12px 1px',
+  10: '0px 10px 14px 1px',
+  11: '0px 11px 15px 1px',
+  12: '0px 12px 17px 2px',
+  13: '0px 13px 19px 2px',
+  14: '0px 14px 21px 2px',
+  15: '0px 15px 22px 2px',
+  16: '0px 16px 24px 2px',
+  17: '0px 17px 26px 2px',
+  18: '0px 18px 28px 2px',
+  19: '0px 19px 29px 2px',
+  20: '0px 20px 31px 3px',
+  21: '0px 21px 33px 3px',
+  22: '0px 22px 35px 3px',
+  23: '0px 23px 36px 3px',
+  24: '0px 24px 38px 3px',
+);
+
+$_ambient-map: (
+  0: '0px 0px 0px 0px',
+  1: '0px 1px 3px 0px',
+  2: '0px 1px 5px 0px',
+  3: '0px 1px 8px 0px',
+  4: '0px 1px 10px 0px',
+  5: '0px 1px 14px 0px',
+  6: '0px 1px 18px 0px',
+  7: '0px 2px 16px 1px',
+  8: '0px 3px 14px 2px',
+  9: '0px 3px 16px 2px',
+  10: '0px 4px 18px 3px',
+  11: '0px 4px 20px 3px',
+  12: '0px 5px 22px 4px',
+  13: '0px 5px 24px 4px',
+  14: '0px 5px 26px 4px',
+  15: '0px 6px 28px 5px',
+  16: '0px 6px 30px 5px',
+  17: '0px 6px 32px 5px',
+  18: '0px 7px 34px 6px',
+  19: '0px 7px 36px 6px',
+  20: '0px 8px 38px 7px',
+  21: '0px 8px 40px 7px',
+  22: '0px 8px 42px 7px',
+  23: '0px 9px 44px 8px',
+  24: '0px 9px 46px 8px',
+);
+
+// A collection of mixins and CSS classes that can be used to apply elevation to a material
+// element.
+// See: https://material.io/design/environment/elevation.html
+// Examples:
+//
+//
+// .mat-foo {
+//   @include $mat-elevation(2);
+//
+//   &:active {
+//     @include $mat-elevation(8);
+//   }
+// }
+//
+// <div id="external-card" class="mat-elevation-z2"><p>Some content</p></div>
+//
+// For an explanation of the design behind how elevation is implemented, see the design doc at
+// https://goo.gl/Kq0k9Z.
+
+// The default color for elevation shadows.
+$color: black !default;
+
+// Prefix for elevation-related selectors.
+$prefix: 'mat-elevation-z';
+
+// Applies the correct css rules to an element to give it the elevation specified by $zValue.
+// The $zValue must be between 0 and 24.
+@mixin elevation($zValue, $color: $color, $opacity: null) {
+  box-shadow: get-box-shadow($zValue, $color, $opacity);
+}
+
+// Applies the elevation to an element in a manner that allows
+// consumers to override it via the Material elevation classes.
+@mixin overridable-elevation($zValue, $color: $color, $opacity: null) {
+  &:not([class*='#{$prefix}']) {
+    @include elevation($zValue, $color, $opacity);
+  }
+}
+
+// Gets the box shadow value for a specific elevation.
+@function get-box-shadow($zValue, $shadow-color: black, $opacity: null) {
+  @if $zValue == null {
+    @return null;
+  }
+
+  @if meta.type-of($zValue) != number or not math.is-unitless($zValue) {
+    @error '$zValue must be a unitless number, but received `#{$zValue}`';
+  }
+
+  @if $zValue < 0 or $zValue > 24 {
+    @error '$zValue must be between 0 and 24, but received `#{$zValue}`';
+  }
+
+  $umbra-z-value: map.get($_umbra-map, $zValue);
+  $penumbra-z-value: map.get($_penumbra-map, $zValue);
+  $ambient-z-value: map.get($_ambient-map, $zValue);
+
+  $color-opacity: if($opacity != null, $opacity, 1);
+  $umbra-color: _compute-color-opacity($shadow-color, $_umbra-opacity * $color-opacity);
+  $penumbra-color: _compute-color-opacity($shadow-color, $_penumbra-opacity * $color-opacity);
+  $ambient-color: _compute-color-opacity($shadow-color, $_ambient-opacity * $color-opacity);
+
+  @return string.unquote('#{$umbra-z-value} #{$umbra-color}, #{$penumbra-z-value} ' +
+          '#{$penumbra-color}, #{$ambient-z-value} #{$ambient-color}');
+}
+
+@function _compute-color-opacity($color, $opacity) {
+  @if meta.type-of($color) == color and $opacity != null {
+    @return rgba($color, $opacity);
+  }
+  @else {
+    @return $color;
+  }
+}

package/core/tokens/_m3-tokens.scss

@@ -1,7 +1,7 @@
 @use 'sass:map';
-@use '@material/tokens/v0_161' as mdc-tokens;
 @use '@angular/material' as mat;
 @use './m3';
+@use './m3/definitions' as m3-token-definitions;
 @use '../tokens/m2' as m2-tokens;
 @use './density';
 @use './format-tokens';
@@ -20,7 +20,7 @@
 }
 
 /// Creates a set of `md-ref-palette` tokens from the given palettes. (See
-/// https://github.com/material-components/material-components-web/blob/master/packages/mdc-tokens/v0_161/_md-ref-palette.scss)
+/// ./m3/definitions/_md-ref-palette.scss)
 /// @param {Map} $primary The primary palette
 /// @param {Map} $secondary The secondary palette
 /// @param {Map} $tertiary The tertiary palette
@@ -39,7 +39,7 @@
 }
 
 /// Creates a set of `md-ref-typeface` tokens from the given palettes. (See
-/// https://github.com/material-components/material-components-web/blob/master/packages/mdc-tokens/v0_161/_md-ref-typeface.scss)
+/// ./m3/definitions/_md-ref-typeface.scss)
 /// @param {List|String} $brand The font-family to use for brand text
 /// @param {List|String} $plain The font-family to use for plain text
 /// @param {String} $bold The font-weight to use for bold text
@@ -126,8 +126,8 @@ $_cached-token-slots: null;
 
 @function _get-sys-color($type, $ref) {
   $mdc-sys-color: if($type == dark,
-    mdc-tokens.md-sys-color-values-dark($ref),
-    mdc-tokens.md-sys-color-values-light($ref));
+    m3-token-definitions.md-sys-color-values-dark($ref),
+    m3-token-definitions.md-sys-color-values-light($ref));
 
   @if (mat.$private-use-system-color-variables) {
     @return (
@@ -283,7 +283,7 @@ $_cached-token-slots: null;
       'title-small-weight': var(--sys-title-small-weight),
     );
   }
-  @return mdc-tokens.md-sys-typescale-values($ref);
+  @return m3-token-definitions.md-sys-typescale-values($ref);
 }
 
 /// Generates a set of namespaced color tokens for all components.
@@ -300,15 +300,18 @@ $_cached-token-slots: null;
   $sys-color: _get-sys-color($type, $ref);
 
   @return _generate-tokens(map.merge($ref, (
+    // Used to get the theme type
+    md-sys-type: $type,
+
     md-sys-color: $sys-color,
     // Because the elevation values are always combined with color values to create the box shadow,
     // elevation needs to be part of the color dimension.
-    md-sys-elevation: mdc-tokens.md-sys-elevation-values(),
+    md-sys-elevation: m3-token-definitions.md-sys-elevation-values(),
     // Because the state values are sometimes combined with color values to create rgba colors,
     // state needs to be part of color dimension.
     // TODO(mmalerba): If at some point we remove the need for these combined values, we can move
     //  state to the base dimension.
-    md-sys-state: mdc-tokens.md-sys-state-values(),
+    md-sys-state: m3-token-definitions.md-sys-state-values(),
   )));
 }
 
@@ -344,7 +347,7 @@ $_cached-token-slots: null;
 @function generate-base-tokens() {
   // TODO(mmalerba): Exclude density tokens once implemented.
   @return _generate-tokens((
-    md-sys-motion: mdc-tokens.md-sys-motion-values(),
-    md-sys-shape: mdc-tokens.md-sys-shape-values(),
+    md-sys-motion: m3-token-definitions.md-sys-motion-values(),
+    md-sys-shape: m3-token-definitions.md-sys-shape-values(),
   ), $include-non-systemized: true);
 }