Skip to content

Commit 46d72d3

Browse files
silviyabotevasilviyaboteva
authored
Merge pull request #3195 from telerik/kendo-react-personal-finance
chore: bump product versions
2 parents f2a3029 + 6f6c33f commit 46d72d3

File tree

10 files changed

+25834
-27148
lines changed

10 files changed

+25834
-27148
lines changed

‎examples/kendo-react-finance-portfolio/package-lock.json‎

Lines changed: 25232 additions & 25446 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/kendo-react-finance-portfolio/package.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@
1010
"@progress/kendo-drawing": "^1.21.2",
1111
"@progress/kendo-inputs-common": "^3.1.1",
1212
"@progress/kendo-intl": "^3.1.2",
13-
"@progress/kendo-licensing": "^1.5.1",
13+
"@progress/kendo-licensing": "^1.6.0",
1414
"@progress/kendo-popup-common": "^1.9.2",
15-
"@progress/kendo-react-animation": "^10.0.0",
16-
"@progress/kendo-react-buttons": "^10.0.0",
17-
"@progress/kendo-react-charts": "^10.0.0",
18-
"@progress/kendo-react-common": "^10.0.0",
19-
"@progress/kendo-react-data-tools": "^10.0.0",
20-
"@progress/kendo-react-dateinputs": "^10.0.0",
21-
"@progress/kendo-react-dialogs": "^10.0.0",
22-
"@progress/kendo-react-dropdowns": "^10.0.0",
23-
"@progress/kendo-react-excel-export": "^10.0.0",
24-
"@progress/kendo-react-grid": "^10.0.0",
25-
"@progress/kendo-react-inputs": "^10.0.0",
26-
"@progress/kendo-react-intl": "^10.0.0",
27-
"@progress/kendo-react-labels": "^10.0.0",
28-
"@progress/kendo-react-layout": "^10.0.0",
29-
"@progress/kendo-react-pdf": "^10.0.0",
30-
"@progress/kendo-react-popup": "^10.0.0",
31-
"@progress/kendo-react-progressbars": "^10.0.0",
32-
"@progress/kendo-react-tooltip": "^10.0.0",
33-
"@progress/kendo-react-treelist": "^10.0.0",
34-
"@progress/kendo-react-treeview": "^10.0.0",
35-
"@progress/kendo-svg-icons": "^4.0.0",
36-
"@progress/kendo-theme-bootstrap": "^10.3.1",
15+
"@progress/kendo-react-animation": "^11.1.0",
16+
"@progress/kendo-react-buttons": "^11.1.0",
17+
"@progress/kendo-react-charts": "^11.1.0",
18+
"@progress/kendo-react-common": "^11.1.0",
19+
"@progress/kendo-react-data-tools": "^11.1.0",
20+
"@progress/kendo-react-dateinputs": "^11.1.0",
21+
"@progress/kendo-react-dialogs": "^11.1.0",
22+
"@progress/kendo-react-dropdowns": "^11.1.0",
23+
"@progress/kendo-react-excel-export": "^11.1.0",
24+
"@progress/kendo-react-grid": "^11.1.0",
25+
"@progress/kendo-react-inputs": "^11.1.0",
26+
"@progress/kendo-react-intl": "^11.1.0",
27+
"@progress/kendo-react-labels": "^11.1.0",
28+
"@progress/kendo-react-layout": "^11.1.0",
29+
"@progress/kendo-react-pdf": "^11.1.0",
30+
"@progress/kendo-react-popup": "^11.1.0",
31+
"@progress/kendo-react-progressbars": "^11.1.0",
32+
"@progress/kendo-react-tooltip": "^11.1.0",
33+
"@progress/kendo-react-treelist": "^11.1.0",
34+
"@progress/kendo-react-treeview": "^11.1.0",
35+
"@progress/kendo-svg-icons": "^4.3.0",
36+
"@progress/kendo-theme-bootstrap": "^11.0.2",
3737
"@progress/kendo-ui": "^2025.1.227",
3838
"@svgr/webpack": "^8.1.0",
3939
"@types/jest": "^29.5.11",

