Skip to content

Commit c3a296c

Browse files
sjbursjbur
authored
Merge branch '25_2' into issue-1702_25_2
2 parents 0699062 + c91dc0b commit c3a296c

File tree

362 files changed

+14133
-9250
lines changed

Some content is hidden

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

362 files changed

+14133
-9250
lines changed

‎.github/workflows/testcafe_tests.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,8 @@ jobs:
102102
{ componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
103103
{ componentFolder: "dataGrid/common", name: "dataGrid / common (4/5)", indices: "4/5" },
104104
{ componentFolder: "dataGrid/common", name: "dataGrid / common (5/5)", indices: "5/5" },
105-
{ componentFolder: "dataGrid/sticky/common", name: "dataGrid / sticky common" },
106-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (1/3)", indices: "1/3" },
107-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (2/3)", indices: "2/3" },
108-
{ componentFolder: "dataGrid/sticky/fixed", name: "dataGrid / sticky (3/3)", indices: "3/3" },
105+
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
106+
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
109107
{ componentFolder: "cardView", name: "cardView" },
110108

111109
# Scheduler tests need to be reworked to work in fluent theme
@@ -120,8 +118,7 @@ jobs:
120118
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (Europe/Berlin)", timezone: "Europe/Berlin", theme: 'generic.light' },
121119
{ componentFolder: "scheduler/timezones", name: "scheduler / timezones (America/Los_Angeles)", timezone: "America/Los_Angeles", theme: 'generic.light' },
122120

123-
{ componentFolder: "editors", name: "editors (1/2)", indices: "1/2" },
124-
{ componentFolder: "editors", name: "editors (2/2)", indices: "2/2" },
121+
{ componentFolder: "editors", name: "editors" },
125122
{ componentFolder: "navigation", name: "navigation" },
126123
]
127124
runs-on: devextreme-shr2

‎apps/demos/Demos/Box/Overview/Angular/app/app.component.html‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,51 @@
11
<dx-box direction="row" width="100%" [height]="75">
2-
<dxi-item class="rect demo-dark" [ratio]="1"> ratio = 1 </dxi-item>
3-
<dxi-item class="rect demo-light" [ratio]="2"> ratio = 2 </dxi-item>
4-
<dxi-item class="rect demo-dark" [ratio]="1"> ratio = 1 </dxi-item>
2+
<dxi-box-item class="rect demo-dark" [ratio]="1"> ratio = 1 </dxi-box-item>
3+
<dxi-box-item class="rect demo-light" [ratio]="2"> ratio = 2 </dxi-box-item>
4+
<dxi-box-item class="rect demo-dark" [ratio]="1"> ratio = 1 </dxi-box-item>
55
</dx-box>
66
<br />
77
<dx-box direction="row" width="100%" [height]="75">
8-
<dxi-item class="rect demo-dark" [ratio]="0" [baseSize]="150">
8+
<dxi-box-item class="rect demo-dark" [ratio]="0" [baseSize]="150">
99
150px
10-
</dxi-item>
11-
<dxi-item class="demo-light" [ratio]="1">
10+
</dxi-box-item>
11+
<dxi-box-item class="demo-light" [ratio]="1">
1212
<dx-box
1313
direction="row"
1414
width="100%"
1515
[height]="75"
1616
align="center"
1717
crossAlign="center"
1818
>
19-
<dxi-item [ratio]="0" [baseSize]="50">
19+
<dxi-box-item [ratio]="0" [baseSize]="50">
2020
<div class="small"></div>
21-
</dxi-item>
22-
<dxi-item [ratio]="0" [baseSize]="50">
21+
</dxi-box-item>
22+
<dxi-box-item [ratio]="0" [baseSize]="50">
2323
<div class="small"></div>
24-
</dxi-item>
25-
<dxi-item [ratio]="0" [baseSize]="50">
24+
</dxi-box-item>
25+
<dxi-box-item [ratio]="0" [baseSize]="50">
2626
<div class="small"></div>
27-
</dxi-item>
27+
</dxi-box-item>
2828
</dx-box>
29-
</dxi-item>
30-
<dxi-item class="rect demo-dark" [ratio]="0" baseSize="10%"> 10% </dxi-item>
29+
</dxi-box-item>
30+
<dxi-box-item class="rect demo-dark" [ratio]="0" baseSize="10%">
31+
10%
32+
</dxi-box-item>
3133
</dx-box>
3234
<br />
3335
<dx-box direction="col" width="100%" [height]="250">
34-
<dxi-item class="rect demo-dark header" [ratio]="1"> Header </dxi-item>
35-
<dxi-item [ratio]="2" [baseSize]="0">
36+
<dxi-box-item class="rect demo-dark header" [ratio]="1">
37+
Header
38+
</dxi-box-item>
39+
<dxi-box-item [ratio]="2" [baseSize]="0">
3640
<dx-box direction="row" width="100%" [height]="125">
37-
<dxi-item class="rect demo-dark" [ratio]="1"> Left Bar </dxi-item>
38-
<dxi-item class="rect demo-light" [ratio]="1"> Content </dxi-item>
39-
<dxi-item class="rect demo-dark" [ratio]="1"> Right Bar </dxi-item>
41+
<dxi-box-item class="rect demo-dark" [ratio]="1"> Left Bar </dxi-box-item>
42+
<dxi-box-item class="rect demo-light" [ratio]="1"> Content </dxi-box-item>
43+
<dxi-box-item class="rect demo-dark" [ratio]="1">
44+
Right Bar
45+
</dxi-box-item>
4046
</dx-box>
41-
</dxi-item>
42-
<dxi-item class="rect demo-dark footer" [ratio]="1"> Footer </dxi-item>
47+
</dxi-box-item>
48+
<dxi-box-item class="rect demo-dark footer" [ratio]="1">
49+
Footer
50+
</dxi-box-item>
4351
</dx-box>

