Improve type accuracy for eventProps

wojtekmaj · Apr 17, 2023 · f5a9fd6 · f5a9fd6
1 parent 9243e45
commit f5a9fd6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/src/Document.tsx b/src/Document.tsx
@@ -39,6 +39,7 @@ import { useResolver } from './shared/hooks';
 import { eventProps, isClassName, isFile, isRef } from './shared/propTypes';
 
 import type { PDFDocumentProxy } from 'pdfjs-dist';
+import type { allEvents } from 'make-event-props';
 import type {
   ClassName,
   ExternalLinkRel,
@@ -73,7 +74,15 @@ type OnSourceError = OnError;
 
 type OnSourceSuccess = () => void;
 
-type EventProps = ReturnType<typeof makeEventProps>;
+type AllEvents = (typeof allEvents)[number];
+
+type EventHandler = (event: unknown, ...args: unknown[]) => void;
+
+type Props = Record<string, unknown> & {
+  [K in AllEvents]?: EventHandler;
+};
+
+type EventProps = ReturnType<typeof makeEventProps<Props, PDFDocumentProxy>>;
 
 type DocumentProps = {
   children?: React.ReactNode;

diff --git a/src/Outline.tsx b/src/Outline.tsx
@@ -17,11 +17,20 @@ import { useResolver } from './shared/hooks';
 import { eventProps, isClassName, isPdf, isRef } from './shared/propTypes';
 
 import type { PDFDocumentProxy } from 'pdfjs-dist';
+import type { allEvents } from 'make-event-props';
 import type { OnItemClickArgs } from './shared/types';
 
 type PDFOutline = Awaited<ReturnType<PDFDocumentProxy['getOutline']>>;
 
-type EventProps = ReturnType<typeof makeEventProps>;
+type AllEvents = (typeof allEvents)[number];
+
+type EventHandler = (event: unknown, ...args: unknown[]) => void;
+
+type Props = Record<string, unknown> & {
+  [K in AllEvents]?: EventHandler;
+};
+
+type EventProps = ReturnType<typeof makeEventProps<Props, PDFOutline | null>>;
 
 type OutlineProps = {
   className?: string;

diff --git a/src/Page.tsx b/src/Page.tsx
@@ -31,6 +31,7 @@ import {
 } from './shared/propTypes';
 
 import type { PDFDocumentProxy, PDFPageProxy } from 'pdfjs-dist';
+import type { allEvents } from 'make-event-props';
 import type {
   CustomTextRenderer,
   NodeOrRenderer,
@@ -46,12 +47,21 @@ import type {
   OnRenderSuccess,
   OnRenderTextLayerError,
   OnRenderTextLayerSuccess,
+  PageCallback,
   RenderMode,
 } from './shared/types';
 
 const defaultScale = 1;
 
-type EventProps = ReturnType<typeof makeEventProps>;
+type AllEvents = (typeof allEvents)[number];
+
+type EventHandler = (event: unknown, ...args: unknown[]) => void;
+
+type Props = Record<string, unknown> & {
+  [K in AllEvents]?: EventHandler;
+};
+
+type EventProps = ReturnType<typeof makeEventProps<Props, PageCallback>>;
 
 type PageProps = {
   canvasBackground?: string;