Skip to content

Commit fca2f4a

Browse files
GoodDayForSurfGoodDayForSurf
committed
Merge branch '26_1' of https://github.com/DevExpress/DevExtreme into 26_1_demos_bundles
# Conflicts: # pnpm-lock.yaml
2 parents 6e06e1f + 591232b commit fca2f4a

92 files changed

Lines changed: 3897 additions & 2654 deletions

File tree

Some content is hidden

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

‎apps/demos/Demos/Chat/MessageStreaming/Angular/app/app.component.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
margin-bottom: 0;
3030
}
3131

32+
::ng-deep .chat-messagebubble-text pre {
33+
white-space: pre-wrap;
34+
overflow-wrap: break-word;
35+
}
36+
3237
::ng-deep .dx-chat-messagebubble-content h1,
3338
::ng-deep .dx-chat-messagebubble-content h2,
3439
::ng-deep .dx-chat-messagebubble-content h3,

‎apps/demos/Demos/Chat/MessageStreaming/React/styles.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
margin-bottom: 0;
3535
}
3636

37+
.chat-messagebubble-text pre {
38+
white-space: pre-wrap;
39+
overflow-wrap: break-word;
40+
}
41+
3742
.dx-chat-messagebubble-content h1,
3843
.dx-chat-messagebubble-content h2,
3944
.dx-chat-messagebubble-content h3,

‎apps/demos/Demos/Chat/MessageStreaming/ReactJs/styles.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
margin-bottom: 0;
3535
}
3636

37+
.chat-messagebubble-text pre {
38+
white-space: pre-wrap;
39+
overflow-wrap: break-word;
40+
}
41+
3742
.dx-chat-messagebubble-content h1,
3843
.dx-chat-messagebubble-content h2,
3944
.dx-chat-messagebubble-content h3,

‎apps/demos/Demos/Chat/MessageStreaming/Vue/App.vue‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ function sendSuggestion(prompt: string): void {
227227
margin-bottom: 0;
228228
}
229229
230+
.chat-messagebubble-text pre {
231+
white-space: pre-wrap;
232+
overflow-wrap: break-word;
233+
}
234+
230235
.dx-chat-messagebubble-content h1,
231236
.dx-chat-messagebubble-content h2,
232237
.dx-chat-messagebubble-content h3,

‎apps/demos/Demos/Chat/MessageStreaming/jQuery/styles.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@
3434
margin-bottom: 0;
3535
}
3636

37+
.chat-messagebubble-text pre {
38+
white-space: pre-wrap;
39+
overflow-wrap: break-word;
40+
}
41+
3742
.dx-chat-messagebubble-content h1,
3843
.dx-chat-messagebubble-content h2,
3944
.dx-chat-messagebubble-content h3,

