Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50,678 changes: 25,232 additions & 25,446 deletions examples/kendo-react-finance-portfolio/package-lock.json

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions examples/kendo-react-finance-portfolio/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,30 @@
"@progress/kendo-drawing": "^1.21.2",
"@progress/kendo-inputs-common": "^3.1.1",
"@progress/kendo-intl": "^3.1.2",
"@progress/kendo-licensing": "^1.5.1",
"@progress/kendo-licensing": "^1.6.0",
"@progress/kendo-popup-common": "^1.9.2",
"@progress/kendo-react-animation": "^10.0.0",
"@progress/kendo-react-buttons": "^10.0.0",
"@progress/kendo-react-charts": "^10.0.0",
"@progress/kendo-react-common": "^10.0.0",
"@progress/kendo-react-data-tools": "^10.0.0",
"@progress/kendo-react-dateinputs": "^10.0.0",
"@progress/kendo-react-dialogs": "^10.0.0",
"@progress/kendo-react-dropdowns": "^10.0.0",
"@progress/kendo-react-excel-export": "^10.0.0",
"@progress/kendo-react-grid": "^10.0.0",
"@progress/kendo-react-inputs": "^10.0.0",
"@progress/kendo-react-intl": "^10.0.0",
"@progress/kendo-react-labels": "^10.0.0",
"@progress/kendo-react-layout": "^10.0.0",
"@progress/kendo-react-pdf": "^10.0.0",
"@progress/kendo-react-popup": "^10.0.0",
"@progress/kendo-react-progressbars": "^10.0.0",
"@progress/kendo-react-tooltip": "^10.0.0",
"@progress/kendo-react-treelist": "^10.0.0",
"@progress/kendo-react-treeview": "^10.0.0",
"@progress/kendo-svg-icons": "^4.0.0",
"@progress/kendo-theme-bootstrap": "^10.3.1",
"@progress/kendo-react-animation": "^11.1.0",
"@progress/kendo-react-buttons": "^11.1.0",
"@progress/kendo-react-charts": "^11.1.0",
"@progress/kendo-react-common": "^11.1.0",
"@progress/kendo-react-data-tools": "^11.1.0",
"@progress/kendo-react-dateinputs": "^11.1.0",
"@progress/kendo-react-dialogs": "^11.1.0",
"@progress/kendo-react-dropdowns": "^11.1.0",
"@progress/kendo-react-excel-export": "^11.1.0",
"@progress/kendo-react-grid": "^11.1.0",
"@progress/kendo-react-inputs": "^11.1.0",
"@progress/kendo-react-intl": "^11.1.0",
"@progress/kendo-react-labels": "^11.1.0",
"@progress/kendo-react-layout": "^11.1.0",
"@progress/kendo-react-pdf": "^11.1.0",
"@progress/kendo-react-popup": "^11.1.0",
"@progress/kendo-react-progressbars": "^11.1.0",
"@progress/kendo-react-tooltip": "^11.1.0",
"@progress/kendo-react-treelist": "^11.1.0",
"@progress/kendo-react-treeview": "^11.1.0",
"@progress/kendo-svg-icons": "^4.3.0",
"@progress/kendo-theme-bootstrap": "^11.0.2",
"@progress/kendo-ui": "^2025.1.227",
"@svgr/webpack": "^8.1.0",
"@types/jest": "^29.5.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,26 @@ export const StockList: React.FunctionComponent = () => {
<Grid
className={classNames(styles["grid"])}
data={processed}
selectedField="selected"
autoProcessData={true}
selectable={{
enabled: true,
mode: 'single'
}}
defaultSelect={{ 2: true }}
onSelectionChange={handleSelectionChange}
onRowClick={handleRowClick}
>
<GridColumn field="selected" headerCell={_ => null} cell={CheckboxCell} width={40} />
<GridColumn field="selected" cells={{ headerCell: _ => null, data: CheckboxCell }} width={40} />
<GridColumn field="symbol" title="Symbol" className={styles['symbol-cell']} width={75} />
<GridColumn field="name" title="Name" className={styles['name-cell']} width={195} />
<GridColumn field="price" title="Price" className={styles['price-cell']} cell={PriceCell} headerCell={PriceHeaderCell} width={80} />
<GridColumn field="day_change" title="Change" cell={ChangeCell} width={80} />
<GridColumn field="change_pct" title="% Change" cell={ChangeCell} width={90} />
<GridColumn field="volume" title="Volume" cell={NumberCell} width={80} />
<GridColumn field="volume_avg" title="Avg Vol" cell={NumberCell} headerCell={AvgVolumeHeaderCell} width={90} />
<GridColumn field="market_cap" title="Market Cap" cell={NumberCell} width={102} />
<GridColumn field="pe" title="PE Ratio (TTM)" headerCell={PERatioHeaderCell} width={80} />
<GridColumn cell={chartCell} title='1 Day Chart' width={200} />
<GridColumn field="price" title="Price" className={styles['price-cell']} cells={{ data: PriceCell, headerCell: PriceHeaderCell }} width={80} />
<GridColumn field="day_change" title="Change" cells={{ data: ChangeCell }} width={80} />
<GridColumn field="change_pct" title="% Change" cells={{ data: ChangeCell }} width={90} />
<GridColumn field="volume" title="Volume" cells={{ data: NumberCell }} width={80} />
<GridColumn field="volume_avg" title="Avg Vol" cells={{ data: NumberCell, headerCell: AvgVolumeHeaderCell }} width={90} />
<GridColumn field="market_cap" title="Market Cap" cells={{ data: NumberCell }} width={102} />
<GridColumn field="pe" title="PE Ratio (TTM)" cells={{ headerCell: PERatioHeaderCell }} width={80} />
<GridColumn cells={{ data: chartCell }} title='1 Day Chart' width={200} />
</Grid>
</>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import currencies from "cldr-numbers-full/main/es/currencies.json";
import caGregorian from "cldr-dates-full/main/es/ca-gregorian.json";
import dateFields from "cldr-dates-full/main/es/dateFields.json";