‎apps/demos/Demos/Common/PopupAndNotificationsOverview/Angular/app/app.component.html‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@
2626
contentTemplate="popoverContent"
2727
[width]="260"
2828
>
29-
<dxo-position at="bottom" my="top" offset="0 2" collision="fit flip">
30-
</dxo-position>
29+
<dxo-popover-position
30+
at="bottom"
31+
my="top"
32+
offset="0 2"
33+
collision="fit flip"
34+
>
35+
</dxo-popover-position>
3136
<div *dxTemplate="let data of 'popoverContent'">
3237
<div class="agent-details">
3338
<img alt="{{ house.Agent.Name }}" src="{{ house.Agent.Picture }}" />

‎apps/demos/Demos/DropDownButton/Overview/Angular/app/app.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<div class="dx-fieldset-header">Embedded in a Toolbar</div>
5151
<div class="dx-field">
5252
<dx-toolbar>
53-
<dxi-item
53+
<dxi-toolbar-item
5454
location="before"
5555
widget="dxDropDownButton"
5656
[options]="{
@@ -64,9 +64,9 @@
6464
onSelectionChanged: onAlignmentChanged
6565
}"
6666
>
67-
</dxi-item>
67+
</dxi-toolbar-item>
6868

69-
<dxi-item
69+
<dxi-toolbar-item
7070
location="before"
7171
widget="dxDropDownButton"
7272
[options]="{
@@ -78,9 +78,9 @@
7878
dropDownContentTemplate: 'colorpicker'
7979
}"
8080
>
81-
</dxi-item>
81+
</dxi-toolbar-item>
8282

83-
<dxi-item
83+
<dxi-toolbar-item
8484
location="before"
8585
widget="dxDropDownButton"
8686
[options]="{
@@ -94,9 +94,9 @@
9494
itemTemplate: 'fontItem'
9595
}"
9696
>
97-
</dxi-item>
97+
</dxi-toolbar-item>
9898

99-
<dxi-item
99+
<dxi-toolbar-item
100100
location="before"
101101
widget="dxDropDownButton"
102102
[options]="{
@@ -110,7 +110,7 @@
110110
onSelectionChanged: onLineHeightChanged
111111
}"
112112
>
113-
</dxi-item>
113+
</dxi-toolbar-item>
114114

115115
<div
116116
*dxTemplate="let data of 'fontItem'"

‎apps/demos/Demos/FloatingActionButton/Overview/Angular/app/app.component.html‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,34 @@
55
keyExpr="ID"
66
(onSelectionChanged)="selectedChanged($event)"
77
>
8-
<dxo-selection mode="single"></dxo-selection>
9-
<dxo-paging [enabled]="false"></dxo-paging>
10-
<dxo-editing mode="popup">
11-
<dxo-texts confirmDeleteMessage=""></dxo-texts>
12-
</dxo-editing>
8+
<dxo-data-grid-selection mode="single"></dxo-data-grid-selection>
9+
<dxo-data-grid-paging [enabled]="false"></dxo-data-grid-paging>
10+
<dxo-data-grid-editing mode="popup">
11+
<dxo-data-grid-texts confirmDeleteMessage=""></dxo-data-grid-texts>
12+
</dxo-data-grid-editing>
1313

