From 69785daf634d524f1c7cddb271dd60a21be2b577 Mon Sep 17 00:00:00 2001
From: soroka_av <soroka_av@st.by>
Date: Wed, 13 May 2020 10:17:21 +0300
Subject: [PATCH 1/2] Fix Table type

---
 components/table/Table.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/table/Table.tsx b/components/table/Table.tsx
index e1d080df5d72..8b4ac08ecf74 100644
--- a/components/table/Table.tsx
+++ b/components/table/Table.tsx
@@ -5,7 +5,7 @@ import RcTable, { Summary } from 'rc-table';
 import { TableProps as RcTableProps, INTERNAL_HOOKS } from 'rc-table/lib/Table';
 import { convertChildrenToColumns } from 'rc-table/lib/hooks/useColumns';
 import Spin, { SpinProps } from '../spin';
-import Pagination, { PaginationConfig } from '../pagination';
+import Pagination from '../pagination';
 import { ConfigContext } from '../config-provider/context';
 import usePagination, { DEFAULT_PAGE_SIZE, getPaginationParam } from './hooks/usePagination';
 import useLazyKVMap from './hooks/useLazyKVMap';
@@ -72,7 +72,7 @@ export interface TableProps<RecordType>
   locale?: TableLocale;
 
   onChange?: (
-    pagination: PaginationConfig,
+    pagination: TablePaginationConfig,
     filters: Record<string, Key[] | null>,
     sorter: SorterResult<RecordType> | SorterResult<RecordType>[],
     extra: TableCurrentDataSource<RecordType>,
@@ -396,7 +396,7 @@ function Table<RecordType extends object = any>(props: TableProps<RecordType>) {
   let topPaginationNode: React.ReactNode;
   let bottomPaginationNode: React.ReactNode;
   if (pagination !== false) {
-    let paginationSize: PaginationConfig['size'];
+    let paginationSize: TablePaginationConfig['size'];
     if (mergedPagination.size) {
       paginationSize = mergedPagination.size;
     } else {

From 6c5f639f4185ffbf8527b4fbe1485b56cf5da24e Mon Sep 17 00:00:00 2001
From: soroka_av <soroka_av@st.by>
Date: Thu, 28 May 2020 12:43:09 +0300
Subject: [PATCH 2/2] Add: export RuleObject and RuleRender

---
 components/form/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/form/index.tsx b/components/form/index.tsx
index ba21537d4142..df0e9b89b08e 100644
--- a/components/form/index.tsx
+++ b/components/form/index.tsx
@@ -1,4 +1,4 @@
-import { Rule } from 'rc-field-form/lib/interface';
+import { Rule, RuleObject, RuleRender } from 'rc-field-form/lib/interface';
 import InternalForm, { useForm, FormInstance, FormProps } from './Form';
 import Item, { FormItemProps } from './FormItem';
 import List from './FormList';
@@ -30,6 +30,6 @@ Form.create = () => {
   );
 };
 
-export { FormInstance, FormProps, FormItemProps, Rule };
+export { FormInstance, FormProps, FormItemProps, Rule, RuleObject, RuleRender };
 
 export default Form;