Add missing type definitions to QueryProps

ryanhefner · May 6, 2019 · 010fefd · 010fefd
1 parent b489a31
commit 010fefd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/Query.js b/src/Query.js
@@ -245,20 +245,20 @@ Query.propTypes = {
   query: PropTypes.object,
   parser: PropTypes.func,
   skip: PropTypes.bool,
-  onRequest: PropTypes.func,
-  onLoad: PropTypes.func,
   onError: PropTypes.func,
+  onLoad: PropTypes.func,
+  onRequest: PropTypes.func,
 };
 
 Query.defaultProps = {
   children: ({data, error, loading}) => null,
   include: 10,
   query: {},
   skip: false,
-  parser: (data) => data,
-  onRequest: () => {},
-  onLoad: () => {},
+  parser: (data, props) => data,
   onError: () => {},
+  onLoad: () => {},
+  onRequest: () => {},
 };
 
 export default withContentful(Query);
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -112,12 +112,23 @@ export function getDisplayName(WrappedComponent: Component): string;
 
 export type ParserHandler = (data: any, props: any) => any;
 
+export interface QueryState {
+  loading: boolean;
+  data?: any;
+  error?: any;
+}
+
 export interface QueryProps {
-  parser?: ParserHandler;
-  id?: string;
   contentType?: string;
+  id?: string;
+  include?: number;
   locale?: string;
+  parser?: ParserHandler;
   query?: object;
+  skip?: boolean;
+  onError?: (state: QueryState) => void;
+  onLoad?: (state: QueryState) => void;
+  onRequest?: (state: QueryState) => void;
 }
 
 export class Query extends Component<QueryProps> {}