14-
<dxi-column dataField="Prefix" caption="Title"></dxi-column>
15-
<dxi-column dataField="FirstName"></dxi-column>
16-
<dxi-column dataField="LastName"></dxi-column>
17-
<dxi-column dataField="Position" [width]="130"></dxi-column>
18-
<dxi-column dataField="StateID" [width]="125" caption="State">
19-
<dxo-lookup
14+
<dxi-data-grid-column
15+
dataField="Prefix"
16+
caption="Title"
17+
></dxi-data-grid-column>
18+
<dxi-data-grid-column dataField="FirstName"></dxi-data-grid-column>
19+
<dxi-data-grid-column dataField="LastName"></dxi-data-grid-column>
20+
<dxi-data-grid-column
21+
dataField="Position"
22+
[width]="130"
23+
></dxi-data-grid-column>
24+
<dxi-data-grid-column dataField="StateID" [width]="125" caption="State">
25+
<dxo-data-grid-lookup
2026
[dataSource]="states"
2127
displayExpr="Name"
2228
valueExpr="ID"
23-
></dxo-lookup>
24-
</dxi-column>
25-
<dxi-column dataField="BirthDate" [width]="125" dataType="date"></dxi-column>
29+
></dxo-data-grid-lookup>
30+
</dxi-data-grid-column>
31+
<dxi-data-grid-column
32+
dataField="BirthDate"
33+
[width]="125"
34+
dataType="date"
35+
></dxi-data-grid-column>
2636
</dx-data-grid>
2737

2838
<dx-speed-dial-action

‎apps/demos/Demos/Popover/Overview/Angular/app/app.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@
6161
position="top"
6262
[width]="300"
6363
>
64-
<dxo-animation>
65-
<dxo-show
64+
<dxo-popover-animation>
65+
<dxo-popover-show
6666
type="pop"
6767
[from]="{ scale: 0 }"
6868
[to]="{ scale: 1 }"
69-
></dxo-show>
70-
<dxo-hide type="fade" [from]="1" [to]="0"></dxo-hide>
71-
</dxo-animation>
69+
></dxo-popover-show>
70+
<dxo-popover-hide type="fade" [from]="1" [to]="0"></dxo-popover-hide>
71+
</dxo-popover-animation>
7272
<div *dxTemplate="let data = model; of: 'content'">
7373
2012 Sales Report has to be completed so we can determine if major
7474
changes are required to sales strategy.

‎apps/demos/Demos/Resizable/Overview/Angular/app/app.component.html‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,31 @@
1919
[showBorders]="true"
2020
height="100%"
2121
>
22-
<dxo-paging [pageSize]="8"></dxo-paging>
23-
<dxo-scrolling mode="virtual"></dxo-scrolling>
24-
<dxi-column
22+
<dxo-data-grid-paging [pageSize]="8"></dxo-data-grid-paging>
23+
<dxo-data-grid-scrolling mode="virtual"></dxo-data-grid-scrolling>
24+
<dxi-data-grid-column
2525
[allowGrouping]="false"
2626
dataField="OrderNumber"
2727
[width]="130"
2828
caption="Invoice Number"
29-
></dxi-column>
30-
<dxi-column dataField="CustomerStoreCity" caption="City"></dxi-column>
31-
<dxi-column
29+
></dxi-data-grid-column>
30+
<dxi-data-grid-column
31+
dataField="CustomerStoreCity"
32+
caption="City"
33+
></dxi-data-grid-column>
34+
<dxi-data-grid-column
3235
dataField="CustomerStoreState"
3336
caption="State"
34-
></dxi-column>
35-
<dxi-column dataField="Employee"></dxi-column>
36-
<dxi-column dataField="OrderDate" dataType="date"></dxi-column>
37-
<dxi-column dataField="SaleAmount" format="currency"></dxi-column>
37+
></dxi-data-grid-column>
38+
<dxi-data-grid-column dataField="Employee"></dxi-data-grid-column>
39+
<dxi-data-grid-column
40+
dataField="OrderDate"
41+
dataType="date"
42+
></dxi-data-grid-column>
43+
<dxi-data-grid-column
44+
dataField="SaleAmount"
45+
format="currency"
46+
></dxi-data-grid-column>
3847
</dx-data-grid>
3948
</dx-resizable>
4049
</div>

‎apps/demos/Demos/ResponsiveBox/Overview/Angular/app/app.component.html‎

Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,91 @@
11
<div id="page">
22
<dx-responsive-box singleColumnScreen="sm" [(screenByWidth)]="screen">
3-
<dxi-row [ratio]="1"></dxi-row>
4-
<dxi-row [ratio]="2"></dxi-row>
5-
<dxi-row [ratio]="1"></dxi-row>
3+
<dxi-responsive-box-row [ratio]="1"></dxi-responsive-box-row>
4+
<dxi-responsive-box-row [ratio]="2"></dxi-responsive-box-row>
5+
<dxi-responsive-box-row [ratio]="1"></dxi-responsive-box-row>
66

