Skip to content

Commit 838c728

Browse files
committed
main - 103ac7c refactor(multiple): switch button selectors
1 parent 6f10210 commit 838c728

File tree

284 files changed

+1011
-864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+1011
-864
lines changed

docs-content/api-docs/material-button-testing.html

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ <h4 id="MatButtonHarness" class="docs-header-link docs-api-h4 docs-api-class-nam
5757

5858
<tr class="docs-api-properties-row">
5959
<td class="docs-api-properties-name-cell"><p class="docs-api-property-name">
60-
<code>static&nbsp;hostSelector: `[mat-button], [mat-raised-button], [mat-flat-button],
61-
[mat-icon-button], [mat-stroked-button], [mat-fab], [mat-mini-fab]`</code>
60+
<code>static&nbsp;hostSelector: `[matButton], [mat-button], [matIconButton], [matFab], [matMiniFab],
61+
[mat-raised-button], [mat-flat-button], [mat-icon-button], [mat-stroked-button], [mat-fab],
62+
[mat-mini-fab]`</code>
6263
</p>
6364
</td>
6465
<td class="docs-api-property-description"></td>
@@ -386,6 +387,39 @@ <h5 class="docs-api-h5 docs-api-method-header">Methods</h5>
386387

387388

388389

390+
<table class="docs-api-method-table">
391+
<thead>
392+
<tr class="docs-api-method-name-row">
393+
<th colspan="2" class="docs-api-method-name-cell"><div class="docs-api-modifier-method-marker">
394+
async
395+
</div>getAppearance
396+
</th>
397+
</tr>
398+
</thead><tr class="docs-api-method-description-row">
399+
<td colspan="2" class="docs-api-method-description-cell">
400+
<p>Gets the appearance of the button.</p>
401+
402+
</td>
403+
</tr><thead>
404+
<tr class="docs-api-method-returns-header-row">
405+
<th colspan="2" class="docs-api-method-returns-header-cell">Returns</th>
406+
</tr>
407+
</thead>
408+
<tr>
409+
<td class="docs-api-method-returns-type-cell">
410+
<code class="docs-api-method-returns-type">Promise&lt;ButtonAppearance | null&gt;</code>
411+
</td>
412+
<td class="docs-api-method-returns-description-cell">
413+
<p class="docs-api-method-returns-description">
414+
415+
</p>
416+
</td>
417+
</tr></table>
418+
419+
420+
421+
422+
389423
<table class="docs-api-method-table">
390424
<thead>
391425
<tr class="docs-api-method-name-row">
@@ -767,6 +801,7 @@ <h5 class="docs-api-h5 docs-api-method-header">Methods</h5>
767801
<li><code>selector</code> finds a button whose host element matches the given selector.</li>
768802
<li><code>text</code> finds a button with specific text content.</li>
769803
<li><code>variant</code> finds buttons matching a specific variant.</li>
804+
<li><code>appearance</code> finds buttons matching a specific appearance.</li>
770805
</ul>
771806

772807
</p>
@@ -814,6 +849,19 @@ <h4 id="ButtonHarnessFilters" class="docs-header-link docs-api-h4 docs-api-inter
814849

815850

816851

