@@ -6,19 +6,21 @@ import {
66 GridSelectionChangeEvent ,
77 GridHandle ,
88 getSelectedState ,
9+ GridPageChangeEvent ,
910 GridKeyDownEvent ,
1011 getSelectedStateFromKeyDown ,
1112 GridSortChangeEvent ,
1213} from '@progress/kendo-react-grid' ;
1314import {
1415 ChartWizard ,
16+ ChartWizardDataRow ,
1517 getWizardDataFromGridSelection ,
1618} from '@progress/kendo-react-chart-wizard' ;
1719import { Button } from '@progress/kendo-react-buttons' ;
1820import { orderBy } from '@progress/kendo-data-query' ;
1921import { chartAreaStackedIcon } from '@progress/kendo-svg-icons' ;
2022import { sampleData } from '../data/shared-gd-sampleChartData' ;
21- import { Pager , PageChangeEvent } from '@progress/kendo-react-data-tools' ;
23+ import { PagerTargetEvent } from '@progress/kendo-react-data-tools' ;
2224
2325interface SampleDataItem {
2426 ID : string ;
@@ -53,13 +55,13 @@ const AdminView: React.FC = () => {
5355 { field : 'Sales' , dir : 'desc' } ,
5456 ] ) ;
5557 const [ showChartWizard , setShowChartWizard ] = React . useState < boolean > ( false ) ;
56- const [ chartData , setChartData ] = React . useState < SampleDataItem [ ] > ( [ ] ) ;
57- const [ top3SalesData , setTop3SalesData ] = React . useState < SampleDataItem [ ] > ( [ ] ) ;
58+ const [ chartData , setChartData ] = React . useState < ChartWizardDataRow [ ] > ( [ ] ) ;
59+ const [ top3SalesData , setTop3SalesData ] = React . useState < ChartWizardDataRow [ ] > ( [ ] ) ;
5860 const [ top3Visible , setTop3Visible ] = React . useState < boolean > ( false ) ;
59- const [ page , setPage ] = React . useState < PageState > ( { skip : 0 , take : 4 } ) ;
61+ const [ page , setPage ] = React . useState < number | string | undefined > ( { skip : 0 , take : 4 } ) ;
6062
61- const pageChange = ( event : PageChangeEvent ) => {
62- setPage ( event . page ) ;
63+ const pageChange = ( event : GridPageChangeEvent ) => {
64+
6365 } ;
6466
6567 const data = sampleData . map ( ( item ) => ( {
@@ -116,8 +118,8 @@ const AdminView: React.FC = () => {
116118 const sortedTop3Sales = selectedData
117119 . sort (
118120 ( a , b ) =>
119- b . find ( ( field ) => field . field === 'Total Sales' ) . value -
120- a . find ( ( field ) => field . field === 'Total Sales' ) . value
121+ b . find ( ( field ) => field . field === 'Total Sales' ) ? .value -
122+ a . find ( ( field ) => field . field === 'Total Sales' ) ? .value
121123 )
122124 . slice ( 0 , 3 ) ;
123125
@@ -137,31 +139,6 @@ const AdminView: React.FC = () => {
137139 ) ;
138140 } ;
139141
140- const MyPager : React . FC < {
141- skip : number ;
142- take : number ;
143- total : number ;
144- onPageChange : ( event : PageChangeEvent ) => void ;
145- } > = ( props ) => {
146- return (
147- < div style = { { overflow : 'hidden' , padding : '10px' } } >
148- < Pager
149- responsive = { true }
150- skip = { props . skip }
151- take = { props . take }
152- total = { props . total }
153- onPageChange = { props . onPageChange }
154- buttonCount = { 5 }
155- info = { true }
156- previousNext = { true }
157- type = "numeric"
158- pageSizes = { [ 4 , 10 , 15 , 20 ] }
159- pageSizeValue = { props . take }
160- />
161- </ div >
162- ) ;
163- } ;
164-
165142 return (
166143 < >
167144 < div style = { { marginBottom : '10px' } } >
@@ -188,7 +165,6 @@ const AdminView: React.FC = () => {
188165 total = { data . length }
189166 pageable = { true }
190167 onPageChange = { pageChange }
191- pager = { ( pagerProps ) => < MyPager { ...pagerProps } /> }
192168 selectable = { {
193169 enabled : true ,
194170 drag : true ,
@@ -215,25 +191,13 @@ const AdminView: React.FC = () => {
215191 { showChartWizard && (
216192 < ChartWizard
217193 data = { chartData }
218- series = { [
219- {
220- field : 'value' ,
221- categoryField : 'category' ,
222- } ,
223- ] }
224194 onClose = { ( ) => setShowChartWizard ( false ) }
225195 />
226196 ) }
227197
228198 { top3Visible && (
229199 < ChartWizard
230200 data = { top3SalesData }
231- series = { [
232- {
233- field : 1 ,
234- categoryField : 0 ,
235- } ,
236- ] }
237201 onClose = { ( ) => setTop3Visible ( false ) }
238202 />
239203 ) }
0 commit comments