Skip to content

Commit 9cea814

Browse files
committed
Merge branch '24_2' of github.com:DevExpress/DevExtreme into T1265009_24_2
2 parents f759139 + dd04a5e commit 9cea814

File tree

155 files changed

+11090
-6526
lines changed

Some content is hidden

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

155 files changed

+11090
-6526
lines changed

.github/workflows/update_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
git config --global user.name "DX Robot"
6060
6161
- name: Bump version
62-
run: pnpm run all:update-version -- ${{ inputs.version }}
62+
run: pnpm run all:update-version ${{ inputs.version }}
6363

6464
- name: Commit changes and make PR
6565
env:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The DevExtreme website includes "Getting Started" guides for every aspect of Dev
3737
- [Demo Gallery](https://js.devexpress.com/Demos/WidgetsGallery)
3838
- [Responsive UI Templates](https://js.devexpress.com/Templates/UITemplates)
3939
- [Documentation](https://js.devexpress.com/Documentation)
40-
- [Examples on GitHub](https://github.com/DevExpress/DevExtreme-examples)
40+
- [Examples on GitHub](https://github.com/DevExpress-Examples)
4141
- [YouTube videos](https://www.youtube.com/playlist?list=PL8h4jt35t1wjGvgflbHEH_e3b23AA30-z)
4242

4343
## Contributing

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": "24.2.2",
5+
"version": "24.2.3",
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Use the following properties to customize the Chat component:
2+
3+
- To display/hide Chat UI elements:
4+
- [showAvatar](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#showAvatar)
5+
- [showUserName](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#showUserName)
6+
- [showDayHeaders](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#showDayHeaders)
7+
- [showMessageTimestamp](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#showMessageTimestamp)
8+
9+
- To modify date/time formats:
10+
- [dayHeaderFormat](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#dayHeaderFormat)
11+
- [messageTimestampFormat](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#messageTimestampFormat)
12+
13+
- To deactivate Chat, use the [disabled](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#disabled) property.
14+
<!--split-->

apps/demos/Demos/Pagination/Overview/React/App.tsx

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,32 @@
1-
import React from "react";
2-
import Pagination from "devextreme-react/pagination";
3-
import { customers } from "./data.ts";
1+
import React, { useState } from 'react';
2+
import Pagination from 'devextreme-react/pagination';
3+
import EmployeeGallery from './EmployeesGallery.tsx';
44

5-
const columns = ["CompanyName", "City", "State", "Phone", "Fax"];
5+
import { employees } from './data.ts';
6+
7+
const PAGE_SIZES = [4, 6];
68

79
const App = () => {
10+
const [pageSize, setPageSize] = useState(4);
11+
const [pageIndex, setPageIndex] = useState(1);
12+
813
return (
914
<>
10-
<Pagination />
15+
<EmployeeGallery
16+
employees={employees}
17+
pageSize={pageSize}
18+
pageIndex={pageIndex}
19+
/>
20+
<Pagination
21+
showInfo
22+
showNavigationButtons
23+
allowedPageSizes={PAGE_SIZES}
24+
itemCount={employees.length}
25+
pageIndex={pageIndex}
26+
pageSize={pageSize}
27+
onPageIndexChange={setPageIndex}
28+
onPageSizeChange={setPageSize}
29+
/>
1130
</>
1231
);
1332
};
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import React from 'react';
2+
import { Employee } from './data';
3+
4+
interface EmployeeCardProps {
5+
employee: Employee;
6+
}
7+
8+
const EmployeeCard = ({ employee }: EmployeeCardProps) => {
9+
return (
10+
<div className="employees__card">
11+
<div className="employees__img-wrapper">
12+
<img
13+
className="employees__img"
14+
src={employee.Picture}
15+
alt={employee.FullName}
16+
/>
17+
</div>
18+
<div className="employees__info">
19+
<div className="employees__info-row">
20+
<span className="employees__info-label">Full Name:</span>
21+
<span className="employees__info-value">{employee.FullName}</span>
22+
</div>
23+
24+
<div className="employees__info-row">
25+
<span className="employees__info-label">Position:</span>
26+
<span className="employees__info-value">{employee.Title}</span>
27+
</div>
28+
29+
<div className="employees__info-row">
30+
<span className="employees__info-label">Phone:</span>
31+
<span className="employees__info-value">{employee.MobilePhone}</span>
32+
</div>
33+
</div>
34+
</div>
35+
);
36+
};
37+
38+
export default EmployeeCard;
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import React from 'react';
2+
import EmployeeCard from './EmployeeCard.tsx';
3+
import { Employee } from './data';
4+
5+
interface EmployeeGalleryProps {
6+
employees: Employee[];
7+
pageSize: number;
8+
pageIndex: number;
9+
}
10+
11+
const EmployeeGallery = ({ employees, pageSize, pageIndex }: EmployeeGalleryProps) => {
12+
const cardsNumber = pageSize === 4 ? 'employees--forth' : 'employees--six';
13+
const pageEmployees = employees.slice((pageIndex - 1) * pageSize, pageIndex * pageSize);
14+
15+
return (
16+
<div className={`employees ${cardsNumber}`}>
17+
{pageEmployees.map((employee) => (
18+
<EmployeeCard
19+
key={employee.ID}
20+
employee={employee}
21+
/>
22+
))}
23+
</div>
24+
);
25+
};
26+
27+
export default EmployeeGallery;

0 commit comments

Comments
 (0)