Skip to content

Commit 0bfb51d

Browse files
committed
Merge branch '25_2' of github.com:DevExpress/DevExtreme into dg_25_2_ai_column_jquery_demo
2 parents 97e3d5f + 7ef3f16 commit 0bfb51d

File tree

287 files changed

+8343
-3043
lines changed

Some content is hidden

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

287 files changed

+8343
-3043
lines changed

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
needs: check-should-run
3636
if: needs.check-should-run.outputs.should-run == 'true'
3737
env:
38-
NODE_OPTIONS: "--max-old-space-size=8192"
38+
NODE_OPTIONS: --max-old-space-size=8192
3939
timeout-minutes: 40
4040

4141
steps:
@@ -152,7 +152,7 @@ jobs:
152152
if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'force all tests')
153153
working-directory: apps/demos
154154
env:
155-
NODE_OPTIONS: "--max-old-space-size=8192"
155+
NODE_OPTIONS: --max-old-space-size=8192
156156
run: pnpx nx prepare-bundles
157157

158158
- name: Demos - Run tsc

.github/workflows/qunit_tests.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,15 @@ jobs:
148148
matrix:
149149
constel: [
150150
'ui',
151-
'ui.widgets(1/3)',
152-
'ui.widgets(2/3)',
153-
'ui.widgets(3/3)',
151+
'ui.widgets(1/2)',
152+
'ui.widgets(2/2)',
154153
'ui.editors(1/2)',
155154
'ui.editors(2/2)',
156155
'ui.htmlEditor',
157-
'ui.grid(1/4)',
158-
'ui.grid(2/4)',
159-
'ui.grid(3/4)',
160-
'ui.grid(4/4)',
161-
'ui.scheduler(1/3)',
162-
'ui.scheduler(2/3)',
163-
'ui.scheduler(3/3)',
156+
'ui.grid(1/2)',
157+
'ui.grid(2/2)',
158+
'ui.scheduler(1/2)',
159+
'ui.scheduler(2/2)',
164160
'viz'
165161
]
166162

.github/workflows/testcafe_tests.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ jobs:
7070

7171
- name: Build
7272
shell: bash
73-
run: pnpx nx build devextreme
73+
env:
74+
NODE_OPTIONS: --max-old-space-size=8192
75+
run: pnpx nx build devextreme --uglify
7476

7577
- name: Zip artifacts
7678
working-directory: ./packages/devextreme
@@ -92,18 +94,13 @@ jobs:
9294
fail-fast: false
9395
matrix:
9496
ARGS: [
95-
{ componentFolder: "accessibility", name: "accessibility (1/2)", indices: "1/2" },
96-
{ componentFolder: "accessibility", name: "accessibility (2/2)", indices: "2/2" },
97+
{ componentFolder: "accessibility", name: "accessibility" },
9798
{ componentFolder: "common", name: "common" },
9899

99100
# Grids tests need to be reworked to work in fluent theme
100-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (1/5)", indices: "1/5" },
101-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (2/5)", indices: "2/5" },
102-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (3/5)", indices: "3/5" },
103-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (4/5)", indices: "4/5" },
104-
{ componentFolder: "dataGrid/common", name: "dataGrid / common (5/5)", indices: "5/5" },
105-
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (1/2)", indices: "1/2" },
106-
{ componentFolder: "dataGrid/sticky", name: "dataGrid / sticky (2/2)", indices: "2/2" },
101+
{ componentFolder: "dataGrid", name: "dataGrid (1/3)", indices: "1/3" },
102+
{ componentFolder: "dataGrid", name: "dataGrid (2/3)", indices: "2/3" },
103+
{ componentFolder: "dataGrid", name: "dataGrid (3/3)", indices: "3/3" },
107104
{ componentFolder: "cardView", name: "cardView" },
108105

109106
# Scheduler tests need to be reworked to work in fluent theme
@@ -162,8 +159,8 @@ jobs:
162159
run: |
163160
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
164161
165-
- uses: actions/cache@v4
166-
name: Setup pnpm cache
162+
- uses: actions/cache/restore@v4
163+
name: Restore pnpm cache
167164
with:
168165
path: |
169166
${{ env.STORE_PATH }}
@@ -177,6 +174,8 @@ jobs:
177174

178175
- name: Run TestCafe tests
179176
working-directory: ./e2e/testcafe-devextreme
177+
env:
178+
NODE_OPTIONS: --max-old-space-size=8192
180179
run: |
181180
if [ "${{ matrix.ARGS.theme }}" != "" ]; then
182181
THEME="--theme ${{ matrix.ARGS.theme }}"

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>

0 commit comments

Comments
 (0)