import { process } from "@progress/kendo-data-query";
import orders from "./data/orders.json";
import {
Grid,
Expand Down Expand Up @@ -81,58 +80,12 @@ export class VirtualizedPage extends React.Component<any, any> {
];
constructor(props: any) {
super(props);
const dataState: any = {
skip: 0,
take: 20,
sort: [
{ field: 'orderDate', dir: 'desc' }
],
group: [
{ field: 'customerID' }
]
};

this.state = {
dataResult: process(orders, dataState),
dataState: dataState,
currentLocale: this.locales[0]
};
}

dataStateChange = (event: any) => {
this.setState({
dataResult: process(orders, event.dataState),
dataState: event.dataState
});
};

expandChange = (event: any) => {
const { dataItem } = event;
const { dataResult } = this.state;
const updatedState: any[] = [];

const isExpanded =
dataItem.expanded === undefined ? dataItem.aggregates : dataItem.expanded;
dataItem.expanded = !isExpanded;

dataResult.data.forEach((groupInfo: any) => {
const groupItems = groupInfo.items.map((item: any) => {
return item.employeeID === dataItem.employeeID &&
item.customerID === dataItem.customerID
? dataItem
: item;
});
updatedState.push({ ...groupInfo, items: groupItems });
});

this.setState({
...this.state,
dataResult: {
...dataResult,
data: updatedState,
},
});
};

_pdfExport: any;
exportExcel = () => {
this._export.save();
Expand Down Expand Up @@ -162,16 +115,22 @@ export class VirtualizedPage extends React.Component<any, any> {
<Grid
style={{ height: '700px' }}
sortable
defaultSort={[
{ field: 'orderDate', dir: 'desc' }
]}
filterable
groupable
defaultGroup={[
{ field: 'customerID' }
]}
reorderable
pageable={{ buttonCount: 4, pageSizes: true }}
data={this.state.dataResult}
{...this.state.dataState}
onDataStateChange={this.dataStateChange}
defaultSkip={0}
defaultTake={20}
data={orders}
autoProcessData={true}
dataItemKey="orderID"
detail={DetailComponent}
expandField="expanded"
onExpandChange={this.expandChange}
>
<GridToolbar>
Locale:&nbsp;&nbsp;&nbsp;
Expand Down Expand Up @@ -208,10 +167,7 @@ export class VirtualizedPage extends React.Component<any, any> {
<GridPDFExport
ref={(element) => { this._pdfExport = element; }}
margin="1cm" >
{<Grid data={process(orders, {
skip: this.state.dataState.skip,
take: this.state.dataState.take,
})} >
{<Grid data={orders}>
<GridColumn field="customerID" width="200px" />
<GridColumn field="orderDate" filter="date" format="{0:D}" width="300px" />
<GridColumn field="shipName" width="280px" />
Expand Down
24 changes: 12 additions & 12 deletions examples/kendo-react-nodejs-express/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@progress/kendo-data-query": "^1.7.0",
"@progress/kendo-data-query": "^1.7.1",
"@progress/kendo-drawing": "^1.21.2",
"@progress/kendo-licensing": "^1.3.5",
"@progress/kendo-react-animation": "^9.0.0",
"@progress/kendo-react-buttons": "^9.0.0",
"@progress/kendo-react-data-tools": "^9.0.0",
"@progress/kendo-react-dateinputs": "^9.0.0",
"@progress/kendo-react-dropdowns": "^9.0.0",
"@progress/kendo-react-grid": "^9.0.0",
"@progress/kendo-react-inputs": "^9.0.0",
"@progress/kendo-react-intl": "^9.0.0",
"@progress/kendo-react-treelist": "^9.0.0",
"@progress/kendo-react-treeview": "^9.0.0",
"@progress/kendo-licensing": "^1.6.0",
"@progress/kendo-react-animation": "^11.1.0",
"@progress/kendo-react-buttons": "^11.1.0",
"@progress/kendo-react-data-tools": "^11.1.0",
"@progress/kendo-react-dateinputs": "^11.1.0",
"@progress/kendo-react-dropdowns": "^11.1.0",
"@progress/kendo-react-grid": "^11.1.0",
"@progress/kendo-react-inputs": "^11.1.0",
"@progress/kendo-react-intl": "^11.1.0",
"@progress/kendo-react-treelist": "^11.1.0",
"@progress/kendo-react-treeview": "^11.1.0",
"@progress/kendo-theme-default": "^10.0.1",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.1.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/kendo-react-nodejs-express/client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function App() {
</GridToolbar>
<GridColumn field="ProductID" title="Id" width="100px" editable={false} filterable={false} />
<GridColumn field="ProductName" title="Name" />
<GridColumn field="Category.CategoryName" title="Category" cell={DropDownCell} />
<GridColumn field="Category.CategoryName" title="Category" cells={{ data: DropDownCell }} />
<GridColumn field="FirstOrderedOn" title="First Ordered On" editor="date" filter='date' format={'{0:d}'} />
<GridColumn
field="UnitsInStock"
Expand All @@ -210,7 +210,7 @@ function App() {
filter="numeric"
/>
<GridColumn field="Discontinued" title="Discontinued" editor="boolean" filter="boolean" />
<GridColumn cell={MyCommandCell} width="200px" filterable={false} />
<GridColumn cells={{ data: MyCommandCell }} width="200px" filterable={false} />
</Grid>
</DataContext.Provider>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/kendo-react-nodejs-express/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@progress/kendo-data-query": "^1.7.0",
"@progress/kendo-data-query": "^1.7.1",
"cors": "^2.8.5",
"express": "^4.18.2"
}
Expand Down
Loading