Skip to content

Commit 5a94150

Browse files
authored
refactor(multiple): use object literal syntax in inputs array (#28638)
Switches to using the object literal syntax in the `inputs` array which is a bit more readable than the string syntax. This shouldn't have an effect on users.
1 parent dd97c0e commit 5a94150

File tree

16 files changed

+33
-33
lines changed

16 files changed

+33
-33
lines changed

src/cdk-experimental/popover-edit/lens-directives.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ export type PopoverEditClickOutBehavior = 'close' | 'submit' | 'noop';
2525
@Directive({
2626
selector: 'form[cdkEditControl]',
2727
inputs: [
28-
'clickOutBehavior: cdkEditControlClickOutBehavior',
29-
'preservedFormValue: cdkEditControlPreservedFormValue',
30-
'ignoreSubmitUnlessValid: cdkEditControlIgnoreSubmitUnlessValid',
28+
{name: 'clickOutBehavior', alias: 'cdkEditControlClickOutBehavior'},
29+
{name: 'preservedFormValue', alias: 'cdkEditControlPreservedFormValue'},
30+
{name: 'ignoreSubmitUnlessValid', alias: 'cdkEditControlIgnoreSubmitUnlessValid'},
3131
],
3232
outputs: ['preservedFormValueChange: cdkEditControlPreservedFormValueChange'],
3333
providers: [EditRef],

src/cdk-experimental/popover-edit/table-directives.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ const POPOVER_EDIT_HOST_BINDINGS = {
161161
};
162162

163163
const POPOVER_EDIT_INPUTS = [
164-
'template: cdkPopoverEdit',
165-
'context: cdkPopoverEditContext',
166-
'colspan: cdkPopoverEditColspan',
167-
'disabled: cdkPopoverEditDisabled',
164+
{name: 'template', alias: 'cdkPopoverEdit'},
165+
{name: 'context', alias: 'cdkPopoverEditContext'},
166+
{name: 'colspan', alias: 'cdkPopoverEditColspan'},
167+
{name: 'disabled', alias: 'cdkPopoverEditDisabled'},
168168
];
169169

170170
/**

src/cdk/menu/context-menu-trigger.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ export type ContextMenuCoordinates = {x: number; y: number};
6363
'(contextmenu)': '_openOnContextMenu($event)',
6464
},
6565
inputs: [
66-
'menuTemplateRef: cdkContextMenuTriggerFor',
67-
'menuPosition: cdkContextMenuPosition',
68-
'menuData: cdkContextMenuTriggerData',
66+
{name: 'menuTemplateRef', alias: 'cdkContextMenuTriggerFor'},
67+
{name: 'menuPosition', alias: 'cdkContextMenuPosition'},
68+
{name: 'menuData', alias: 'cdkContextMenuTriggerData'},
6969
],
7070
outputs: ['opened: cdkContextMenuOpened', 'closed: cdkContextMenuClosed'],
7171
providers: [

src/cdk/menu/menu-trigger.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ import {eventDispatchesNativeClick} from './event-detection';
5656
'(click)': '_handleClick()',
5757
},
5858
inputs: [
59-
'menuTemplateRef: cdkMenuTriggerFor',
60-
'menuPosition: cdkMenuPosition',
61-
'menuData: cdkMenuTriggerData',
59+
{name: 'menuTemplateRef', alias: 'cdkMenuTriggerFor'},
60+
{name: 'menuPosition', alias: 'cdkMenuPosition'},
61+
{name: 'menuData', alias: 'cdkMenuTriggerData'},
6262
],
6363
outputs: ['opened: cdkMenuOpened', 'closed: cdkMenuClosed'],
6464
providers: [

src/cdk/portal/portal-directives.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
TemplateRef,
2020
ViewContainerRef,
2121
Inject,
22+
Input,
2223
} from '@angular/core';
2324
import {DOCUMENT} from '@angular/common';
2425
import {BasePortalOutlet, ComponentPortal, Portal, TemplatePortal, DomPortal} from './portal';
@@ -70,7 +71,6 @@ export type CdkPortalOutletAttachedRef = ComponentRef<any> | EmbeddedViewRef<any
7071
@Directive({
7172
selector: '[cdkPortalOutlet]',
7273
exportAs: 'cdkPortalOutlet',
73-
inputs: ['portal: cdkPortalOutlet'],
7474
standalone: true,
7575
})
7676
export class CdkPortalOutlet extends BasePortalOutlet implements OnInit, OnDestroy {
@@ -97,6 +97,7 @@ export class CdkPortalOutlet extends BasePortalOutlet implements OnInit, OnDestr
9797
}
9898

9999
/** Portal associated with the Portal outlet. */
100+
@Input('cdkPortalOutlet')
100101
get portal(): Portal<any> | null {
101102
return this._attachedPortal;
102103
}
@@ -251,7 +252,7 @@ export class CdkPortalOutlet extends BasePortalOutlet implements OnInit, OnDestr
251252
@Directive({
252253
selector: '[cdkPortalHost], [portalHost]',
253254
exportAs: 'cdkPortalHost',
254-
inputs: ['portal: cdkPortalHost'],
255+
inputs: [{name: 'portal', alias: 'cdkPortalHost'}],
255256
providers: [
256257
{
257258
provide: CdkPortalOutlet,

src/cdk/tree/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CdkTreeNodeOutletContext<T> {
3333
*/
3434
@Directive({
3535
selector: '[cdkTreeNodeDef]',
36-
inputs: ['when: cdkTreeNodeDefWhen'],
36+
inputs: [{name: 'when', alias: 'cdkTreeNodeDefWhen'}],
3737
standalone: true,
3838
})
3939
export class CdkTreeNodeDef<T> {

src/material-experimental/column-resize/resizable-directives/common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ export const RESIZABLE_HOST_BINDINGS = {
2727
};
2828

2929
export const RESIZABLE_INPUTS = [
30-
'minWidthPx: matResizableMinWidthPx',
31-
'maxWidthPx: matResizableMaxWidthPx',
30+
{name: 'minWidthPx', alias: 'matResizableMinWidthPx'},
31+
{name: 'maxWidthPx', alias: 'matResizableMaxWidthPx'},
3232
];

src/material-experimental/popover-edit/lens-directives.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import {
2727
'class': 'mat-edit-lens',
2828
},
2929
inputs: [
30-
'clickOutBehavior: matEditLensClickOutBehavior',
31-
'preservedFormValue: matEditLensPreservedFormValue',
32-
'ignoreSubmitUnlessValid: matEditLensIgnoreSubmitUnlessValid',
30+
{name: 'clickOutBehavior', alias: 'matEditLensClickOutBehavior'},
31+
{name: 'preservedFormValue', alias: 'matEditLensPreservedFormValue'},
32+
{name: 'ignoreSubmitUnlessValid', alias: 'matEditLensIgnoreSubmitUnlessValid'},
3333
],
3434
outputs: ['preservedFormValueChange: matEditLensPreservedFormValueChange'],
3535
providers: [EditRef],

src/material-experimental/popover-edit/table-directives.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ const POPOVER_EDIT_HOST_BINDINGS = {
2222
};
2323

2424
const POPOVER_EDIT_INPUTS = [
25-
'template: matPopoverEdit',
26-
'context: matPopoverEditContext',
27-
'colspan: matPopoverEditColspan',
28-
'disabled: matPopoverEditDisabled',
25+
{name: 'template', alias: 'matPopoverEdit'},
26+
{name: 'context', alias: 'matPopoverEditContext'},
27+
{name: 'colspan', alias: 'matPopoverEditColspan'},
28+
{name: 'disabled', alias: 'matPopoverEditDisabled'},
2929
];
3030

3131
const EDIT_PANE_CLASS = 'mat-edit-pane';

src/material-experimental/selection/row-selection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {Input, Directive} from '@angular/core';
2323
'[attr.aria-selected]': '_selection.isSelected(this.value, this.index)',
2424
},
2525
providers: [{provide: CdkRowSelection, useExisting: MatRowSelection}],
26-
inputs: ['index: matRowSelectionIndex'],
26+
inputs: [{name: 'index', alias: 'matRowSelectionIndex'}],
2727
standalone: true,
2828
})
2929
export class MatRowSelection<T> extends CdkRowSelection<T> {

src/material-experimental/selection/selection-toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {Directive, Input} from '@angular/core';
2222
@Directive({
2323
selector: '[matSelectionToggle]',
2424
exportAs: 'matSelectionToggle',
25-
inputs: ['index: matSelectionToggleIndex'],
25+
inputs: [{name: 'index', alias: 'matSelectionToggleIndex'}],
2626
providers: [{provide: CdkSelectionToggle, useExisting: MatSelectionToggle}],
2727
standalone: true,
2828
})

src/material/tabs/ink-bar.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
OnDestroy,
1515
OnInit,
1616
QueryList,
17+
booleanAttribute,
1718
inject,
18-
numberAttribute,
1919
} from '@angular/core';
2020

2121
/**
@@ -79,7 +79,7 @@ export abstract class InkBarItem implements OnInit, OnDestroy {
7979
private _fitToContent = false;
8080

8181
/** Whether the ink bar should fit to the entire tab or just its content. */
82-
@Input({transform: numberAttribute})
82+
@Input({transform: booleanAttribute})
8383
get fitInkBarToContent(): boolean {
8484
return this._fitToContent;
8585
}

src/material/tabs/tab-label-wrapper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {InkBarItem} from './ink-bar';
1515
*/
1616
@Directive({
1717
selector: '[matTabLabelWrapper]',
18-
inputs: ['fitInkBarToContent'],
1918
host: {
2019
'[class.mat-mdc-tab-disabled]': 'disabled',
2120
'[attr.aria-disabled]': '!!disabled',

src/material/tree/node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export class MatTreeNode<T, K = T> extends CdkTreeNode<T, K> implements OnInit,
7575
*/
7676
@Directive({
7777
selector: '[matTreeNodeDef]',
78-
inputs: ['when: matTreeNodeDefWhen'],
78+
inputs: [{name: 'when', alias: 'matTreeNodeDefWhen'}],
7979
providers: [{provide: CdkTreeNodeDef, useExisting: MatTreeNodeDef}],
8080
standalone: true,
8181
})

src/material/tree/toggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {Directive} from '@angular/core';
1515
@Directive({
1616
selector: '[matTreeNodeToggle]',
1717
providers: [{provide: CdkTreeNodeToggle, useExisting: MatTreeNodeToggle}],
18-
inputs: ['recursive: matTreeNodeToggleRecursive'],
18+
inputs: [{name: 'recursive', alias: 'matTreeNodeToggleRecursive'}],
1919
standalone: true,
2020
})
2121
export class MatTreeNodeToggle<T, K = T> extends CdkTreeNodeToggle<T, K> {}

tools/public_api_guard/material/tabs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ export class MatTabLabelWrapper extends InkBarItem {
393393
// (undocumented)
394394
static ngAcceptInputType_disabled: unknown;
395395
// (undocumented)
396-
static ɵdir: i0.ɵɵDirectiveDeclaration<MatTabLabelWrapper, "[matTabLabelWrapper]", never, { "fitInkBarToContent": { "alias": "fitInkBarToContent"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, never, true, never>;
396+
static ɵdir: i0.ɵɵDirectiveDeclaration<MatTabLabelWrapper, "[matTabLabelWrapper]", never, { "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, never, true, never>;
397397
// (undocumented)
398398
static ɵfac: i0.ɵɵFactoryDeclaration<MatTabLabelWrapper, never>;
399399
}

0 commit comments

Comments
 (0)