852+
<tr class="docs-api-properties-row">
853+
<td class="docs-api-properties-name-cell"><p class="docs-api-property-name">
854+
<code>appearance: ButtonAppearance</code>
855+
</p>
856+
</td>
857+
<td class="docs-api-property-description"><p>Only find instances with a specific appearance.</p>
858+
</td>
859+
</tr>
860+
861+
862+
863+
864+
817865
<tr class="docs-api-properties-row">
818866
<td class="docs-api-properties-name-cell"><p class="docs-api-property-name">
819867
<code>disabled: boolean</code>
@@ -868,10 +916,24 @@ <h3 id="material-button-testing-type_aliases" class="docs-header-link docs-api-h
868916
<h4 id="ButtonVariant" class="docs-header-link docs-api-h4 docs-api-type-alias-name">
869917
<span header-link="ButtonVariant"></span>
870918
<code>ButtonVariant</code>
919+
</h4><p class="docs-api-type-alias-description"><p>Possible button variants.</p>
920+
</p><div class="docs-markdown">
921+
<pre class="docs-markdown-pre">
922+
<code class="docs-markdown-code"><span class="hljs-keyword">type</span> ButtonVariant = <span class="hljs-string">&#x27;basic&#x27;</span> | <span class="hljs-string">&#x27;icon&#x27;</span> | <span class="hljs-string">&#x27;fab&#x27;</span> | <span class="hljs-string">&#x27;mini-fab&#x27;</span>;</code>
923+
</pre>
924+
</div>
925+
926+
927+
928+
929+
930+
<h4 id="ButtonAppearance" class="docs-header-link docs-api-h4 docs-api-type-alias-name">
931+
<span header-link="ButtonAppearance"></span>
932+
<code>ButtonAppearance</code>
871933
</h4><p class="docs-api-type-alias-description"><p>Possible button appearances.</p>
872934
</p><div class="docs-markdown">
873935
<pre class="docs-markdown-pre">
874-
<code class="docs-markdown-code"><span class="hljs-keyword">type</span> ButtonVariant = <span class="hljs-string">&#x27;basic&#x27;</span> | <span class="hljs-string">&#x27;raised&#x27;</span> | <span class="hljs-string">&#x27;flat&#x27;</span> | <span class="hljs-string">&#x27;icon&#x27;</span> | <span class="hljs-string">&#x27;stroked&#x27;</span> | <span class="hljs-string">&#x27;fab&#x27;</span> | <span class="hljs-string">&#x27;mini-fab&#x27;</span>;</code>
936+
<code class="docs-markdown-code"><span class="hljs-keyword">type</span> ButtonAppearance = <span class="hljs-string">&#x27;text&#x27;</span> | <span class="hljs-string">&#x27;filled&#x27;</span> | <span class="hljs-string">&#x27;elevated&#x27;</span> | <span class="hljs-string">&#x27;outlined&#x27;</span>;</code>
875937
</pre>
876938
</div>
877939

docs-content/api-docs/material-button.html

Lines changed: 97 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ <h4 id="MatButton" class="docs-header-link docs-api-h4 docs-api-class-name">
3939
<code>MatButton</code>
4040

4141
</h4><p class="docs-api-class-description"><p>Material Design button component. Users interact with a button to perform an action.
42-
See <a href="https://material.io/components/buttons">https://material.io/components/buttons</a></p>
43-
<p>The <code>MatButton</code> class applies to native button elements and captures the appearances for
44-
&quot;text button&quot;, &quot;outlined button&quot;, and &quot;contained button&quot; per the Material Design
45-
specification. <code>MatButton</code> additionally captures an additional &quot;flat&quot; appearance, which matches
46-
&quot;contained&quot; but without elevation.</p>
42+
See <a href="https://m3.material.io/components/buttons/overview">https://m3.material.io/components/buttons/overview</a></p>
4743
</p><p class="docs-api-directive-selectors">
4844
<span class="docs-api-class-selector-label">Selector:</span>
4945

50-
<span class="docs-api-class-selector-name"> button[mat-button]</span>
46+
<span class="docs-api-class-selector-name"> button[matButton]</span>
47+
48+
<span class="docs-api-class-selector-name">a[matButton]</span>
49+
50+
<span class="docs-api-class-selector-name">button[mat-button]</span>
5151

5252
<span class="docs-api-class-selector-name">button[mat-raised-button]</span>
5353

@@ -73,6 +73,20 @@ <h4 id="MatButton" class="docs-header-link docs-api-h4 docs-api-class-name">
7373

7474

7575