‎apps/demos/Demos/Chat/PromptSuggestions/Angular/app/app.service.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ const suggestionItems = [
2020
const SYSTEM_PROMPT = `
2121
You are a logistics support assistant for an online marketplace.
2222
The user is logged into their account.
23-
If asked about orders, generate realistic but consistent mock data.
24-
Use plausible order IDs, dates within the last 30 days, and realistic shipment statuses (Processing, Shipped, In Transit, Out for Delivery, Delivered).
25-
Never invent absurd details. Do NOT create links.
23+
If asked about orders, generate realistic and consistent mock data.
24+
Use plausible order IDs, dates within the last 30 days, and the following order status values: Processing, Shipped, In Transit, Out for Delivery, Delivered.
25+
Never add details outside of given parameters. Do NOT create links.
2626
Keep responses structured and professional.
2727
When appropriate, use bullet points.
2828
@@ -31,7 +31,7 @@ The user has exactly 3 recent orders:
3131
- #A47903 (Delivered Feb 8)
3232
- #A47188 (Processing)
3333
34-
Favorited items (example, do NOT use real brands):
34+
Favorite items (example, do NOT use real brand names):
3535
VoltEdge 65W Fast Wall Charger (Black)
3636
✅ Back in stock — Ships in 1-2 business days
3737
@@ -47,7 +47,7 @@ LumaArc Minimal Desk Lamp (Matte Black)
4747
WaveTune Over-Ear Wireless Headphones (Ocean Blue)
4848
❌ Out of stock — No restock date available
4949
50-
AquaCarry Stainless Steel Bottle (600 ml, Sage)
50+
AquaCarry Stainless Steel Bottle (20 oz, Sage)
5151
✅ In stock — Available for same-day pick-up
5252
5353
Marketplace Return Policy (Mock)

‎apps/demos/Demos/Chat/PromptSuggestions/React/data.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export const suggestionItems = [
2121
export const SYSTEM_PROMPT = `
2222
You are a logistics support assistant for an online marketplace.
2323
The user is logged into their account.
24-
If asked about orders, generate realistic but consistent mock data.
25-
Use plausible order IDs, dates within the last 30 days, and realistic shipment statuses (Processing, Shipped, In Transit, Out for Delivery, Delivered).
26-
Never invent absurd details. Do NOT create links.
24+
If asked about orders, generate realistic and consistent mock data.
25+
Use plausible order IDs, dates within the last 30 days, and the following order status values: Processing, Shipped, In Transit, Out for Delivery, Delivered.
26+
Never add details outside of given parameters. Do NOT create links.
2727
Keep responses structured and professional.
2828
When appropriate, use bullet points.
2929
@@ -32,7 +32,7 @@ The user has exactly 3 recent orders:
3232
- #A47903 (Delivered Feb 8)
3333
- #A47188 (Processing)
3434
35-
Favorited items (example, do NOT use real brands):
35+
Favorite items (example, do NOT use real brand names):
3636
VoltEdge 65W Fast Wall Charger (Black)
3737
✅ Back in stock — Ships in 1-2 business days
3838
@@ -48,7 +48,7 @@ LumaArc Minimal Desk Lamp (Matte Black)
4848
WaveTune Over-Ear Wireless Headphones (Ocean Blue)
4949
❌ Out of stock — No restock date available
5050
51-
AquaCarry Stainless Steel Bottle (600 ml, Sage)
51+
AquaCarry Stainless Steel Bottle (20 oz, Sage)
5252
✅ In stock — Available for same-day pick-up
5353
5454
Marketplace Return Policy (Mock)

‎apps/demos/Demos/Chat/PromptSuggestions/ReactJs/data.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ export const suggestionItems = [
1515
export const SYSTEM_PROMPT = `
1616
You are a logistics support assistant for an online marketplace.
1717
The user is logged into their account.
18-
If asked about orders, generate realistic but consistent mock data.
19-
Use plausible order IDs, dates within the last 30 days, and realistic shipment statuses (Processing, Shipped, In Transit, Out for Delivery, Delivered).
20-
Never invent absurd details. Do NOT create links.
18+
If asked about orders, generate realistic and consistent mock data.
19+
Use plausible order IDs, dates within the last 30 days, and the following order status values: Processing, Shipped, In Transit, Out for Delivery, Delivered.
20+
Never add details outside of given parameters. Do NOT create links.
2121
Keep responses structured and professional.
2222
When appropriate, use bullet points.
2323
@@ -26,7 +26,7 @@ The user has exactly 3 recent orders:
2626
- #A47903 (Delivered Feb 8)
2727
- #A47188 (Processing)
2828
29-
Favorited items (example, do NOT use real brands):
29+
Favorite items (example, do NOT use real brand names):
3030
VoltEdge 65W Fast Wall Charger (Black)
3131
✅ Back in stock — Ships in 1-2 business days
3232
@@ -42,7 +42,7 @@ LumaArc Minimal Desk Lamp (Matte Black)
4242
WaveTune Over-Ear Wireless Headphones (Ocean Blue)
4343
❌ Out of stock — No restock date available
4444
45-
AquaCarry Stainless Steel Bottle (600 ml, Sage)
45+
AquaCarry Stainless Steel Bottle (20 oz, Sage)
4646
✅ In stock — Available for same-day pick-up
4747
4848
Marketplace Return Policy (Mock)

‎apps/demos/Demos/Chat/PromptSuggestions/Vue/data.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export const suggestionItems = [
3636
export const SYSTEM_PROMPT = `
3737
You are a logistics support assistant for an online marketplace.
3838
The user is logged into their account.
39-
If asked about orders, generate realistic but consistent mock data.
40-
Use plausible order IDs, dates within the last 30 days, and realistic shipment statuses (Processing, Shipped, In Transit, Out for Delivery, Delivered).
41-
Never invent absurd details. Do NOT create links.
39+
If asked about orders, generate realistic and consistent mock data.
40+
Use plausible order IDs, dates within the last 30 days, and the following order status values: Processing, Shipped, In Transit, Out for Delivery, Delivered.
41+
Never add details outside of given parameters. Do NOT create links.
4242
Keep responses structured and professional.
4343
When appropriate, use bullet points.
4444
@@ -47,7 +47,7 @@ The user has exactly 3 recent orders:
4747
- #A47903 (Delivered Feb 8)
4848
- #A47188 (Processing)
4949
50-
Favorited items (example, do NOT use real brands):
50+
Favorite items (example, do NOT use real brand names):
5151
VoltEdge 65W Fast Wall Charger (Black)
5252
✅ Back in stock — Ships in 1-2 business days
5353
@@ -63,7 +63,7 @@ LumaArc Minimal Desk Lamp (Matte Black)
6363
WaveTune Over-Ear Wireless Headphones (Ocean Blue)
6464
❌ Out of stock — No restock date available
6565
66-
AquaCarry Stainless Steel Bottle (600 ml, Sage)
66+
AquaCarry Stainless Steel Bottle (20 oz, Sage)
6767
✅ In stock — Available for same-day pick-up
6868
6969
Marketplace Return Policy (Mock)

‎apps/demos/Demos/Chat/PromptSuggestions/jQuery/data.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const suggestionItems = [
1919
const SYSTEM_PROMPT = `
2020
You are a logistics support assistant for an online marketplace.
2121
The user is logged into their account.
22-
If asked about orders, generate realistic but consistent mock data.
23-
Use plausible order IDs, dates within the last 30 days, and realistic shipment statuses (Processing, Shipped, In Transit, Out for Delivery, Delivered).
24-
Never invent absurd details. Do NOT create links.
22+
If asked about orders, generate realistic and consistent mock data.
23+
Use plausible order IDs, dates within the last 30 days, and the following order status values: Processing, Shipped, In Transit, Out for Delivery, Delivered.
24+
Never add details outside of given parameters. Do NOT create links.
2525
Keep responses structured and professional.
2626
When appropriate, use bullet points.
2727
@@ -30,7 +30,7 @@ The user has exactly 3 recent orders:
3030
- #A47903 (Delivered Feb 8)
3131
- #A47188 (Processing)
3232
33-
Favorited items (example, do NOT use real brands):
33+
Favorite items (example, do NOT use real brand names):
3434
VoltEdge 65W Fast Wall Charger (Black)
3535
✅ Back in stock — Ships in 1-2 business days
3636
@@ -46,7 +46,7 @@ LumaArc Minimal Desk Lamp (Matte Black)
4646
WaveTune Over-Ear Wireless Headphones (Ocean Blue)
4747
❌ Out of stock — No restock date available
4848
49-
AquaCarry Stainless Steel Bottle (600 ml, Sage)
49+
AquaCarry Stainless Steel Bottle (20 oz, Sage)
5050
✅ In stock — Available for same-day pick-up
5151
5252
Marketplace Return Policy (Mock)

0 commit comments

Comments
 (0)