Move pagination components to subdirectory and migrate them to TypeSc…

…ript
jeiea · Aug 25, 2020 · 1c7bd06 · 1c7bd06
1 parent f34eaca
commit 1c7bd06
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 9 deletions.
diff --git a/packages/ra-ui-materialui/src/list/ListView.tsx b/packages/ra-ui-materialui/src/list/ListView.tsx
@@ -15,7 +15,7 @@ import {
 
 import Title, { TitlePropType } from '../layout/Title';
 import ListToolbar from './ListToolbar';
-import DefaultPagination from './Pagination';
+import DefaultPagination from './pagination/Pagination';
 import BulkDeleteButton from '../button/BulkDeleteButton';
 import BulkActionsToolbar from './BulkActionsToolbar';
 import DefaultActions from './ListActions';

diff --git a/packages/ra-ui-materialui/src/list/index.js b/packages/ra-ui-materialui/src/list/index.js
@@ -5,16 +5,14 @@ import ListActions from './ListActions';
 import ListGuesser from './ListGuesser';
 import ListToolbar from './ListToolbar';
 import ListView from './ListView';
-import Pagination from './Pagination';
-import PaginationActions from './PaginationActions';
-import PaginationLimit from './PaginationLimit';
 import Placeholder from './Placeholder';
 import SimpleList from './SimpleList';
 import SimpleListLoading from './SimpleListLoading';
 import SingleFieldList from './SingleFieldList';
 
 export * from './filter';
 export * from './datagrid';
+export * from './pagination';
 
 export {
     BulkActionsToolbar,
@@ -24,9 +22,6 @@ export {
     ListActions,
     ListGuesser,
     ListToolbar,
-    Pagination,
-    PaginationActions,
-    PaginationLimit,
     Placeholder,
     SimpleList,
     SimpleListLoading,

diff --git a/...ui-materialui/src/list/Pagination.spec.js → ...i/src/list/pagination/Pagination.spec.tsx b/...ui-materialui/src/list/Pagination.spec.js → ...i/src/list/pagination/Pagination.spec.tsx
@@ -6,7 +6,7 @@ import { createMuiTheme } from '@material-ui/core/styles';
 import { ListPaginationContext } from 'ra-core';
 
 import Pagination from './Pagination';
-import DeviceTestWrapper from '../layout/DeviceTestWrapper';
+import DeviceTestWrapper from '../../layout/DeviceTestWrapper';
 
 const theme = createMuiTheme();
 
@@ -16,6 +16,8 @@ describe('<Pagination />', () => {
         page: 1,
         perPage: 10,
         setPage: () => null,
+        loading: false,
+        setPerPage: () => {},
     };
 
     afterEach(cleanup);
@@ -197,7 +199,7 @@ describe('<Pagination />', () => {
                             total: 15,
                         }}
                     >
-                        <Pagination width="md" />
+                        <Pagination />
                     </ListPaginationContext.Provider>
                 </DeviceTestWrapper>
             );

diff --git a/.../ra-ui-materialui/src/list/Pagination.tsx → ...rialui/src/list/pagination/Pagination.tsx b/.../ra-ui-materialui/src/list/Pagination.tsx → ...rialui/src/list/pagination/Pagination.tsx
diff --git a/...rialui/src/list/PaginationActions.spec.js → ...ist/pagination/PaginationActions.spec.tsx b/...rialui/src/list/PaginationActions.spec.js → ...ist/pagination/PaginationActions.spec.tsx
diff --git a/...-materialui/src/list/PaginationActions.js → ...src/list/pagination/PaginationActions.tsx b/...-materialui/src/list/PaginationActions.js → ...src/list/pagination/PaginationActions.tsx
diff --git a/...ui-materialui/src/list/PaginationLimit.js → ...i/src/list/pagination/PaginationLimit.tsx b/...ui-materialui/src/list/PaginationLimit.js → ...i/src/list/pagination/PaginationLimit.tsx
diff --git a/packages/ra-ui-materialui/src/list/pagination/index.ts b/packages/ra-ui-materialui/src/list/pagination/index.ts
@@ -0,0 +1,5 @@
+import Pagination from './Pagination';
+import PaginationActions from './PaginationActions';
+import PaginationLimit from './PaginationLimit';
+
+export { Pagination, PaginationActions, PaginationLimit };