@angular/material 16.1.2 → 16.2.0-next.1

package/slide-toggle/_slide-toggle-theme.scss

@@ -1,73 +1,12 @@
 @use 'sass:map';
-@use 'sass:color';
 @use '@material/switch/switch-theme' as mdc-switch-theme;
-@use '@material/theme/color-palette' as mdc-color-palette;
 @use '@material/form-field' as mdc-form-field;
 @use '../core/theming/theming';
 @use '../core/mdc-helpers/mdc-helpers';
 @use '../core/typography/typography';
-
-
-// Generates all color mapping for the properties that only change based on the theme.
-@function _get-theme-base-map($is-dark) {
-  $on-surface: if($is-dark, mdc-color-palette.$grey-100, mdc-color-palette.$grey-800);
-  $hairline: if($is-dark, mdc-color-palette.$grey-700, mdc-color-palette.$grey-300);
-  $on-surface-variant: if($is-dark, mdc-color-palette.$grey-500, mdc-color-palette.$grey-700);
-  $on-surface-state-content: if($is-dark, mdc-color-palette.$grey-50, mdc-color-palette.$grey-900);
-  $disabled-handle-color: if($is-dark, #000, mdc-color-palette.$grey-800);
-  $icon-color: if($is-dark, mdc-color-palette.$grey-900, #fff);
-
-  @return (
-    disabled-selected-handle-color: $disabled-handle-color,
-    disabled-unselected-handle-color: $disabled-handle-color,
-
-    disabled-selected-track-color: $on-surface,
-    disabled-unselected-track-color: $on-surface,
-    unselected-focus-state-layer-color: $on-surface,
-    unselected-pressed-state-layer-color: $on-surface,
-    unselected-hover-state-layer-color: $on-surface,
-
-    unselected-focus-track-color: $hairline,
-    unselected-hover-track-color: $hairline,
-    unselected-pressed-track-color: $hairline,
-    unselected-track-color: $hairline,
-
-    unselected-focus-handle-color: $on-surface-state-content,
-    unselected-hover-handle-color: $on-surface-state-content,
-    unselected-pressed-handle-color: $on-surface-state-content,
-
-    handle-surface-color: surface,
-    unselected-handle-color: $on-surface-variant,
-
-    selected-icon-color: $icon-color,
-    disabled-selected-icon-color: $icon-color,
-    disabled-unselected-icon-color: $icon-color,
-    unselected-icon-color: $icon-color,
-  );
-}
-
-// Generates the mapping for the properties that change based on the slide toggle color.
-@function _get-theme-color-map($color-palette, $is-dark) {
-  $primary: theming.get-color-from-palette($color-palette, if($is-dark, 300, 600));
-  $state-content: theming.get-color-from-palette($color-palette, if($is-dark, 200, 900));
-  $inverse: theming.get-color-from-palette($color-palette, if($is-dark, 600, 300));
-
-  @return (
-    selected-focus-state-layer-color: $primary,
-    selected-handle-color: $primary,
-    selected-hover-state-layer-color: $primary,
-    selected-pressed-state-layer-color: $primary,
-
-    selected-focus-handle-color: $state-content,
-    selected-hover-handle-color: $state-content,
-    selected-pressed-handle-color: $state-content,
-
-    selected-focus-track-color: $inverse,
-    selected-hover-track-color: $inverse,
-    selected-pressed-track-color: $inverse,
-    selected-track-color: $inverse,
-  );
-}
+@use '../core/tokens/m2/mdc/switch' as m2-mdc-switch;
+@use '../core/tokens/m2/mat/slide-toggle' as m2-mat-slide-toggle;
+@use '../core/tokens/token-utils';
 
 @mixin color($config-or-theme) {
   $config: theming.get-color-config($config-or-theme);
@@ -77,28 +16,32 @@
   $is-dark: map.get($config, is-dark);
   $foreground: map.get($config, foreground);
 
+  $mdc-switch-color-tokens: m2-mdc-switch.get-color-tokens($config);
+
   @include mdc-helpers.using-mdc-theme($config) {
-    // MDC's switch doesn't support a `color` property. We add support
-    // for it by adding a CSS class for accent and warn style.
+    // Add values for MDC slide toggles tokens
     .mat-mdc-slide-toggle {
       @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-theme-styles-query);
-      @include mdc-switch-theme.theme(_get-theme-base-map($is-dark));
+      @include mdc-switch-theme.theme($mdc-switch-color-tokens);
 
       // MDC should set the disabled color on the label, but doesn't, so we do it here instead.
       .mdc-switch--disabled + label {
         color: theming.get-color-from-palette($foreground, disabled-text);
       }
 
-      &.mat-primary {
-        @include mdc-switch-theme.theme(_get-theme-color-map($primary, $is-dark));
-      }
-
+      // Change the color palette related tokens to accent or warn if applicable
       &.mat-accent {
-        @include mdc-switch-theme.theme(_get-theme-color-map($accent, $is-dark));
+        @include mdc-switch-theme.theme(m2-mdc-switch.private-get-color-palette-color-tokens(
+          map.get($config, accent),
+          map.get($config, is-dark)
+        ));
       }
 
       &.mat-warn {
-        @include mdc-switch-theme.theme(_get-theme-color-map($warn, $is-dark));
+        @include mdc-switch-theme.theme(m2-mdc-switch.private-get-color-palette-color-tokens(
+          map.get($config, warn),
+          map.get($config, is-dark)
+        ));
       }
     }
   }
@@ -107,8 +50,17 @@
 @mixin typography($config-or-theme) {
   $config: typography.private-typography-to-2018-config(
       theming.get-typography-config($config-or-theme));
-  @include mdc-helpers.using-mdc-typography($config) {
+  $mdc-switch-typography-tokens: m2-mdc-switch.get-typography-tokens($config);
+  $mat-slide-toggle-typography-tokens: m2-mat-slide-toggle.get-typography-tokens($config);
+
+  //Add values for MDC slide toggle tokens
+  .mat-mdc-slide-toggle {
     @include mdc-form-field.core-styles($query: mdc-helpers.$mdc-typography-styles-query);
+    @include mdc-switch-theme.theme($mdc-switch-typography-tokens);
+    @include token-utils.create-token-values(
+      m2-mat-slide-toggle.$prefix,
+      $mat-slide-toggle-typography-tokens
+    );
   }
 }
 
@@ -138,4 +90,3 @@
     }
   }
 }
