Skip to content

Commit 5a9de7d

Browse files
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into 25_2_update_angular19
# Conflicts: # packages/devextreme-angular/package.json # pnpm-lock.yaml
2 parents e916b31 + 947e2aa commit 5a9de7d

File tree

112 files changed

+8321
-8848
lines changed

Some content is hidden

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

112 files changed

+8321
-8848
lines changed

.github/workflows/demos_visual_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
steps:
8989
- name: Determine framework tests scope
9090
id: determine
91-
run: |
91+
run: |
9292
if [ "${{ github.event_name }}" != "pull_request" ] || [ "${{ contains(github.event.pull_request.labels.*.name, 'force all tests') }}" = "true" ]; then
9393
echo "Framework tests scope: all demos"
9494
echo "framework-tests-scope=all" >> $GITHUB_OUTPUT
@@ -110,7 +110,7 @@ jobs:
110110
needs.determine-framework-tests-scope.result == 'success'
111111
env:
112112
NODE_OPTIONS: --max-old-space-size=8192
113-
timeout-minutes: 20
113+
timeout-minutes: 30
114114

115115
steps:
116116
- name: Get sources
@@ -603,12 +603,12 @@ jobs:
603603
id: chrome-flags
604604
run: |
605605
BASE_FLAGS="chrome:headless --window-size=1200,800 --disable-gpu --no-sandbox --disable-dev-shm-usage --disable-partial-raster --disable-skia-runtime-opts --run-all-compositor-stages-before-draw --disable-new-content-rendering-timeout --disable-threaded-animation --disable-threaded-scrolling --disable-checker-imaging --disable-image-animation-resync --use-gl=swiftshader --disable-features=PaintHolding --js-flags=--random-seed=2147483647"
606-
606+
607607
# For Material theme, enable better font rendering to avoid instability
608608
if [[ "${{ matrix.THEME }}" != *"material"* ]]; then
609609
BASE_FLAGS="$BASE_FLAGS --font-render-hinting=none --disable-font-subpixel-positioning"
610610
fi
611-
611+
612612
echo "flags=$BASE_FLAGS" >> $GITHUB_OUTPUT
613613
614614
- name: Run TestCafe tests (jQuery)

.github/workflows/packages_publishing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9292
run: |
93-
pnpm set //npm.pkg.github.com/:_authToken="$NODE_AUTH_TOKEN";
93+
pnpm set "//npm.pkg.github.com/:_authToken" "$env:NODE_AUTH_TOKEN"
9494
pnpm nx build sbom;
9595
9696
- name: Build artifacts package

apps/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "devextreme-angular-playground",
33
"description": "DevExtreme Angular UI and Visualization Components",
44
"private": true,
5-
"version": "25.2.2",
5+
"version": "25.2.3",
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
DevExtreme Chat supports file attachments. When this feature is activated ([fileUploaderOptions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#fileUploaderOptions).**uploadFile** is specified), an “Attach” button appears in the message input field, allowing users to add files to their messages.
1+
The DevExtreme Chat allows users to attach files. When this feature is activated ([fileUploaderOptions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#fileUploaderOptions).**uploadFile** is specified), an “Attach” button appears in the message input field, allowing users to add files to their messages.
22

33
When users attach files, each file is displayed in the input area with a file-type icon, basic details (name and size), upload status, and an option to remove files before sending.
44
<!--split-->
55

6-
You can further customize the file upload process with [fileUploaderOptions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#fileUploaderOptions) properties:
6+
You can customize the file upload process with the following [fileUploaderOptions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#fileUploaderOptions) properties:
77

88
- **maxFileSize**
9-
Specifies the maximum allowed file size.
9+
Specifies maximum allowed file size.
1010
- **minFileSize**
11-
Specifies the minimum allowed file size.
11+
Specifies minimum allowed file size.
1212
- **multiple**
1313
When set to `false`, limits uploads to a single file.
1414
- **allowedFileExtensions**
1515
Restricts accepted file types.
1616

1717
For the complete list of configuration options, refer to the following API section: [fileUploaderOptions](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#fileUploaderOptions).
1818

19-
The [Attachment](/Documentation/ApiReference/UI_Components/dxChat/Types/Attachment/) type includes `name` and `size` fields. To add custom fields (such as `url` in this demo), handle the [onMessageEntered](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#onMessageEntered) event and update the message object’s [attachments](/Documentation/ApiReference/UI_Components/dxChat/Types/TextMessage/#attachments) array as needed. You can use this handler to save files to your server.
19+
[Attachment](/Documentation/ApiReference/UI_Components/dxChat/Types/Attachment/) type includes `name` and `size` fields. To add custom fields (such as `url` in this demo), handle the [onMessageEntered](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#onMessageEntered) event and update the message object’s [attachments](/Documentation/ApiReference/UI_Components/dxChat/Types/TextMessage/#attachments) array as needed. You can use this handler to save files to your server.
2020

2121
After a user sends a message, attachments appear in the corresponding message bubble. To allow users to download attachments, implement the [onAttachmentDownloadClick](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#onAttachmentDownloadClick) event handler. You can define custom download logic within the handler.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
::ng-deep #gridContainer {
2+
min-height: 560px;
3+
}
4+
15
::ng-deep #gridContainer .ai__cell {
26
background-color: var(--dx-datagrid-row-alternation-bg);
37
}

apps/demos/Demos/DataGrid/AIColumns/React/App.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export default function App() {
4141
keyExpr="ID"
4242
aiIntegration={aiIntegration}
4343
onAIColumnRequestCreating={onAIColumnRequestCreating}
44+
className="ai__grid"
4445
>
4546
<Paging
4647
enabled={true}

apps/demos/Demos/DataGrid/AIColumns/React/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
background-color: var(--dx-datagrid-row-alternation-bg);
33
}
44

5+
.ai__grid {
6+
min-height: 560px;
7+
}
8+
59
.trademark__wrapper {
610
display: flex;
711
align-items: center;

apps/demos/Demos/DataGrid/AIColumns/ReactJs/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default function App() {
3333
keyExpr="ID"
3434
aiIntegration={aiIntegration}
3535
onAIColumnRequestCreating={onAIColumnRequestCreating}
36+
className="ai__grid"
3637
>
3738
<Paging
3839
enabled={true}

apps/demos/Demos/DataGrid/AIColumns/ReactJs/styles.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
background-color: var(--dx-datagrid-row-alternation-bg);
33
}
44

5+
.ai__grid {
6+
min-height: 560px;
7+
}
8+
59
.trademark__wrapper {
610
display: flex;
711
align-items: center;

apps/demos/Demos/DataGrid/AIColumns/Vue/App.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
:showBorders="true"
66
:aiIntegration="aiIntegration"
77
:onAIColumnRequestCreating="onAIColumnRequestCreating"
8+
class="ai__grid"
89
>
910
<DxGrouping :contextMenuEnabled="false"/>
1011
<DxPaging :pageSize="10"/>
@@ -121,4 +122,8 @@ const onAIColumnRequestCreating = (e: { data: Partial<Vehicle>[] }) => {
121122
#app .ai__cell {
122123
background-color: var(--dx-datagrid-row-alternation-bg);
123124
}
125+
126+
.ai__grid {
127+
min-height: 560px;
128+
}
124129
</style>

0 commit comments

Comments
 (0)