From 0cee7bed17472ecd82ecdcce30bc3cb41cd9911a Mon Sep 17 00:00:00 2001
From: Kun Yan <kyan@redhat.com>
Date: Fri, 23 Feb 2018 10:34:20 +0800
Subject: [PATCH] [react-table] Fix SortedChangeFunction issue

Add more types(Filter|Resize)
---
 types/react-table/index.d.ts            | 44 +++++++++++++++++--------
 types/react-table/react-table-tests.tsx |  5 +++
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2ab2d2a821..aa759990b8 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -18,17 +18,26 @@ export type ComponentPropsGetterR = (finalState: any, rowInfo?: RowInfo, column?
 export type ComponentPropsGetterC = (finalState: any, rowInfo?: undefined, column?: Column, instance?: any) => object | undefined;
 export type ComponentPropsGetterRC = (finalState: any, rowInfo?: RowInfo, column?: Column, instance?: any) => object | undefined;
 
-export type DefaultFilterFunction = (filter: any, row: any, column: any) => boolean;
-export type FilterFunction = (filter: any, rows: any[], column: any) => boolean;
+export type DefaultFilterFunction = (filter: Filter, row: any, column: any) => boolean;
+export type FilterFunction = (filter: Filter, rows: any[], column: any) => boolean;
 export type SubComponentFunction = (rowInfo: RowInfo) => React.ReactNode;
 export type PageChangeFunction = (page: number) => void;
 export type PageSizeChangeFunction = (newPageSize: number, newPage: number) => void;
-export type SortedChangeFunction = (column: any, additive: boolean) => void;
-export type FilteredChangeFunction = (column: any, value: any, pivotColumn: any) => void;
+export type SortedChangeFunction = (newSorted: SortingRule[], column: any, additive: boolean) => void;
+export type FilteredChangeFunction = (newFiltering: Filter, column: any, value: any) => void;
 export type ExpandedChangeFunction = (column: any, event: any, isTouch: boolean) => void;
-export type ResizedChangeFunction = (newResized: any, event: any) => void;
+export type ResizedChangeFunction = (newResized: Resize[], event: any) => void;
 export type SortFunction = (a: any, b: any, desc: any) => -1 | 0 | 1;
 
+export interface Resize {
+    id: string;
+    value: any;
+}
+export interface Filter {
+    id: string;
+    value: any;
+    pivotId?: string;
+}
 /** NOTE: to many configuration ways (only true values are confusing) */
 export interface SortingRule {
     id: string;
@@ -106,7 +115,7 @@ export interface TableProps extends
     showFilters: boolean;
 
     /** Default: [] */
-    defaultFiltering: any[];
+    defaultFiltering: Filter[];
 
     /** Default: ... */
     defaultFilterMethod: DefaultFilterFunction;
@@ -121,19 +130,19 @@ export interface TableProps extends
     filterable: boolean;
 
     /** Default: [] */
-    defaultResizing: any[];
+    defaultResizing: Resize[];
 
     /** Default: false */
     defaultSortDesc: boolean;
 
     /** Default: [] */
-    defaultSorted: any[];
+    defaultSorted: SortingRule[];
 
     /** Default: [] */
-    defaultFiltered: any[];
+    defaultFiltered: Filter[];
 
     /** Default: [] */
-    defaultResized: any[];
+    defaultResized: Resize[];
 
     /** Default: {} */
     defaultExpanded: {};
@@ -184,13 +193,13 @@ export interface ControlledStateOverrideProps {
     sorting: number;
 
     /** Default: [] */
-    sorted: any[];
+    sorted: SortingRule[];
 
     /** Default: [] */
-    filtered: any[];
+    filtered: Filter[];
 
     /** Default: [] */
-    resized: any[];
+    resized: Resize[];
 
     /** Default: {} */
     expanded: {};
@@ -613,6 +622,12 @@ export interface RowInfo {
     /** The index of the row relative to the current page */
     viewIndex: number;
 
+    /** The size of the page */
+    pageSize: number;
+
+    /** The index of page */
+    page: number;
+
     /** The nesting depth (zero-indexed) */
     level: number;
 
@@ -622,6 +637,9 @@ export interface RowInfo {
     /** A boolean stating if the row is an aggregation row */
     aggregated: boolean;
 
+    /** A boolean stating if the row is grouped by Pivot */
+    groupedByPivot: boolean;
+
     /** An array of any expandable sub-rows contained in this row */
     subRows: any[];
 }
diff --git a/types/react-table/react-table-tests.tsx b/types/react-table/react-table-tests.tsx
index 3230e4c5da..f03bb5e167 100644
--- a/types/react-table/react-table-tests.tsx
+++ b/types/react-table/react-table-tests.tsx
@@ -149,6 +149,11 @@ const Component = (props: {}) => {
         pageText='Page'
         ofText='of'
         rowsText='rows'
+        onSortedChange={(newSorted, column, additive) => {
+          if (newSorted) {
+            console.log(newSorted);
+          }
+        }}
       />
       <br />
     </div>