PR Feedback

elastic · Jun 29, 2020 · bfd1c7e · bfd1c7e
1 parent 9299aab
commit bfd1c7e
Show file tree

Hide file tree

Showing 7 changed files with 614 additions and 41 deletions.
diff --git a/x-pack/plugins/canvas/public/components/paginate/index.tsx b/x-pack/plugins/canvas/public/components/paginate/index.tsx
@@ -6,27 +6,16 @@
 
 import React, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { Paginate as Component } from './paginate';
+import { Paginate as Component, PaginateProps, PaginateChildProps } from './paginate';
 
-interface InPaginateProps {
+export { PaginateProps, PaginateChildProps };
+export interface InPaginateProps {
   perPage?: number;
   startPage?: number;
   rows: any[];
   children: (props: PaginateChildProps) => React.ReactNode;
 }
 
-export type PaginateProps = Omit<InPaginateProps, 'startPage'> & {
-  pageNumber: number;
-  totalPages: number;
-  nextPageEnabled: boolean;
-  prevPageEnabled: boolean;
-  setPage: (num: number) => void;
-  nextPage: () => void;
-  prevPage: () => void;
-};
-
-export type PaginateChildProps = Omit<PaginateProps, 'children'>;
-
 export const Paginate: React.FunctionComponent<InPaginateProps> = ({
   perPage = 10,
   startPage = 0,

diff --git a/x-pack/plugins/canvas/public/components/paginate/paginate.tsx b/x-pack/plugins/canvas/public/components/paginate/paginate.tsx
@@ -6,24 +6,25 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { PaginateProps } from './';
+import { InPaginateProps } from './';
 
-export const Paginate: React.FunctionComponent<PaginateProps> = (props) => {
-  return (
-    <React.Fragment>
-      {props.children({
-        rows: props.rows,
-        perPage: props.perPage,
-        pageNumber: props.pageNumber,
-        totalPages: props.totalPages,
-        nextPageEnabled: props.nextPageEnabled,
-        prevPageEnabled: props.prevPageEnabled,
-        setPage: props.setPage,
-        nextPage: props.nextPage,
-        prevPage: props.prevPage,
-      })}
-    </React.Fragment>
-  );
+export type PaginateProps = Omit<InPaginateProps, 'startPage'> & {
+  pageNumber: number;
+  totalPages: number;
+  nextPageEnabled: boolean;
+  prevPageEnabled: boolean;
+  setPage: (num: number) => void;
+  nextPage: () => void;
+  prevPage: () => void;
+};
+
+export type PaginateChildProps = Omit<PaginateProps, 'children'>;
+
+export const Paginate: React.FunctionComponent<PaginateProps> = ({
+  children,
+  ...childrenProps
+}) => {
+  return <React.Fragment>{children(childrenProps)}</React.Fragment>;
 };
 
 Paginate.propTypes = {