Skip to content

Commit 38705cf

Browse files
Migrate Navigation/DropDowns/Editors demos to the new ng nested component syntax (#31556)
1 parent 40d55dc commit 38705cf

File tree

27 files changed

+391
-267
lines changed

27 files changed

+391
-267
lines changed

apps/demos/Demos/Accordion/Overview/Angular/app/app.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,11 @@
5757
<div class="option">
5858
<span>Animation duration</span>
5959
<dx-slider [min]="0" [max]="1000" [(value)]="accordion.animationDuration">
60-
<dxo-tooltip [enabled]="true" position="bottom"></dxo-tooltip>
61-
<dxo-label [visible]="true"></dxo-label>
60+
<dxo-slider-tooltip
61+
[enabled]="true"
62+
position="bottom"
63+
></dxo-slider-tooltip>
64+
<dxo-slider-label [visible]="true"></dxo-slider-label>
6265
</dx-slider>
6366
</div>
6467
<div class="option">

apps/demos/Demos/ActionSheet/PopoverMode/Angular/app/app.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<dx-list (onItemClick)="itemClick($event)">
2-
<dxi-item *ngFor="let contact of contacts">
2+
<dxi-list-item *ngFor="let contact of contacts">
33
<div>{{ contact.name }}</div>
44
<div>{{ contact.phone }}</div>
55
<div>{{ contact.email }}</div>
6-
</dxi-item>
6+
</dxi-list-item>
77
</dx-list>
88
<dx-action-sheet
99
[items]="commands"

apps/demos/Demos/Common/CustomTextEditorButtons/Angular/app/app.component.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
stylingMode="filled"
1010
[(mode)]="passwordMode"
1111
>
12-
<dxi-button
12+
<dxi-text-box-button
1313
name="today"
1414
location="after"
1515
[options]="passwordButton"
16-
></dxi-button>
16+
></dxi-text-box-button>
1717
</dx-text-box>
1818
</div>
1919
</div>
@@ -27,13 +27,13 @@
2727
[showSpinButtons]="true"
2828
[inputAttr]="{ 'aria-label': 'Currency Format' }"
2929
>
30-
<dxi-button
30+
<dxi-number-box-button
3131
name="currency"
3232
location="after"
3333
[options]="currencyButton"
34-
></dxi-button>
35-
<dxi-button name="clear"></dxi-button>
36-
<dxi-button name="spins"></dxi-button>
34+
></dxi-number-box-button>
35+
<dxi-number-box-button name="clear"></dxi-number-box-button>
36+
<dxi-number-box-button name="spins"></dxi-number-box-button>
3737
</dx-number-box>
3838
</div>
3939
</div>
@@ -45,22 +45,22 @@
4545
[(value)]="dateValue"
4646
[inputAttr]="{ 'aria-label': 'Date' }"
4747
>
48-
<dxi-button
48+
<dxi-date-box-button
4949
name="today"
5050
location="before"
5151
[options]="todayButton"
52-
></dxi-button>
53-
<dxi-button
52+
></dxi-date-box-button>
53+
<dxi-date-box-button
5454
name="prevDate"
5555
location="before"
5656
[options]="prevDateButton"
57-
></dxi-button>
58-
<dxi-button
57+
></dxi-date-box-button>
58+
<dxi-date-box-button
5959
name="nextDate"
6060
location="after"
6161
[options]="nextDateButton"
62-
></dxi-button>
63-
<dxi-button name="dropDown"></dxi-button>
62+
></dxi-date-box-button>
63+
<dxi-date-box-button name="dropDown"></dxi-date-box-button>
6464
</dx-date-box>
6565
</div>
6666
</div>

apps/demos/Demos/Common/EditorAppearanceVariants/Angular/app/app.component.html

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
[labelMode]="labelMode"
3737
>
3838
<dx-validator>
39-
<dxi-validation-rule type="required"> </dxi-validation-rule>
39+
<dxi-validator-validation-rule type="required">
40+
</dxi-validator-validation-rule>
4041
</dx-validator>
4142
</dx-text-box>
4243
<dx-text-box
@@ -48,7 +49,8 @@
4849
[labelMode]="labelMode"
4950
>
5051
<dx-validator>
51-
<dxi-validation-rule type="required"> </dxi-validation-rule>
52+
<dxi-validator-validation-rule type="required">
53+
</dxi-validator-validation-rule>
5254
</dx-validator>
5355
</dx-text-box>
5456
<dx-date-box
@@ -60,7 +62,8 @@
6062
[inputAttr]="{ 'aria-label': 'Hire Date' }"
6163
>
6264
<dx-validator>
63-
<dxi-validation-rule type="required"> </dxi-validation-rule>
65+
<dxi-validator-validation-rule type="required">
66+
</dxi-validator-validation-rule>
6467
</dx-validator>
6568
</dx-date-box>
6669
<dx-date-box
@@ -73,7 +76,8 @@
7376
[inputAttr]="{ 'aria-label': 'Birth Date' }"
7477
>
7578
<dx-validator>
76-
<dxi-validation-rule type="required"> </dxi-validation-rule>
79+
<dxi-validator-validation-rule type="required">
80+
</dxi-validator-validation-rule>
7781
</dx-validator>
7882
</dx-date-box>
7983
<dx-select-box
@@ -87,7 +91,8 @@
8791
validationMessagePosition="left"
8892
>
8993
<dx-validator>
90-
<dxi-validation-rule type="required"> </dxi-validation-rule>
94+
<dxi-validator-validation-rule type="required">
95+
</dxi-validator-validation-rule>
9196
</dx-validator>
9297
</dx-select-box>
9398
<dx-text-box
@@ -100,7 +105,8 @@
100105
[labelMode]="labelMode"
101106
>
102107
<dx-validator>
103-
<dxi-validation-rule type="required"> </dxi-validation-rule>
108+
<dxi-validator-validation-rule type="required">
109+
</dxi-validator-validation-rule>
104110
</dx-validator>
105111
</dx-text-box>
106112
<dx-date-range-box

apps/demos/Demos/DropDownBox/SingleSelection/Angular/app/app.component.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,15 @@
5555
[(selectedRowKeys)]="gridBoxValue"
5656
height="100%"
5757
>
58-
<dxo-selection mode="single"></dxo-selection>
59-
<dxo-filter-row [visible]="true"></dxo-filter-row>
60-
<dxo-scrolling mode="virtual"></dxo-scrolling>
61-
<dxo-paging [enabled]="true" [pageSize]="10"></dxo-paging>
58+
<dxo-data-grid-selection mode="single"></dxo-data-grid-selection>
59+
<dxo-data-grid-filter-row
60+
[visible]="true"
61+
></dxo-data-grid-filter-row>
62+
<dxo-data-grid-scrolling mode="virtual"></dxo-data-grid-scrolling>
63+
<dxo-data-grid-paging
64+
[enabled]="true"
65+
[pageSize]="10"
66+
></dxo-data-grid-paging>
6267
</dx-data-grid>
6368
</div>
6469
</dx-drop-down-box>

apps/demos/Demos/List/DragAndDrop/Angular/app/app.component.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
keyExpr="id"
66
[repaintChangesOnly]="true"
77
>
8-
<dxo-item-dragging
8+
<dxo-list-item-dragging
99
group="tasks"
1010
[data]="plannedTasks"
1111
[allowReordering]="true"
@@ -14,10 +14,10 @@
1414
[onRemove]="onRemove"
1515
[onReorder]="onReorder"
1616
>
17-
</dxo-item-dragging>
17+
</dxo-list-item-dragging>
1818
</dx-list>
1919
<dx-list [dataSource]="doingTasks" keyExpr="id" [repaintChangesOnly]="true">
20-
<dxo-item-dragging
20+
<dxo-list-item-dragging
2121
group="tasks"
2222
[data]="doingTasks"
2323
[allowReordering]="true"
@@ -26,7 +26,7 @@
2626
[onRemove]="onRemove"
2727
[onReorder]="onReorder"
2828
>
29-
</dxo-item-dragging>
29+
</dxo-list-item-dragging>
3030
</dx-list>
3131
</div>
3232
</div>

apps/demos/Demos/Lookup/Basics/Angular/app/app.component.html

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
[value]="employees[0]"
77
[inputAttr]="{ 'aria-label': 'Simple lookup' }"
88
>
9-
<dxo-drop-down-options [showTitle]="false"></dxo-drop-down-options>
9+
<dxo-lookup-drop-down-options
10+
[showTitle]="false"
11+
></dxo-lookup-drop-down-options>
1012
</dx-lookup>
1113
</div>
1214
</div>
@@ -19,8 +21,11 @@
1921
[grouped]="true"
2022
[inputAttr]="{ 'aria-label': 'Grouped lookup' }"
2123
>
22-
<dxo-drop-down-options [hideOnOutsideClick]="true" [showTitle]="false">
23-
</dxo-drop-down-options>
24+
<dxo-lookup-drop-down-options
25+
[hideOnOutsideClick]="true"
26+
[showTitle]="false"
27+
>
28+
</dxo-lookup-drop-down-options>
2429
</dx-lookup>
2530
</div>
2631
</div>

apps/demos/Demos/Lookup/EventHandling/Angular/app/app.component.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
[inputAttr]="{ 'aria-label': 'Lookup' }"
88
(onValueChanged)="valueChanged($event)"
99
>
10-
<dxo-drop-down-options [showTitle]="false"></dxo-drop-down-options>
10+
<dxo-lookup-drop-down-options
11+
[showTitle]="false"
12+
></dxo-lookup-drop-down-options>
1113
</dx-lookup>
1214
</div>
1315
<div class="selected" *ngIf="selectedEmployee">

apps/demos/Demos/Lookup/Templates/Angular/app/app.component.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
fieldTemplate="field"
1111
[inputAttr]="{ 'aria-label': 'Custom Field Template' }"
1212
>
13-
<dxo-drop-down-options title="Select employee"></dxo-drop-down-options>
13+
<dxo-lookup-drop-down-options
14+
title="Select employee"
15+
></dxo-lookup-drop-down-options>
1416
<div *dxTemplate="let item of 'field'">
1517
<div class="custom-field">
1618
<img alt="{{ item.FirstName }}" src="{{ item.Picture }}" /><div
@@ -33,7 +35,9 @@
3335
itemTemplate="listItem"
3436
[inputAttr]="{ 'aria-label': 'Custom Item Template' }"
3537
>
36-
<dxo-drop-down-options title="Select employee"></dxo-drop-down-options>
38+
<dxo-lookup-drop-down-options
39+
title="Select employee"
40+
></dxo-lookup-drop-down-options>
3741
<div *dxTemplate="let item of 'listItem'">
3842
<div class="custom-item">
3943
<img src="{{ item.Picture }}" /><div

apps/demos/Demos/RangeSelector/BackgroundImage/Angular/app/app.component.html

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,30 @@
33
[value]="[startSelectedValue, endSelectedValue]"
44
title="Select a Time Period"
55
>
6-
<dxo-margin [top]="50" [bottom]="0"></dxo-margin>
7-
<dxo-background>
8-
<dxo-image
6+
<dxo-range-selector-margin
7+
[top]="50"
8+
[bottom]="0"
9+
></dxo-range-selector-margin>
10+
<dxo-range-selector-background>
11+
<dxo-range-selector-image
912
url="../../../../images/RangeSelector/background.png"
1013
location="full"
1114
>
12-
</dxo-image>
13-
</dxo-background>
14-
<dxo-indent [left]="65" [right]="65"> </dxo-indent>
15-
<dxo-scale
15+
</dxo-range-selector-image>
16+
</dxo-range-selector-background>
17+
<dxo-range-selector-indent [left]="65" [right]="65">
18+
</dxo-range-selector-indent>
19+
<dxo-range-selector-scale
1620
[startValue]="startValue"
1721
[endValue]="endValue"
1822
[placeholderHeight]="20"
1923
>
20-
<dxo-label format="shorttime"> </dxo-label>
21-
<dxo-minor-tick-interval [hours]="1"> </dxo-minor-tick-interval>
22-
<dxo-tick-interval [hours]="2"> </dxo-tick-interval>
23-
</dxo-scale>
24-
<dxo-slider-marker format="shorttime" [placeholderHeight]="30">
25-
</dxo-slider-marker>
24+
<dxo-range-selector-label format="shorttime"> </dxo-range-selector-label>
25+
<dxo-range-selector-minor-tick-interval [hours]="1">
26+
</dxo-range-selector-minor-tick-interval>
27+
<dxo-range-selector-tick-interval [hours]="2">
28+
</dxo-range-selector-tick-interval>
29+
</dxo-range-selector-scale>
30+
<dxo-range-selector-slider-marker format="shorttime" [placeholderHeight]="30">
31+
</dxo-range-selector-slider-marker>
2632
</dx-range-selector>

0 commit comments

Comments
 (0)