‎examples/kendo-react-finance-portfolio/src/components/StockList/StockList.tsx‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,26 @@ export const StockList: React.FunctionComponent = () => {
109109
<Grid
110110
className={classNames(styles["grid"])}
111111
data={processed}
112-
selectedField="selected"
112+
autoProcessData={true}
113+
selectable={{
114+
enabled: true,
115+
mode: 'single'
116+
}}
117+
defaultSelect={{ 2: true }}
113118
onSelectionChange={handleSelectionChange}
114119
onRowClick={handleRowClick}
115120
>
116-
<GridColumn field="selected" headerCell={_ => null} cell={CheckboxCell} width={40} />
121+
<GridColumn field="selected" cells={{ headerCell: _ => null, data: CheckboxCell }} width={40} />
117122
<GridColumn field="symbol" title="Symbol" className={styles['symbol-cell']} width={75} />
118123
<GridColumn field="name" title="Name" className={styles['name-cell']} width={195} />
119-
<GridColumn field="price" title="Price" className={styles['price-cell']} cell={PriceCell} headerCell={PriceHeaderCell} width={80} />
120-
<GridColumn field="day_change" title="Change" cell={ChangeCell} width={80} />
121-
<GridColumn field="change_pct" title="% Change" cell={ChangeCell} width={90} />
122-
<GridColumn field="volume" title="Volume" cell={NumberCell} width={80} />
123-
<GridColumn field="volume_avg" title="Avg Vol" cell={NumberCell} headerCell={AvgVolumeHeaderCell} width={90} />
124-
<GridColumn field="market_cap" title="Market Cap" cell={NumberCell} width={102} />
125-
<GridColumn field="pe" title="PE Ratio (TTM)" headerCell={PERatioHeaderCell} width={80} />
126-
<GridColumn cell={chartCell} title='1 Day Chart' width={200} />
124+
<GridColumn field="price" title="Price" className={styles['price-cell']} cells={{ data: PriceCell, headerCell: PriceHeaderCell }} width={80} />
125+
<GridColumn field="day_change" title="Change" cells={{ data: ChangeCell }} width={80} />
126+
<GridColumn field="change_pct" title="% Change" cells={{ data: ChangeCell }} width={90} />
127+
<GridColumn field="volume" title="Volume" cells={{ data: NumberCell }} width={80} />
128+
<GridColumn field="volume_avg" title="Avg Vol" cells={{ data: NumberCell, headerCell: AvgVolumeHeaderCell }} width={90} />
129+
<GridColumn field="market_cap" title="Market Cap" cells={{ data: NumberCell }} width={102} />
130+
<GridColumn field="pe" title="PE Ratio (TTM)" cells={{ headerCell: PERatioHeaderCell }} width={80} />
131+
<GridColumn cells={{ data: chartCell }} title='1 Day Chart' width={200} />
127132
</Grid>
128133
</>
129134
)

‎examples/kendo-react-finance-portfolio/src/pages/VirtualizedPage.tsx‎

Lines changed: 13 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import currencies from "cldr-numbers-full/main/es/currencies.json";
1818
import caGregorian from "cldr-dates-full/main/es/ca-gregorian.json";
1919
import dateFields from "cldr-dates-full/main/es/dateFields.json";
2020

