@angular/material 16.1.0-rc.0 → 16.2.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/button/index.d.ts +11 -35
- package/card/_card-theme.scss +4 -7
- package/checkbox/_checkbox-theme.scss +1 -4
- package/core/index.d.ts +37 -0
- package/core/style/_sass-utils.scss +12 -0
- package/core/tokens/_token-utils.scss +11 -2
- package/core/tokens/m2/mat/_table.scss +97 -0
- package/esm2022/button/button-base.mjs +32 -17
- package/esm2022/button/button.mjs +3 -3
- package/esm2022/button/fab.mjs +5 -5
- package/esm2022/button/icon-button.mjs +4 -15
- package/esm2022/core/private/index.mjs +9 -0
- package/esm2022/core/private/ripple-loader.mjs +133 -0
- package/esm2022/core/public-api.mjs +2 -1
- package/esm2022/core/version.mjs +1 -1
- package/esm2022/icon/icon-registry.mjs +2 -2
- package/esm2022/legacy-autocomplete/autocomplete-trigger.mjs +2 -2
- package/esm2022/select/select.mjs +14 -1
- package/esm2022/slider/slider-input.mjs +2 -1
- package/esm2022/slider/slider-interface.mjs +1 -1
- package/esm2022/table/table.mjs +2 -2
- package/esm2022/tabs/tab-nav-bar/tab-nav-bar.mjs +6 -3
- package/fesm2022/button.mjs +57 -156
- package/fesm2022/button.mjs.map +1 -1
- package/fesm2022/core.mjs +124 -3
- package/fesm2022/core.mjs.map +1 -1
- package/fesm2022/icon.mjs +1 -1
- package/fesm2022/icon.mjs.map +1 -1
- package/fesm2022/legacy-autocomplete.mjs.map +1 -1
- package/fesm2022/select.mjs +13 -0
- package/fesm2022/select.mjs.map +1 -1
- package/fesm2022/slider.mjs +1 -0
- package/fesm2022/slider.mjs.map +1 -1
- package/fesm2022/table.mjs +2 -2
- package/fesm2022/table.mjs.map +1 -1
- package/fesm2022/tabs.mjs +4 -1
- package/fesm2022/tabs.mjs.map +1 -1
- package/form-field/_form-field-theme.import.scss +1 -1
- package/icon/index.d.ts +1 -1
- package/package.json +2 -2
- package/prebuilt-themes/deeppurple-amber.css +1 -1
- package/prebuilt-themes/indigo-pink.css +1 -1
- package/prebuilt-themes/pink-bluegrey.css +1 -1
- package/prebuilt-themes/purple-green.css +1 -1
- package/schematics/ng-add/index.js +1 -1
- package/schematics/ng-add/index.mjs +1 -1
- package/slider/index.d.ts +1 -0
- package/table/_table-theme.scss +24 -40
- package/esm2022/button/button-lazy-loader.mjs +0 -113
package/table/_table-theme.scss
CHANGED
|
@@ -1,60 +1,44 @@
|
|
|
1
|
-
@use '
|
|
2
|
-
@use '@material/theme/theme-color' as mdc-theme-color;
|
|
3
|
-
@use '@material/data-table/data-table' as mdc-data-table;
|
|
4
|
-
@use '@material/data-table' as mdc-data-table-theme;
|
|
1
|
+
@use '../core/tokens/m2/mat/table' as tokens-mat-table;
|
|
5
2
|
@use '../core/theming/theming';
|
|
6
|
-
@use '../core/mdc-helpers/mdc-helpers';
|
|
7
3
|
@use '../core/typography/typography';
|
|
4
|
+
@use '../core/tokens/token-utils';
|
|
8
5
|
|
|
9
|
-
@mixin
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
$orig-row-text-color: mdc-data-table-theme.$row-text-color;
|
|
18
|
-
$orig-stroke-color: mdc-data-table-theme.$stroke-color;
|
|
19
|
-
|
|
20
|
-
@include mdc-helpers.using-mdc-theme($config) {
|
|
21
|
-
mdc-data-table-theme.$selected-row-fill-color: rgba(mdc-theme-color.prop-value(primary), 0.04);
|
|
22
|
-
mdc-data-table-theme.$divider-color: rgba(mdc-theme-color.prop-value(on-surface), 0.12);
|
|
23
|
-
mdc-data-table-theme.$row-hover-fill-color: rgba(mdc-theme-color.prop-value(on-surface), 0.04);
|
|
24
|
-
mdc-data-table-theme.$header-row-text-color: rgba(mdc-theme-color.prop-value(on-surface), 0.87);
|
|
25
|
-
mdc-data-table-theme.$row-text-color: rgba(mdc-theme-color.prop-value(on-surface), 0.87);
|
|
26
|
-
mdc-data-table-theme.$stroke-color: rgba(mdc-theme-color.prop-value(on-surface), 0.12);
|
|
27
|
-
|
|
28
|
-
@include mdc-data-table.table-styles($query: mdc-helpers.$mdc-theme-styles-query);
|
|
6
|
+
@mixin _output-tokens {
|
|
7
|
+
@if (&) {
|
|
8
|
+
@content;
|
|
9
|
+
}
|
|
10
|
+
@else {
|
|
11
|
+
html {
|
|
12
|
+
@content;
|
|
13
|
+
}
|
|
29
14
|
}
|
|
15
|
+
}
|
|
30
16
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
mdc-data-table-theme.$divider-color: $orig-divider-color;
|
|
34
|
-
mdc-data-table-theme.$row-hover-fill-color: $orig-row-hover-fill-color;
|
|
35
|
-
mdc-data-table-theme.$header-row-text-color: $orig-header-row-text-color;
|
|
36
|
-
mdc-data-table-theme.$row-text-color: $orig-row-text-color;
|
|
37
|
-
mdc-data-table-theme.$stroke-color: $orig-stroke-color;
|
|
17
|
+
@mixin color($config-or-theme) {
|
|
18
|
+
$config: theming.get-color-config($config-or-theme);
|
|
38
19
|
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
20
|
+
@include _output-tokens {
|
|
21
|
+
@include token-utils.create-token-values(tokens-mat-table.$prefix,
|
|
22
|
+
tokens-mat-table.get-color-tokens($config));
|
|
42
23
|
}
|
|
43
24
|
}
|
|
44
25
|
|
|
45
26
|
@mixin typography($config-or-theme) {
|
|
46
27
|
$config: typography.private-typography-to-2018-config(
|
|
47
28
|
theming.get-typography-config($config-or-theme));
|
|
48
|
-
|
|
49
|
-
|
|
29
|
+
|
|
30
|
+
@include _output-tokens {
|
|
31
|
+
@include token-utils.create-token-values(tokens-mat-table.$prefix,
|
|
32
|
+
tokens-mat-table.get-typography-tokens($config));
|
|
50
33
|
}
|
|
51
34
|
}
|
|
52
35
|
|
|
53
36
|
@mixin density($config-or-theme) {
|
|
54
37
|
$density-scale: theming.get-density-config($config-or-theme);
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
38
|
+
|
|
39
|
+
@include _output-tokens {
|
|
40
|
+
@include token-utils.create-token-values(tokens-mat-table.$prefix,
|
|
41
|
+
tokens-mat-table.get-density-tokens($density-scale));
|
|
58
42
|
}
|
|
59
43
|
}
|
|
60
44
|
|
|
@@ -1,113 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @license
|
|
3
|
-
* Copyright Google LLC All Rights Reserved.
|
|
4
|
-
*
|
|
5
|
-
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
-
* found in the LICENSE file at https://angular.io/license
|
|
7
|
-
*/
|
|
8
|
-
import { DOCUMENT } from '@angular/common';
|
|
9
|
-
import { ANIMATION_MODULE_TYPE, ElementRef, Injectable, NgZone, inject, } from '@angular/core';
|
|
10
|
-
import { MAT_RIPPLE_GLOBAL_OPTIONS, MatRipple, RippleRenderer, } from '@angular/material/core';
|
|
11
|
-
import { Platform } from '@angular/cdk/platform';
|
|
12
|
-
import * as i0 from "@angular/core";
|
|
13
|
-
/** The options for the MatButtonRippleLoader's event listeners. */
|
|
14
|
-
const eventListenerOptions = { capture: true };
|
|
15
|
-
/** The events that should trigger the initialization of the ripple. */
|
|
16
|
-
const rippleInteractionEvents = ['focus', 'click', 'mouseenter', 'touchstart'];
|
|
17
|
-
/** The attribute attached to a mat-button whose ripple has not yet been initialized. */
|
|
18
|
-
export const MAT_BUTTON_RIPPLE_UNINITIALIZED = 'mat-button-ripple-uninitialized';
|
|
19
|
-
/**
|
|
20
|
-
* Handles attaching the MatButton's ripple on demand.
|
|
21
|
-
*
|
|
22
|
-
* This service allows us to avoid eagerly creating & attaching the MatButton's ripple.
|
|
23
|
-
* It works by creating & attaching the ripple only when a MatButton is first interacted with.
|
|
24
|
-
*/
|
|
25
|
-
export class MatButtonLazyLoader {
|
|
26
|
-
constructor() {
|
|
27
|
-
this._document = inject(DOCUMENT, { optional: true });
|
|
28
|
-
this._animationMode = inject(ANIMATION_MODULE_TYPE, { optional: true });
|
|
29
|
-
this._globalRippleOptions = inject(MAT_RIPPLE_GLOBAL_OPTIONS, { optional: true });
|
|
30
|
-
this._platform = inject(Platform);
|
|
31
|
-
this._ngZone = inject(NgZone);
|
|
32
|
-
/** Handles creating and attaching button internals when a button is initially interacted with. */
|
|
33
|
-
this._onInteraction = (event) => {
|
|
34
|
-
if (event.target === this._document) {
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
const eventTarget = event.target;
|
|
38
|
-
// TODO(wagnermaciel): Consider batching these events to improve runtime performance.
|
|
39
|
-
const button = eventTarget.closest(`[${MAT_BUTTON_RIPPLE_UNINITIALIZED}]`);
|
|
40
|
-
if (button) {
|
|
41
|
-
button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);
|
|
42
|
-
this._appendRipple(button);
|
|
43
|
-
}
|
|
44
|
-
};
|
|
45
|
-
this._ngZone.runOutsideAngular(() => {
|
|
46
|
-
for (const event of rippleInteractionEvents) {
|
|
47
|
-
this._document?.addEventListener(event, this._onInteraction, eventListenerOptions);
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
}
|
|
51
|
-
ngOnDestroy() {
|
|
52
|
-
for (const event of rippleInteractionEvents) {
|
|
53
|
-
this._document?.removeEventListener(event, this._onInteraction, eventListenerOptions);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
/** Creates a MatButtonRipple and appends it to the given button element. */
|
|
57
|
-
_appendRipple(button) {
|
|
58
|
-
if (!this._document) {
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
const ripple = this._document.createElement('span');
|
|
62
|
-
ripple.classList.add('mat-mdc-button-ripple');
|
|
63
|
-
const target = new MatButtonRippleTarget(button, this._globalRippleOptions ? this._globalRippleOptions : undefined, this._animationMode ? this._animationMode : undefined);
|
|
64
|
-
target.rippleConfig.centered = button.hasAttribute('mat-icon-button');
|
|
65
|
-
const rippleRenderer = new RippleRenderer(target, this._ngZone, ripple, this._platform);
|
|
66
|
-
rippleRenderer.setupTriggerEvents(button);
|
|
67
|
-
button.append(ripple);
|
|
68
|
-
}
|
|
69
|
-
_createMatRipple(button) {
|
|
70
|
-
if (!this._document) {
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
button.querySelector('.mat-mdc-button-ripple')?.remove();
|
|
74
|
-
button.removeAttribute(MAT_BUTTON_RIPPLE_UNINITIALIZED);
|
|
75
|
-
const rippleEl = this._document.createElement('span');
|
|
76
|
-
rippleEl.classList.add('mat-mdc-button-ripple');
|
|
77
|
-
const ripple = new MatRipple(new ElementRef(rippleEl), this._ngZone, this._platform, this._globalRippleOptions ? this._globalRippleOptions : undefined, this._animationMode ? this._animationMode : undefined);
|
|
78
|
-
ripple._isInitialized = true;
|
|
79
|
-
ripple.trigger = button;
|
|
80
|
-
button.append(rippleEl);
|
|
81
|
-
return ripple;
|
|
82
|
-
}
|
|
83
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.0-next.3", ngImport: i0, type: MatButtonLazyLoader, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
84
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.0-next.3", ngImport: i0, type: MatButtonLazyLoader, providedIn: 'root' }); }
|
|
85
|
-
}
|
|
86
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.0-next.3", ngImport: i0, type: MatButtonLazyLoader, decorators: [{
|
|
87
|
-
type: Injectable,
|
|
88
|
-
args: [{ providedIn: 'root' }]
|
|
89
|
-
}], ctorParameters: function () { return []; } });
|
|
90
|
-
/**
|
|
91
|
-
* The RippleTarget for the lazily rendered MatButton ripple.
|
|
92
|
-
* It handles ripple configuration and disabled state for ripples interactions.
|
|
93
|
-
*
|
|
94
|
-
* Note that this configuration is usually handled by the MatRipple, but the MatButtonLazyLoader does not use the
|
|
95
|
-
* MatRipple Directive. In order to create & attach a ripple on demand, it uses the "lower level" RippleRenderer.
|
|
96
|
-
*/
|
|
97
|
-
class MatButtonRippleTarget {
|
|
98
|
-
constructor(_button, _globalRippleOptions, animationMode) {
|
|
99
|
-
this._button = _button;
|
|
100
|
-
this._globalRippleOptions = _globalRippleOptions;
|
|
101
|
-
this._setRippleConfig(_globalRippleOptions, animationMode);
|
|
102
|
-
}
|
|
103
|
-
_setRippleConfig(globalRippleOptions, animationMode) {
|
|
104
|
-
this.rippleConfig = globalRippleOptions || {};
|
|
105
|
-
if (animationMode === 'NoopAnimations') {
|
|
106
|
-
this.rippleConfig.animation = { enterDuration: 0, exitDuration: 0 };
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
get rippleDisabled() {
|
|
110
|
-
return this._button.hasAttribute('disabled') || !!this._globalRippleOptions?.disabled;
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"button-lazy-loader.js","sourceRoot":"","sources":["../../../../../../src/material/button/button-lazy-loader.ts"],"names":[],"mappings":"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","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"]}
|