7-
<dxi-col [ratio]="1"></dxi-col>
8-
<dxi-col [ratio]="2" screen="lg"></dxi-col>
9-
<dxi-col [ratio]="1"></dxi-col>
10-
<dxi-item>
11-
<dxi-location
7+
<dxi-responsive-box-col [ratio]="1"></dxi-responsive-box-col>
8+
<dxi-responsive-box-col [ratio]="2" screen="lg"></dxi-responsive-box-col>
9+
<dxi-responsive-box-col [ratio]="1"></dxi-responsive-box-col>
10+
<dxi-responsive-box-item>
11+
<dxi-responsive-box-location
1212
[row]="0"
1313
[col]="0"
1414
[colspan]="3"
1515
screen="lg"
16-
></dxi-location>
17-
<dxi-location
16+
></dxi-responsive-box-location>
17+
<dxi-responsive-box-location
1818
[row]="0"
1919
[col]="0"
2020
[colspan]="2"
2121
screen="sm"
22-
></dxi-location>
22+
></dxi-responsive-box-location>
2323
<div *dxTemplate class="header item">
2424
<p>Header</p>
2525
</div>
26-
</dxi-item>
27-
<dxi-item>
28-
<dxi-location [row]="1" [col]="1" screen="lg"></dxi-location>
29-
<dxi-location
26+
</dxi-responsive-box-item>
27+
<dxi-responsive-box-item>
28+
<dxi-responsive-box-location
29+
[row]="1"
30+
[col]="1"
31+
screen="lg"
32+
></dxi-responsive-box-location>
33+
<dxi-responsive-box-location
3034
[row]="1"
3135
[col]="0"
3236
[colspan]="2"
3337
screen="sm"
34-
></dxi-location>
38+
></dxi-responsive-box-location>
3539
<div *dxTemplate class="content item">
3640
<p>Content</p>
3741
</div>
38-
</dxi-item>
39-
<dxi-item>
40-
<dxi-location [row]="1" [col]="0" screen="lg"></dxi-location>
41-
<dxi-location [row]="2" [col]="0" screen="sm"></dxi-location>
42+
</dxi-responsive-box-item>
43+
<dxi-responsive-box-item>
44+
<dxi-responsive-box-location
45+
[row]="1"
46+
[col]="0"
47+
screen="lg"
48+
></dxi-responsive-box-location>
49+
<dxi-responsive-box-location
50+
[row]="2"
51+
[col]="0"
52+
screen="sm"
53+
></dxi-responsive-box-location>
4254
<div *dxTemplate class="left-side-bar item">
4355
<p>Left Bar</p>
4456
</div>
45-
</dxi-item>
46-
<dxi-item>
47-
<dxi-location [row]="1" [col]="2" screen="lg"></dxi-location>
48-
<dxi-location [row]="2" [col]="1" screen="sm"></dxi-location>
57+
</dxi-responsive-box-item>
58+
<dxi-responsive-box-item>
59+
<dxi-responsive-box-location
60+
[row]="1"
61+
[col]="2"
62+
screen="lg"
63+
></dxi-responsive-box-location>
64+
<dxi-responsive-box-location
65+
[row]="2"
66+
[col]="1"
67+
screen="sm"
68+
></dxi-responsive-box-location>
4969
<div *dxTemplate class="right-side-bar item">
5070
<p>Right Bar</p>
5171
</div>
52-
</dxi-item>
53-
<dxi-item>
54-
<dxi-location
72+
</dxi-responsive-box-item>
73+
<dxi-responsive-box-item>
74+
<dxi-responsive-box-location
5575
[row]="2"
5676
[col]="0"
5777
[colspan]="3"
5878
screen="lg"
59-
></dxi-location>
60-
<dxi-location
79+
></dxi-responsive-box-location>
80+
<dxi-responsive-box-location
6181
[row]="3"
6282
[col]="0"
6383
[colspan]="2"
6484
screen="sm"
65-
></dxi-location>
85+
></dxi-responsive-box-location>
6686
<div *dxTemplate class="footer item">
6787
<p>Footer</p>
6888
</div>
69-
</dxi-item>
89+
</dxi-responsive-box-item>
7090
</dx-responsive-box>
7191
</div>

0 commit comments

Comments
 (0)