-

package/slide-toggle/index.d.ts

@@ -101,6 +101,10 @@ export declare abstract class _MatSlideToggleBase<T> extends _MatSlideToggleMixi
     /** Whether the slide-toggle element is checked or not. */
     get checked(): boolean;
     set checked(value: BooleanInput);
+    /** Whether to hide the icon inside of the slide toggle. */
+    get hideIcon(): boolean;
+    set hideIcon(value: BooleanInput);
+    private _hideIcon;
     /** An event will be dispatched each time the slide-toggle changes its value. */
     readonly change: EventEmitter<T>;
     /**
@@ -129,7 +133,7 @@ export declare abstract class _MatSlideToggleBase<T> extends _MatSlideToggleMixi
      */
     protected _emitChangeEvent(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<_MatSlideToggleBase<any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSlideToggleBase<any>, never, never, { "name": { "alias": "name"; "required": false; }; "id": { "alias": "id"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "required": { "alias": "required"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, never, false, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<_MatSlideToggleBase<any>, never, never, { "name": { "alias": "name"; "required": false; }; "id": { "alias": "id"; "required": false; }; "labelPosition": { "alias": "labelPosition"; "required": false; }; "ariaLabel": { "alias": "aria-label"; "required": false; }; "ariaLabelledby": { "alias": "aria-labelledby"; "required": false; }; "ariaDescribedby": { "alias": "aria-describedby"; "required": false; }; "required": { "alias": "required"; "required": false; }; "checked": { "alias": "checked"; "required": false; }; "hideIcon": { "alias": "hideIcon"; "required": false; }; }, { "change": "change"; "toggleChange": "toggleChange"; }, never, never, false, never>;
 }
 
 /** Change event object emitted by a slide toggle. */
@@ -151,6 +155,8 @@ export declare interface MatSlideToggleDefaultOptions {
     disableToggleValue?: boolean;
     /** Default color for slide toggles. */
     color?: ThemePalette;
+    /** Whether to hide the icon inside the slide toggle. */
+    hideIcon?: boolean;
 }
 
 /** @docs-private */

package/table/_table-theme.scss

@@ -1,60 +1,44 @@
-@use 'sass:map';
-@use '@material/theme/theme-color' as mdc-theme-color;
-@use '@material/data-table/data-table' as mdc-data-table;
-@use '@material/data-table' as mdc-data-table-theme;
+@use '../core/tokens/m2/mat/table' as tokens-mat-table;
 @use '../core/theming/theming';
-@use '../core/mdc-helpers/mdc-helpers';
 @use '../core/typography/typography';
+@use '../core/tokens/token-utils';
 
-@mixin color($config-or-theme) {
-  $config: theming.get-color-config($config-or-theme);
-  // Save original values of MDC global variables. We need to save these so we can restore the
-  // variables to their original values and prevent unintended side effects from using this mixin.
-  $orig-selected-row-fill-color: mdc-data-table-theme.$selected-row-fill-color;
-  $orig-divider-color: mdc-data-table-theme.$divider-color;
-  $orig-row-hover-fill-color: mdc-data-table-theme.$row-hover-fill-color;
-  $orig-header-row-text-color: mdc-data-table-theme.$header-row-text-color;
-  $orig-row-text-color: mdc-data-table-theme.$row-text-color;
-  $orig-stroke-color: mdc-data-table-theme.$stroke-color;
-
-  @include mdc-helpers.using-mdc-theme($config) {
-    mdc-data-table-theme.$selected-row-fill-color: rgba(mdc-theme-color.prop-value(primary), 0.04);
-    mdc-data-table-theme.$divider-color: rgba(mdc-theme-color.prop-value(on-surface), 0.12);
-    mdc-data-table-theme.$row-hover-fill-color: rgba(mdc-theme-color.prop-value(on-surface), 0.04);
-    mdc-data-table-theme.$header-row-text-color: rgba(mdc-theme-color.prop-value(on-surface), 0.87);
-    mdc-data-table-theme.$row-text-color: rgba(mdc-theme-color.prop-value(on-surface), 0.87);
-    mdc-data-table-theme.$stroke-color: rgba(mdc-theme-color.prop-value(on-surface), 0.12);
-
-    @include mdc-data-table.table-styles($query: mdc-helpers.$mdc-theme-styles-query);
+@mixin _output-tokens {
+  @if (&) {
+    @content;
+  }
+  @else {
+    html {
+      @content;
+    }
   }
+}
 
-  // Restore original values of MDC global variables.
-  mdc-data-table-theme.$selected-row-fill-color: $orig-selected-row-fill-color;
-  mdc-data-table-theme.$divider-color: $orig-divider-color;
-  mdc-data-table-theme.$row-hover-fill-color: $orig-row-hover-fill-color;
-  mdc-data-table-theme.$header-row-text-color: $orig-header-row-text-color;
-  mdc-data-table-theme.$row-text-color: $orig-row-text-color;
-  mdc-data-table-theme.$stroke-color: $orig-stroke-color;
+@mixin color($config-or-theme) {
+  $config: theming.get-color-config($config-or-theme);
 
-  .mat-mdc-table {
-    $background: map.get($config, background);
-    background: theming.get-color-from-palette($background, 'card');
+  @include _output-tokens {
+    @include token-utils.create-token-values(tokens-mat-table.$prefix,
+      tokens-mat-table.get-color-tokens($config));
   }
 }
 
 @mixin typography($config-or-theme) {
   $config: typography.private-typography-to-2018-config(
       theming.get-typography-config($config-or-theme));
-  @include mdc-helpers.using-mdc-typography($config) {
-    @include mdc-data-table.table-styles($query: mdc-helpers.$mdc-typography-styles-query);
+
+  @include _output-tokens {
+    @include token-utils.create-token-values(tokens-mat-table.$prefix,
+      tokens-mat-table.get-typography-tokens($config));
   }
 }
 
 @mixin density($config-or-theme) {
   $density-scale: theming.get-density-config($config-or-theme);
-  .mat-mdc-table {
-    @include mdc-data-table-theme.density($density-scale,
-      $query: mdc-helpers.$mdc-base-styles-query);
+
+  @include _output-tokens {
+    @include token-utils.create-token-values(tokens-mat-table.$prefix,
+      tokens-mat-table.get-density-tokens($density-scale));
   }
 }
 

package/esm2022/button/button-lazy-loader.mjs

@@ -1,113 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { DOCUMENT } from '@angular/common';
-import { ANIMATION_MODULE_TYPE, ElementRef, Injectable, NgZone, inject, } from '@angular/core';
-import { MAT_RIPPLE_GLOBAL_OPTIONS, MatRipple, RippleRenderer, } from '@angular/material/core';
-import { Platform } from '@angular/cdk/platform';
-import * as i0 from "@angular/core";
-/** The options for the MatButtonRippleLoader's event listeners. */
-const eventListenerOptions = { capture: true };
-/** The events that should trigger the initialization of the ripple. */
-const rippleInteractionEvents = ['focus', 'click', 'mouseenter', 'touchstart'];
-/** The attribute attached to a mat-button whose ripple has not yet been initialized. */
-export const MAT_BUTTON_RIPPLE_UNINITIALIZED = 'mat-button-ripple-uninitialized';
-/**
- * Handles attaching the MatButton's ripple on demand.
- *
- * This service allows us to avoid eagerly creating & attaching the MatButton's ripple.
- * It works by creating & attaching the ripple only when a MatButton is first interacted with.
- */
-export class MatButtonLazyLoader {
-    constructor() {
-        this._document = inject(DOCUMENT, { optional: true });
-        this._animationMode = inject(ANIMATION_MODULE_TYPE, { optional: true });
-        this._globalRippleOptions = inject(MAT_RIPPLE_GLOBAL_OPTIONS, { optional: true });
-        this._platform = inject(Platform);
-        this._ngZone = inject(NgZone);
-        /** Handles creating and attaching button internals when a button is initially interacted with. */
-        this._onInteraction = (event) => {
-            if (event.target === this._document) {
-                return;
-            }
-            const eventTarget = event.target;
-            // TODO(wagnermaciel): Consider batching these events to improve runtime performance.
-            const button = eventTarget.closest(`[${MAT_BUTTON_RIPPLE_UNINITIALIZED}]`);
-            if (button) {
-                button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);
-                this._appendRipple(button);
-            }
-        };
-        this._ngZone.runOutsideAngular(() => {
-            for (const event of rippleInteractionEvents) {
-                this._document?.addEventListener(event, this._onInteraction, eventListenerOptions);
-            }
-        });
-    }
-    ngOnDestroy() {
-        for (const event of rippleInteractionEvents) {
-            this._document?.removeEventListener(event, this._onInteraction, eventListenerOptions);
-        }
-    }
-    /** Creates a MatButtonRipple and appends it to the given button element. */
-    _appendRipple(button) {
-        if (!this._document) {
-            return;
-        }
-        const ripple = this._document.createElement('span');
-        ripple.classList.add('mat-mdc-button-ripple');
-        const target = new MatButtonRippleTarget(button, this._globalRippleOptions ? this._globalRippleOptions : undefined, this._animationMode ? this._animationMode : undefined);
-        target.rippleConfig.centered = button.hasAttribute('mat-icon-button');
-        const rippleRenderer = new RippleRenderer(target, this._ngZone, ripple, this._platform);
-        rippleRenderer.setupTriggerEvents(button);
-        button.append(ripple);
-    }
-    _createMatRipple(button) {
-        if (!this._document) {
-            return;
-        }
-        button.querySelector('.mat-mdc-button-ripple')?.remove();
-        button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);
-        const rippleEl = this._document.createElement('span');
-        rippleEl.classList.add('mat-mdc-button-ripple');
-        const ripple = new MatRipple(new ElementRef(rippleEl), this._ngZone, this._platform, this._globalRippleOptions ? this._globalRippleOptions : undefined, this._animationMode ? this._animationMode : undefined);
-        ripple._isInitialized = true;
-        ripple.trigger = button;
-        button.append(rippleEl);
-        return ripple;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.1", ngImport: i0, type: MatButtonLazyLoader, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.1", ngImport: i0, type: MatButtonLazyLoader, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.1", ngImport: i0, type: MatButtonLazyLoader, decorators: [{
-            type: Injectable,
-            args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return []; } });
-/**
- * The RippleTarget for the lazily rendered MatButton ripple.
- * It handles ripple configuration and disabled state for ripples interactions.
- *
- * Note that this configuration is usually handled by the MatRipple, but the MatButtonLazyLoader does not use the
- * MatRipple Directive. In order to create & attach a ripple on demand, it uses the "lower level" RippleRenderer.
- */
-class MatButtonRippleTarget {
-    constructor(_button, _globalRippleOptions, animationMode) {
-        this._button = _button;
-        this._globalRippleOptions = _globalRippleOptions;
-        this._setRippleConfig(_globalRippleOptions, animationMode);
-    }
-    _setRippleConfig(globalRippleOptions, animationMode) {
-        this.rippleConfig = globalRippleOptions || {};
-        if (animationMode === 'NoopAnimations') {
-            this.rippleConfig.animation = { enterDuration: 0, exitDuration: 0 };
-        }
-    }
-    get rippleDisabled() {
-        return this._button.hasAttribute('disabled') || !!this._globalRippleOptions?.disabled;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"button-lazy-loader.js","sourceRoot":"","sources":["../../../../../../src/material/button/button-lazy-loader.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,qBAAqB,EACrB,UAAU,EACV,UAAU,EACV,MAAM,EAEN,MAAM,GACP,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,yBAAyB,EACzB,SAAS,EAGT,cAAc,GAEf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAC,QAAQ,EAAC,MAAM,uBAAuB,CAAC;;AAE/C,mEAAmE;AACnE,MAAM,oBAAoB,GAAG,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC;AAE7C,uEAAuE;AACvE,MAAM,uBAAuB,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;AAE/E,wFAAwF;AACxF,MAAM,CAAC,MAAM,+BAA+B,GAAG,iCAAiC,CAAC;AAEjF;;;;;GAKG;AAEH,MAAM,OAAO,mBAAmB;IAO9B;QANQ,cAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QAC/C,mBAAc,GAAG,MAAM,CAAC,qBAAqB,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QACjE,yBAAoB,GAAG,MAAM,CAAC,yBAAyB,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC;QAC3E,cAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7B,YAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAgBjC,kGAAkG;QAC1F,mBAAc,GAAG,CAAC,KAAY,EAAE,EAAE;YACxC,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,SAAS,EAAE;gBACnC,OAAO;aACR;YACD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAiB,CAAC;YAE5C,qFAAqF;YAErF,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,+BAA+B,GAAG,CAAC,CAAC;YAC3E,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC;gBACxD,IAAI,CAAC,aAAa,CAAC,MAAqB,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC;QA3BA,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,EAAE;YAClC,KAAK,MAAM,KAAK,IAAI,uBAAuB,EAAE;gBAC3C,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;aACpF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,WAAW;QACT,KAAK,MAAM,KAAK,IAAI,uBAAuB,EAAE;YAC3C,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;SACvF;IACH,CAAC;IAkBD,4EAA4E;IACpE,aAAa,CAAC,MAAmB;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO;SACR;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAE9C,MAAM,MAAM,GAAG,IAAI,qBAAqB,CACtC,MAAM,EACN,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,EACjE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CACtD,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,QAAQ,GAAG,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QAEtE,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACxF,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,gBAAgB,CAAC,MAAmB;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,OAAO;SACR;QACD,MAAM,CAAC,aAAa,CAAC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;QACzD,MAAM,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QACvD,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,SAAS,CAC1B,IAAI,UAAU,CAAC,QAAQ,CAAC,EACxB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,SAAS,EACjE,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CACtD,CAAC;QACF,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;QAC7B,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC;8GA5EU,mBAAmB;kHAAnB,mBAAmB,cADP,MAAM;;2FAClB,mBAAmB;kBAD/B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC;;AAgFhC;;;;;;GAMG;AACH,MAAM,qBAAqB;IAGzB,YACU,OAAoB,EACpB,oBAA0C,EAClD,aAAsB;QAFd,YAAO,GAAP,OAAO,CAAa;QACpB,yBAAoB,GAApB,oBAAoB,CAAsB;QAGlD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;IAC7D,CAAC;IAEO,gBAAgB,CAAC,mBAAyC,EAAE,aAAsB;QACxF,IAAI,CAAC,YAAY,GAAG,mBAAmB,IAAI,EAAE,CAAC;QAC9C,IAAI,aAAa,KAAK,gBAAgB,EAAE;YACtC,IAAI,CAAC,YAAY,CAAC,SAAS,GAAG,EAAC,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAC,CAAC;SACnE;IACH,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC;IACxF,CAAC;CACF","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {DOCUMENT} from '@angular/common';\nimport {\n  ANIMATION_MODULE_TYPE,\n  ElementRef,\n  Injectable,\n  NgZone,\n  OnDestroy,\n  inject,\n} from '@angular/core';\nimport {\n  MAT_RIPPLE_GLOBAL_OPTIONS,\n  MatRipple,\n  RippleConfig,\n  RippleGlobalOptions,\n  RippleRenderer,\n  RippleTarget,\n} from '@angular/material/core';\nimport {Platform} from '@angular/cdk/platform';\n\n/** The options for the MatButtonRippleLoader's event listeners. */\nconst eventListenerOptions = {capture: true};\n\n/** The events that should trigger the initialization of the ripple. */\nconst rippleInteractionEvents = ['focus', 'click', 'mouseenter', 'touchstart'];\n\n/** The attribute attached to a mat-button whose ripple has not yet been initialized. */\nexport const MAT_BUTTON_RIPPLE_UNINITIALIZED = 'mat-button-ripple-uninitialized';\n\n/**\n * Handles attaching the MatButton's ripple on demand.\n *\n * This service allows us to avoid eagerly creating & attaching the MatButton's ripple.\n * It works by creating & attaching the ripple only when a MatButton is first interacted with.\n */\n@Injectable({providedIn: 'root'})\nexport class MatButtonLazyLoader implements OnDestroy {\n  private _document = inject(DOCUMENT, {optional: true});\n  private _animationMode = inject(ANIMATION_MODULE_TYPE, {optional: true});\n  private _globalRippleOptions = inject(MAT_RIPPLE_GLOBAL_OPTIONS, {optional: true});\n  private _platform = inject(Platform);\n  private _ngZone = inject(NgZone);\n\n  constructor() {\n    this._ngZone.runOutsideAngular(() => {\n      for (const event of rippleInteractionEvents) {\n        this._document?.addEventListener(event, this._onInteraction, eventListenerOptions);\n      }\n    });\n  }\n\n  ngOnDestroy() {\n    for (const event of rippleInteractionEvents) {\n      this._document?.removeEventListener(event, this._onInteraction, eventListenerOptions);\n    }\n  }\n\n  /** Handles creating and attaching button internals when a button is initially interacted with. */\n  private _onInteraction = (event: Event) => {\n    if (event.target === this._document) {\n      return;\n    }\n    const eventTarget = event.target as Element;\n\n    // TODO(wagnermaciel): Consider batching these events to improve runtime performance.\n\n    const button = eventTarget.closest(`[${MAT_BUTTON_RIPPLE_UNINITIALIZED}]`);\n    if (button) {\n      button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);\n      this._appendRipple(button as HTMLElement);\n    }\n  };\n\n  /** Creates a MatButtonRipple and appends it to the given button element. */\n  private _appendRipple(button: HTMLElement): void {\n    if (!this._document) {\n      return;\n    }\n    const ripple = this._document.createElement('span');\n    ripple.classList.add('mat-mdc-button-ripple');\n\n    const target = new MatButtonRippleTarget(\n      button,\n      this._globalRippleOptions ? this._globalRippleOptions : undefined,\n      this._animationMode ? this._animationMode : undefined,\n    );\n    target.rippleConfig.centered = button.hasAttribute('mat-icon-button');\n\n    const rippleRenderer = new RippleRenderer(target, this._ngZone, ripple, this._platform);\n    rippleRenderer.setupTriggerEvents(button);\n    button.append(ripple);\n  }\n\n  _createMatRipple(button: HTMLElement): MatRipple | undefined {\n    if (!this._document) {\n      return;\n    }\n    button.querySelector('.mat-mdc-button-ripple')?.remove();\n    button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);\n    const rippleEl = this._document!.createElement('span');\n    rippleEl.classList.add('mat-mdc-button-ripple');\n    const ripple = new MatRipple(\n      new ElementRef(rippleEl),\n      this._ngZone,\n      this._platform,\n      this._globalRippleOptions ? this._globalRippleOptions : undefined,\n      this._animationMode ? this._animationMode : undefined,\n    );\n    ripple._isInitialized = true;\n    ripple.trigger = button;\n    button.append(rippleEl);\n    return ripple;\n  }\n}\n\n/**\n * The RippleTarget for the lazily rendered MatButton ripple.\n * It handles ripple configuration and disabled state for ripples interactions.\n *\n * Note that this configuration is usually handled by the MatRipple, but the MatButtonLazyLoader does not use the\n * MatRipple Directive. In order to create & attach a ripple on demand, it uses the \"lower level\" RippleRenderer.\n */\nclass MatButtonRippleTarget implements RippleTarget {\n  rippleConfig: RippleConfig & RippleGlobalOptions;\n\n  constructor(\n    private _button: HTMLElement,\n    private _globalRippleOptions?: RippleGlobalOptions,\n    animationMode?: string,\n  ) {\n    this._setRippleConfig(_globalRippleOptions, animationMode);\n  }\n\n  private _setRippleConfig(globalRippleOptions?: RippleGlobalOptions, animationMode?: string) {\n    this.rippleConfig = globalRippleOptions || {};\n    if (animationMode === 'NoopAnimations') {\n      this.rippleConfig.animation = {enterDuration: 0, exitDuration: 0};\n    }\n  }\n\n  get rippleDisabled(): boolean {\n    return this._button.hasAttribute('disabled') || !!this._globalRippleOptions?.disabled;\n  }\n}\n"]}