Skip to content

Commit 607fb1e

Browse files
rafaelss95wagnermaciel
authored andcommitted
docs(expansion-panel): fix duplicate selectors and add missing documentation (#20286)
(cherry picked from commit f64b60d)
1 parent 0178813 commit 607fb1e

File tree

2 files changed

+24
-29
lines changed

2 files changed

+24
-29
lines changed

src/material/expansion/expansion-panel-header.ts

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,41 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {FocusMonitor, FocusableOption, FocusOrigin} from '@angular/cdk/a11y';
10-
import {ENTER, SPACE, hasModifierKey} from '@angular/cdk/keycodes';
9+
import {FocusableOption, FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
10+
import {ENTER, hasModifierKey, SPACE} from '@angular/cdk/keycodes';
1111
import {
12+
AfterViewInit,
1213
ChangeDetectionStrategy,
1314
ChangeDetectorRef,
1415
Component,
1516
Directive,
1617
ElementRef,
1718
Host,
19+
Inject,
1820
Input,
1921
OnDestroy,
20-
ViewEncapsulation,
2122
Optional,
22-
Inject,
23-
AfterViewInit,
23+
ViewEncapsulation,
2424
} from '@angular/core';
2525
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
26-
import {merge, Subscription, EMPTY} from 'rxjs';
26+
import {EMPTY, merge, Subscription} from 'rxjs';
2727
import {filter} from 'rxjs/operators';
28+
import {MatAccordionTogglePosition} from './accordion-base';
2829
import {matExpansionAnimations} from './expansion-animations';
2930
import {
3031
MatExpansionPanel,
3132
MatExpansionPanelDefaultOptions,
3233
MAT_EXPANSION_PANEL_DEFAULT_OPTIONS,
3334
} from './expansion-panel';
34-
import {MatAccordionTogglePosition} from './accordion-base';
3535

3636

3737
/**
38-
* `<mat-expansion-panel-header>`
39-
*
40-
* This component corresponds to the header element of an `<mat-expansion-panel>`.
38+
* Header element of a `<mat-expansion-panel>`.
4139
*/
4240
@Component({
4341
selector: 'mat-expansion-panel-header',
44-
styleUrls: ['./expansion-panel-header.css'],
45-
templateUrl: './expansion-panel-header.html',
42+
styleUrls: ['expansion-panel-header.css'],
43+
templateUrl: 'expansion-panel-header.html',
4644
encapsulation: ViewEncapsulation.None,
4745
changeDetection: ChangeDetectionStrategy.OnPush,
4846
animations: [
@@ -211,9 +209,7 @@ export class MatExpansionPanelHeader implements AfterViewInit, OnDestroy, Focusa
211209
}
212210

213211
/**
214-
* `<mat-panel-description>`
215-
*
216-
* This directive is to be used inside of the MatExpansionPanelHeader component.
212+
* Description element of a `<mat-expansion-panel-header>`.
217213
*/
218214
@Directive({
219215
selector: 'mat-panel-description',
@@ -224,9 +220,7 @@ export class MatExpansionPanelHeader implements AfterViewInit, OnDestroy, Focusa
224220
export class MatExpansionPanelDescription {}
225221

226222
/**
227-
* `<mat-panel-title>`
228-
*
229-
* This directive is to be used inside of the MatExpansionPanelHeader component.
223+
* Title element of a `<mat-expansion-panel-header>`.
230224
*/
231225
@Directive({
232226
selector: 'mat-panel-title',

src/material/expansion/expansion-panel.ts

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ import {CdkAccordionItem} from '@angular/cdk/accordion';
1111
import {BooleanInput, coerceBooleanProperty} from '@angular/cdk/coercion';
1212
import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
1313
import {TemplatePortal} from '@angular/cdk/portal';
14+
import {DOCUMENT} from '@angular/common';
1415
import {
1516
AfterContentInit,
1617
ChangeDetectionStrategy,
1718
ChangeDetectorRef,
1819
Component,
1920
ContentChild,
2021
Directive,
21-
EventEmitter,
2222
ElementRef,
23-
Input,
23+
EventEmitter,
2424
Inject,
25+
InjectionToken,
26+
Input,
2527
OnChanges,
2628
OnDestroy,
2729
Optional,
2830
Output,
2931
SimpleChanges,
3032
SkipSelf,
33+
ViewChild,
3134
ViewContainerRef,
3235
ViewEncapsulation,
33-
ViewChild,
34-
InjectionToken,
3536
} from '@angular/core';
36-
import {DOCUMENT} from '@angular/common';
3737
import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
3838
import {Subject} from 'rxjs';
39-
import {filter, startWith, take, distinctUntilChanged} from 'rxjs/operators';
39+
import {distinctUntilChanged, filter, startWith, take} from 'rxjs/operators';
40+
import {MatAccordionBase, MatAccordionTogglePosition, MAT_ACCORDION} from './accordion-base';
4041
import {matExpansionAnimations} from './expansion-animations';
4142
import {MatExpansionPanelContent} from './expansion-panel-content';
42-
import {MAT_ACCORDION, MatAccordionBase, MatAccordionTogglePosition} from './accordion-base';
4343

4444
/** MatExpansionPanel's states. */
4545
export type MatExpansionPanelState = 'expanded' | 'collapsed';
@@ -70,16 +70,14 @@ export const MAT_EXPANSION_PANEL_DEFAULT_OPTIONS =
7070
new InjectionToken<MatExpansionPanelDefaultOptions>('MAT_EXPANSION_PANEL_DEFAULT_OPTIONS');
7171

7272
/**
73-
* `<mat-expansion-panel>`
74-
*
7573
* This component can be used as a single element to show expandable content, or as one of
7674
* multiple children of an element with the MatAccordion directive attached.
7775
*/
7876
@Component({
79-
styleUrls: ['./expansion-panel.css'],
77+
styleUrls: ['expansion-panel.css'],
8078
selector: 'mat-expansion-panel',
8179
exportAs: 'matExpansionPanel',
82-
templateUrl: './expansion-panel.html',
80+
templateUrl: 'expansion-panel.html',
8381
encapsulation: ViewEncapsulation.None,
8482
changeDetection: ChangeDetectionStrategy.OnPush,
8583
inputs: ['disabled', 'expanded'],
@@ -246,6 +244,9 @@ export class MatExpansionPanel extends CdkAccordionItem implements AfterContentI
246244
static ngAcceptInputType_disabled: BooleanInput;
247245
}
248246

247+
/**
248+
* Actions of a `<mat-expansion-panel>`.
249+
*/
249250
@Directive({
250251
selector: 'mat-action-row',
251252
host: {

0 commit comments

Comments
 (0)