76+
<tr class="docs-api-properties-row">
77+
<td class="docs-api-properties-name-cell"><div class="docs-api-input-marker">@Input(<span class="docs-api-input-alias">&#39;matButton&#39;</span>)
78+
</div><p class="docs-api-property-name">
79+
<code>appearance: MatButtonAppearance | null</code>
80+
</p>
81+
</td>
82+
<td class="docs-api-property-description"><p>Appearance of the button.</p>
83+
</td>
84+
</tr>
85+
86+
87+
88+
89+
7690
<tr class="docs-api-properties-row">
7791
<td class="docs-api-properties-name-cell"><div class="docs-api-input-marker">@Input(<span class="docs-api-input-alias">{ transform: booleanAttribute, alias: &#39;aria-disabled&#39; }</span>)
7892
</div><p class="docs-api-property-name">
@@ -203,6 +217,41 @@ <h5 class="docs-api-h5 docs-api-method-header">Methods</h5>
203217

204218

205219

220+
221+
222+
<table class="docs-api-method-table">
223+
<thead>
224+
<tr class="docs-api-method-name-row">
225+
<th colspan="2" class="docs-api-method-name-cell">setAppearance
226+
</th>
227+
</tr>
228+
</thead><tr class="docs-api-method-description-row">
229+
<td colspan="2" class="docs-api-method-description-cell">
230+
<p>Programmatically sets the appearance of the button.</p>
231+
232+
</td>
233+
</tr><thead>
234+
<tr class="docs-api-method-parameters-header-row">
235+
<th colspan="2" class="docs-api-method-parameters-header-cell">Parameters</th>
236+
</tr>
237+
</thead>
238+
239+
<tr class="docs-api-method-parameter-row">
240+
<td class="docs-api-method-parameter-cell">
241+
<p class="docs-api-method-parameter-name">
242+
appearance</p>
243+
<code class="docs-api-method-parameter-type">MatButtonAppearance</code>
244+
</td>
245+
<td class="docs-api-method-parameter-description-cell">
246+
<p class="docs-api-method-parameter-description">
247+
248+
</p>
249+
</td>
250+
</tr>
251+
</table>
252+
253+
254+
206255

207256

208257

@@ -215,7 +264,7 @@ <h4 id="MatFabButton" class="docs-header-link docs-api-h4 docs-api-class-name">
215264

216265
</h4><p class="docs-api-class-description"><p>Material Design floating action button (FAB) component. These buttons represent the primary
217266
or most common action for users to interact with.
218-
See <a href="https://material.io/components/buttons-floating-action-button/">https://material.io/components/buttons-floating-action-button/</a></p>
267+
See <a href="https://m3.material.io/components/floating-action-button/overview">https://m3.material.io/components/floating-action-button/overview</a></p>
219268
<p>The <code>MatFabButton</code> class has two appearances: normal and extended.</p>
220269
</p><p class="docs-api-directive-selectors">
221270
<span class="docs-api-class-selector-label">Selector:</span>
@@ -224,6 +273,10 @@ <h4 id="MatFabButton" class="docs-header-link docs-api-h4 docs-api-class-name">
224273

225274
<span class="docs-api-class-selector-name">a[mat-fab]</span>
226275

276+
<span class="docs-api-class-selector-name">button[matFab]</span>
277+
278+
<span class="docs-api-class-selector-name">a[matFab]</span>
279+
227280
</p><span class="docs-api-class-export-label">Exported as:</span>
228281
<span class="docs-api-class-export-name">matButton, matAnchor</span><h5 class="docs-api-h5 docs-api-method-header">Properties</h5>
229282
<table class="docs-api-properties-table">
@@ -389,14 +442,18 @@ <h4 id="MatMiniFabButton" class="docs-header-link docs-api-h4 docs-api-class-nam
389442

390443
</h4><p class="docs-api-class-description"><p>Material Design mini floating action button (FAB) component. These buttons represent the primary
391444
or most common action for users to interact with.
392-
See <a href="https://material.io/components/buttons-floating-action-button/">https://material.io/components/buttons-floating-action-button/</a></p>
445+
See <a href="https://m3.material.io/components/floating-action-button/overview">https://m3.material.io/components/floating-action-button/overview</a></p>
393446
</p><p class="docs-api-directive-selectors">
394447
<span class="docs-api-class-selector-label">Selector:</span>
395448

396449
<span class="docs-api-class-selector-name">button[mat-mini-fab]</span>
397450

398451
<span class="docs-api-class-selector-name">a[mat-mini-fab]</span>
399452

453+
<span class="docs-api-class-selector-name">button[matMiniFab]</span>
454+
455+
<span class="docs-api-class-selector-name">a[matMiniFab]</span>
456+
400457
</p><span class="docs-api-class-export-label">Exported as:</span>
401458
<span class="docs-api-class-export-name">matButton, matAnchor</span><h5 class="docs-api-h5 docs-api-method-header">Properties</h5>
402459
<table class="docs-api-properties-table">
@@ -557,6 +614,10 @@ <h4 id="MatIconButton" class="docs-header-link docs-api-h4 docs-api-class-name">
557614

558615
<span class="docs-api-class-selector-name">a[mat-icon-button]</span>
559616

617+
<span class="docs-api-class-selector-name">button[matIconButton]</span>
618+
619+
<span class="docs-api-class-selector-name">a[matIconButton]</span>
620+
560621
</p><span class="docs-api-class-export-label">Exported as:</span>
561622
<span class="docs-api-class-export-name">matButton, matAnchor</span><h5 class="docs-api-h5 docs-api-method-header">Properties</h5>
562623
<table class="docs-api-properties-table">
@@ -733,6 +794,19 @@ <h4 id="MatButtonConfig" class="docs-header-link docs-api-h4 docs-api-interface-
733794

734795

735796

797+
<tr class="docs-api-properties-row">
798+
<td class="docs-api-properties-name-cell"><p class="docs-api-property-name">
799+
<code>defaultAppearance: MatButtonAppearance</code>
800+
</p>
801+
</td>
802+
<td class="docs-api-property-description"><p>Default appearance for plain buttons (not icon buttons or FABs).</p>
803+
</td>
804+
</tr>
805+
806+
807+
808+
809+
736810
<tr class="docs-api-properties-row">
737811
<td class="docs-api-properties-name-cell"><p class="docs-api-property-name">
738812
<code>disabledInteractive: boolean</code>
@@ -795,6 +869,21 @@ <h3 id="material-button-type_aliases" class="docs-header-link docs-api-h3">
795869

796870

797871

872+
<h4 id="MatButtonAppearance" class="docs-header-link docs-api-h4 docs-api-type-alias-name">
873+
<span header-link="MatButtonAppearance"></span>
874+
<code>MatButtonAppearance</code>
875+
</h4><p class="docs-api-type-alias-description"><p>Possible appearances for a <code>MatButton</code>.
876+
See <a href="https://m3.material.io/components/buttons/overview">https://m3.material.io/components/buttons/overview</a></p>
877+
</p><div class="docs-markdown">
878+
<pre class="docs-markdown-pre">
879+
<code class="docs-markdown-code"><span class="hljs-keyword">type</span> MatButtonAppearance = <span class="hljs-string">&#x27;text&#x27;</span> | <span class="hljs-string">&#x27;filled&#x27;</span> | <span class="hljs-string">&#x27;elevated&#x27;</span> | <span class="hljs-string">&#x27;outlined&#x27;</span>;</code>
880+
</pre>
881+
</div>
882+
883+
884+
885+
886+
798887
<h4 id="MatAnchor" class="docs-header-link docs-api-h4 docs-api-type-alias-name">
799888
<span header-link="MatAnchor"></span>
800889
<code>MatAnchor</code>

docs-content/examples-highlighted/cdk/text-field/text-field-autofill-directive/text-field-autofill-directive-example-html.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<span class="hljs-tag">&lt;<span class="hljs-name">mat-hint</span>&gt;</span>Autofilled!<span class="hljs-tag">&lt;/<span class="hljs-name">mat-hint</span>&gt;</span>
1414
}
1515
<span class="hljs-tag">&lt;/<span class="hljs-name">mat-form-field</span>&gt;</span>
16-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-raised-button</span>&gt;</span>Submit<span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
16+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matButton</span>=<span class="hljs-string">&quot;elevated&quot;</span>&gt;</span>Submit<span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
1717
<span class="hljs-tag">&lt;/<span class="hljs-name">form</span>&gt;</span>

docs-content/examples-highlighted/cdk/text-field/text-field-autofill-monitor/text-field-autofill-monitor-example-html.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
<span class="hljs-tag">&lt;<span class="hljs-name">mat-hint</span>&gt;</span>Autofilled!<span class="hljs-tag">&lt;/<span class="hljs-name">mat-hint</span>&gt;</span>
1414
}
1515
<span class="hljs-tag">&lt;/<span class="hljs-name">mat-form-field</span>&gt;</span>
16-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-raised-button</span>&gt;</span>Submit<span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
16+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matButton</span>=<span class="hljs-string">&quot;elevated&quot;</span>&gt;</span>Submit<span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
1717
<span class="hljs-tag">&lt;/<span class="hljs-name">form</span>&gt;</span>

docs-content/examples-highlighted/cdk/tree/cdk-tree-complex/cdk-tree-complex-example-html.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@if (!node.areChildrenLoading() &amp;&amp; node.isExpandable()) {
2222
<span class="hljs-tag">&lt;<span class="hljs-name">button</span>
23-
<span class="hljs-attr">mat-icon-button</span>
23+
<span class="hljs-attr">matIconButton</span>
2424
<span class="hljs-attr">cdkTreeNodeToggle</span>
2525
[<span class="hljs-attr">attr.aria-label</span>]=<span class="hljs-string">&quot;&#x27;Toggle &#x27; + node.raw.name&quot;</span>&gt;</span>
2626
<span class="hljs-tag">&lt;<span class="hljs-name">mat-icon</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;mat-icon-rtl-mirror&quot;</span>&gt;</span>

docs-content/examples-highlighted/cdk/tree/cdk-tree-custom-key-manager/cdk-tree-custom-key-manager-example-html.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[<span class="hljs-attr">isDisabled</span>]=<span class="hljs-string">&quot;!shouldRender(node)&quot;</span>
66
<span class="hljs-attr">class</span>=<span class="hljs-string">&quot;example-tree-node&quot;</span>&gt;</span>
77
<span class="hljs-comment">&lt;!-- use a disabled button to provide padding for tree leaf --&gt;</span>
8-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-icon-button</span> <span class="hljs-attr">disabled</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
8+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matIconButton</span> <span class="hljs-attr">disabled</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
99
{{node.name}}
1010
<span class="hljs-tag">&lt;/<span class="hljs-name">cdk-tree-node</span>&gt;</span>
1111
<span class="hljs-comment">&lt;!-- This is the tree node template for expandable nodes --&gt;</span>
@@ -17,7 +17,7 @@
1717
(<span class="hljs-attr">expandedChange</span>)=<span class="hljs-string">&quot;node.isExpanded = $event&quot;</span>
1818
<span class="hljs-attr">class</span>=<span class="hljs-string">&quot;example-tree-node&quot;</span>
1919
<span class="hljs-attr">tabindex</span>=<span class="hljs-string">&quot;0&quot;</span>&gt;</span>
20-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-icon-button</span> <span class="hljs-attr">cdkTreeNodeToggle</span>
20+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matIconButton</span> <span class="hljs-attr">cdkTreeNodeToggle</span>
2121
[<span class="hljs-attr">attr.aria-label</span>]=<span class="hljs-string">&quot;&#x27;Toggle &#x27; + node.name&quot;</span>
2222
[<span class="hljs-attr">style.visibility</span>]=<span class="hljs-string">&quot;node.expandable ? &#x27;visible&#x27; : &#x27;hidden&#x27;&quot;</span>&gt;</span>
2323
<span class="hljs-tag">&lt;<span class="hljs-name">mat-icon</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;mat-icon-rtl-mirror&quot;</span>&gt;</span>

docs-content/examples-highlighted/cdk/tree/cdk-tree-flat-children-accessor/cdk-tree-flat-children-accessor-example-html.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[<span class="hljs-attr">isDisabled</span>]=<span class="hljs-string">&quot;!shouldRender(node)&quot;</span>
66
<span class="hljs-attr">class</span>=<span class="hljs-string">&quot;example-tree-node&quot;</span>&gt;</span>
77
<span class="hljs-comment">&lt;!-- use a disabled button to provide padding for tree leaf --&gt;</span>
8-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-icon-button</span> <span class="hljs-attr">disabled</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
8+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matIconButton</span> <span class="hljs-attr">disabled</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">button</span>&gt;</span>
99
{{node.name}}
1010
<span class="hljs-tag">&lt;/<span class="hljs-name">cdk-tree-node</span>&gt;</span>
1111
<span class="hljs-comment">&lt;!-- This is the tree node template for expandable nodes --&gt;</span>
@@ -16,7 +16,7 @@
1616
[<span class="hljs-attr">isDisabled</span>]=<span class="hljs-string">&quot;!shouldRender(node)&quot;</span>
1717
[<span class="hljs-attr">isExpandable</span>]=<span class="hljs-string">&quot;true&quot;</span>
1818
<span class="hljs-attr">class</span>=<span class="hljs-string">&quot;example-tree-node&quot;</span>&gt;</span>
19-
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">mat-icon-button</span> <span class="hljs-attr">cdkTreeNodeToggle</span> [<span class="hljs-attr">attr.aria-label</span>]=<span class="hljs-string">&quot;&#x27;Toggle &#x27; + node.name&quot;</span>&gt;</span>
19+
<span class="hljs-tag">&lt;<span class="hljs-name">button</span> <span class="hljs-attr">matIconButton</span> <span class="hljs-attr">cdkTreeNodeToggle</span> [<span class="hljs-attr">attr.aria-label</span>]=<span class="hljs-string">&quot;&#x27;Toggle &#x27; + node.name&quot;</span>&gt;</span>
2020
<span class="hljs-tag">&lt;<span class="hljs-name">mat-icon</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;mat-icon-rtl-mirror&quot;</span>&gt;</span>
2121
{{tree.isExpanded(node) ? &#x27;expand_more&#x27; : &#x27;chevron_right&#x27;}}
2222
<span class="hljs-tag">&lt;/<span class="hljs-name">mat-icon</span>&gt;</span>

0 commit comments

Comments
 (0)