21-
import { process } from "@progress/kendo-data-query";
2221
import orders from "./data/orders.json";
2322
import {
2423
Grid,
@@ -81,58 +80,12 @@ export class VirtualizedPage extends React.Component<any, any> {
8180
];
8281
constructor(props: any) {
8382
super(props);
84-
const dataState: any = {
85-
skip: 0,
86-
take: 20,
87-
sort: [
88-
{ field: 'orderDate', dir: 'desc' }
89-
],
90-
group: [
91-
{ field: 'customerID' }
92-
]
93-
};
83+
9484
this.state = {
95-
dataResult: process(orders, dataState),
96-
dataState: dataState,
9785
currentLocale: this.locales[0]
9886
};
9987
}
10088

101-
dataStateChange = (event: any) => {
102-
this.setState({
103-
dataResult: process(orders, event.dataState),
104-
dataState: event.dataState
105-
});
106-
};
107-
108-
expandChange = (event: any) => {
109-
const { dataItem } = event;
110-
const { dataResult } = this.state;
111-
const updatedState: any[] = [];
112-
113-
const isExpanded =
114-
dataItem.expanded === undefined ? dataItem.aggregates : dataItem.expanded;
115-
dataItem.expanded = !isExpanded;
116-
117-
dataResult.data.forEach((groupInfo: any) => {
118-
const groupItems = groupInfo.items.map((item: any) => {
119-
return item.employeeID === dataItem.employeeID &&
120-
item.customerID === dataItem.customerID
121-
? dataItem
122-
: item;
123-
});
124-
updatedState.push({ ...groupInfo, items: groupItems });
125-
});
126-
127-
this.setState({
128-
...this.state,
129-
dataResult: {
130-
...dataResult,
131-
data: updatedState,
132-
},
133-
});
134-
};
135-
13689
_pdfExport: any;
13790
exportExcel = () => {
13891
this._export.save();
@@ -162,16 +115,22 @@ export class VirtualizedPage extends React.Component<any, any> {
162115
<Grid
163116
style={{ height: '700px' }}
164117
sortable
118+
defaultSort={[
119+
{ field: 'orderDate', dir: 'desc' }
120+
]}
165121
filterable
166122
groupable
123+
defaultGroup={[
124+
{ field: 'customerID' }
125+
]}
167126
reorderable
168127
pageable={{ buttonCount: 4, pageSizes: true }}
169-
data={this.state.dataResult}
170-
{...this.state.dataState}
171-
onDataStateChange={this.dataStateChange}
128+
defaultSkip={0}
129+
defaultTake={20}
130+
data={orders}
131+
autoProcessData={true}
132+
dataItemKey="orderID"
172133
detail={DetailComponent}
173-
expandField="expanded"
174-
onExpandChange={this.expandChange}
175134
>
176135
<GridToolbar>
177136
Locale:&nbsp;&nbsp;&nbsp;
@@ -208,10 +167,7 @@ export class VirtualizedPage extends React.Component<any, any> {
208167
<GridPDFExport
209168
ref={(element) => { this._pdfExport = element; }}
210169
margin="1cm" >
211-
{<Grid data={process(orders, {
212-
skip: this.state.dataState.skip,
213-
take: this.state.dataState.take,
214-
})} >
170+
{<Grid data={orders}>
215171
<GridColumn field="customerID" width="200px" />
216172
<GridColumn field="orderDate" filter="date" format="{0:D}" width="300px" />
217173
<GridColumn field="shipName" width="280px" />

‎examples/kendo-react-nodejs-express/client/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@progress/kendo-data-query": "^1.7.0",
6+
"@progress/kendo-data-query": "^1.7.1",
77
"@progress/kendo-drawing": "^1.21.2",
8-
"@progress/kendo-licensing": "^1.3.5",
9-
"@progress/kendo-react-animation": "^9.0.0",
10-
"@progress/kendo-react-buttons": "^9.0.0",
11-
"@progress/kendo-react-data-tools": "^9.0.0",
12-
"@progress/kendo-react-dateinputs": "^9.0.0",
13-
"@progress/kendo-react-dropdowns": "^9.0.0",
14-
"@progress/kendo-react-grid": "^9.0.0",
15-
"@progress/kendo-react-inputs": "^9.0.0",
16-
"@progress/kendo-react-intl": "^9.0.0",
17-
"@progress/kendo-react-treelist": "^9.0.0",
18-
"@progress/kendo-react-treeview": "^9.0.0",
8+
"@progress/kendo-licensing": "^1.6.0",
9+
"@progress/kendo-react-animation": "^11.1.0",
10+
"@progress/kendo-react-buttons": "^11.1.0",
11+
"@progress/kendo-react-data-tools": "^11.1.0",
12+
"@progress/kendo-react-dateinputs": "^11.1.0",
13+
"@progress/kendo-react-dropdowns": "^11.1.0",
14+
"@progress/kendo-react-grid": "^11.1.0",
15+
"@progress/kendo-react-inputs": "^11.1.0",
16+
"@progress/kendo-react-intl": "^11.1.0",
17+
"@progress/kendo-react-treelist": "^11.1.0",
18+
"@progress/kendo-react-treeview": "^11.1.0",
1919
"@progress/kendo-theme-default": "^10.0.1",
2020
"@testing-library/jest-dom": "^6.1.4",
2121
"@testing-library/react": "^14.1.2",

‎examples/kendo-react-nodejs-express/client/src/App.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function App() {
200200
</GridToolbar>
201201
<GridColumn field="ProductID" title="Id" width="100px" editable={false} filterable={false} />
202202
<GridColumn field="ProductName" title="Name" />
203-
<GridColumn field="Category.CategoryName" title="Category" cell={DropDownCell} />
203+
<GridColumn field="Category.CategoryName" title="Category" cells={{ data: DropDownCell }} />
204204
<GridColumn field="FirstOrderedOn" title="First Ordered On" editor="date" filter='date' format={'{0:d}'} />
205205
<GridColumn
206206
field="UnitsInStock"
@@ -210,7 +210,7 @@ function App() {
210210
filter="numeric"
211211
/>
212212
<GridColumn field="Discontinued" title="Discontinued" editor="boolean" filter="boolean" />
213-
<GridColumn cell={MyCommandCell} width="200px" filterable={false} />
213+
<GridColumn cells={{ data: MyCommandCell }} width="200px" filterable={false} />
214214
</Grid>
215215
</DataContext.Provider>
216216
</div>

‎examples/kendo-react-nodejs-express/server/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"author": "",
1010
"license": "ISC",
1111
"dependencies": {
12-
"@progress/kendo-data-query": "^1.7.0",
12+
"@progress/kendo-data-query": "^1.7.1",
1313
"cors": "^2.8.5",
1414
"express": "^4.18.2"
1515
}

0 commit comments

Comments
 (0)