@nypl/web-reader 4.3.4 → 4.3.5

package/dist/index.d.ts

@@ -423,14 +423,14 @@ declare type HTMLActiveReader = CommonReader & {
 };
 declare type ActiveReader = PDFActiveReader | HTMLActiveReader;
 declare type ReaderReturn = InactiveReader | LoadingReader | ActiveReader;
-declare type GetContent = (href: string) => Promise<string>;
+declare type GetContent<T extends string | Uint8Array> = (href: string, proxyUrl?: string) => Promise<T>;
 declare type ReaderManagerArguments = {
     headerLeft?: JSX.Element;
 };
-declare type UseWebReaderArguments = {
+declare type UseWebReaderArguments<T extends string | Uint8Array> = {
     webpubManifestUrl: string;
     proxyUrl?: string;
-    getContent?: GetContent;
+    getContent?: GetContent<T>;
     pdfWorkerSrc?: string;
     injectablesReflowable?: Injectable[];
     injectablesFixed?: Injectable[];
@@ -470,20 +470,23 @@ declare type UseWebReaderArguments = {
      */
     persistSettings?: boolean;
 };
-declare type ActiveReaderArguments = UseWebReaderArguments & {
+declare type ActiveReaderArguments<T extends string | Uint8Array> = UseWebReaderArguments<T> & {
     manifest: WebpubManifest;
 };
 declare type InactiveReaderArguments = undefined;
-declare type ReaderArguments = ActiveReaderArguments | InactiveReaderArguments;
 
 /**
  * The React hook that exposes the main API into the reader. It
  * will determine the type of the webpub, and then use the correct reader
  * for that type.
  */
-declare function useWebReader(args: UseWebReaderArguments): HTMLActiveReader | PDFActiveReader | LoadingReader;
+declare function useWebReader(args: UseWebReaderArguments<string | Uint8Array>): HTMLActiveReader | PDFActiveReader | LoadingReader;
 
-declare function useHtmlReader(args: ReaderArguments): ReaderReturn;
+declare type HtmlReaderArguments = ActiveReaderArguments<string> | InactiveReaderArguments;
+
+declare function useHtmlReader(args: HtmlReaderArguments): ReaderReturn;
+
+declare type PdfReaderArguments = ActiveReaderArguments<Uint8Array> | InactiveReaderArguments;
 
 /**
  * The PDF reader
@@ -494,7 +497,7 @@ declare function useHtmlReader(args: ReaderArguments): ReaderReturn;
  * @param args T
  * @returns
  */
-declare function usePdfReader(args: ReaderArguments): ReaderReturn;
+declare function usePdfReader(args: PdfReaderArguments): ReaderReturn;
 
 declare type Dict<T = any> = Record<string, T>;
 
@@ -526,7 +529,7 @@ declare function addTocToManifest(manifest: WebpubManifest, getResource: (url: s
 /**
  * The main React component export.
  */
-declare type WebReaderProps = UseWebReaderArguments & ReaderManagerArguments;
+declare type WebReaderProps = UseWebReaderArguments<string | Uint8Array> & ReaderManagerArguments;
 declare const WebReaderWithoutBoundary: FC<WebReaderProps>;
 declare const WebReader: FC<WebReaderProps>;
 

package/dist/index.js

@@ -6720,7 +6720,7 @@ var getResourceUrl = (index, readingOrder) => {
   }
   return readingOrder[index].href;
 };
-var loadResource = (resourceUrl, proxyUrl) => __async(void 0, null, function* () {
+var fetchAsUint8Array = (resourceUrl, proxyUrl) => __async(void 0, null, function* () {
   const url = proxyUrl ? `${proxyUrl}${encodeURIComponent(resourceUrl)}` : resourceUrl;
   const response = yield fetch(url, { mode: "cors" });
   const array = new Uint8Array(yield response.arrayBuffer());
@@ -6874,6 +6874,12 @@ function makePdfReducer(args) {
           // end of the PDF that was just parsed
           pageNumber: state2.pageNumber === -1 ? action.numPages : state2.pageNumber
         });
+      case "PDF_LOAD_ERROR":
+        return __spreadProps(__spreadValues({}, state2), {
+          state: "ERROR",
+          error: action.error,
+          settings: DEFAULT_SETTINGS
+        });
       case "SET_SCROLL":
         if (state2.state !== "ACTIVE") {
           return handleInvalidTransition(state2, action);
@@ -6929,7 +6935,7 @@ function usePdfReader(args) {
     webpubManifestUrl,
     manifest,
     proxyUrl,
-    getContent,
+    getContent = fetchAsUint8Array,
     injectablesReflowable,
     injectablesFixed,
     height = DEFAULT_HEIGHT,
@@ -6985,17 +6991,22 @@ function usePdfReader(args) {
     if (!manifest.readingOrder || !manifest.readingOrder.length) {
       throw new Error("Manifest has no Reading Order");
     }
-    const resourceUrl = getResourceUrl(
+    const currentResource = getResourceUrl(
       state2.resourceIndex,
       manifest.readingOrder
     );
-    loadResource(resourceUrl, proxyUrl).then((data) => {
-      dispatch({
-        type: "RESOURCE_FETCH_SUCCESS",
-        resource: { data }
+    const fetchResource = () => __async(this, null, function* () {
+      getContent(currentResource, proxyUrl).then((data) => {
+        dispatch({
+          type: "RESOURCE_FETCH_SUCCESS",
+          resource: { data }
+        });
       });
     });
-  }, [state2.resourceIndex, manifest, proxyUrl]);
+    if (manifest.readingOrder && manifest.readingOrder.length) {
+      fetchResource();
+    }
+  }, [state2.resourceIndex, manifest, proxyUrl, getContent]);
   const resizePage = React34.useCallback(
     (pdfWidth, pdfHeight, containerSize2) => {
       const wRatio = pdfWidth / containerSize2.width;
@@ -7084,12 +7095,20 @@ function usePdfReader(args) {
       state: null
     };
   }
+  if (state2.state === "ERROR")
+    throw state2.error;
   const onDocumentLoadSuccess = ({ numPages }) => {
     dispatch({
       type: "PDF_PARSED",
       numPages
     });
   };
+  const onDocumentLoadError = (error2) => {
+    dispatch({
+      type: "PDF_LOAD_ERROR",
+      error: error2
+    });
+  };
   function onRenderSuccess(page) {
     if (!page.height || !page.width)
       throw new Error(
@@ -7129,28 +7148,36 @@ function usePdfReader(args) {
               overflow-y: auto;
             }
           `),
-      /* @__PURE__ */ React34.createElement(import_react_pdf2.Document, { file: state2.resource, onLoadSuccess: onDocumentLoadSuccess }, isParsed && state2.numPages && /* @__PURE__ */ React34.createElement(React34.Fragment, null, state2.settings.isScrolling && Array.from(new Array(state2.numPages), (_, index) => /* @__PURE__ */ React34.createElement(
-        ScrollPage_default,
+      /* @__PURE__ */ React34.createElement(
+        import_react_pdf2.Document,
         {
-          key: `page_${index + 1}`,
-          width: containerSize.width,
-          placeholderHeight: state2.pdfHeight,
-          placeholderWidth: state2.pdfWidth,
-          scale: state2.scale,
-          pageNumber: index + 1,
-          onLoadSuccess: onRenderSuccess
-        }
-      )), !state2.settings.isScrolling && /* @__PURE__ */ React34.createElement(
-        ChakraPage_default,
-        {
-          pageNumber: state2.pageNumber,
-          onLoadSuccess: onRenderSuccess,
-          width: state2.pageWidth,
-          height: state2.pageHeight,
-          scale: state2.scale,
-          loading: /* @__PURE__ */ React34.createElement(React34.Fragment, null)
-        }
-      )))
+          file: state2.resource,
+          onLoadSuccess: onDocumentLoadSuccess,
+          onLoadError: onDocumentLoadError
+        },
+        isParsed && state2.numPages && /* @__PURE__ */ React34.createElement(React34.Fragment, null, state2.settings.isScrolling && Array.from(new Array(state2.numPages), (_, index) => /* @__PURE__ */ React34.createElement(
+          ScrollPage_default,
+          {
+            key: `page_${index + 1}`,
+            width: containerSize.width,
+            placeholderHeight: state2.pdfHeight,
+            placeholderWidth: state2.pdfWidth,
+            scale: state2.scale,
+            pageNumber: index + 1,
+            onLoadSuccess: onRenderSuccess
+          }
+        )), !state2.settings.isScrolling && /* @__PURE__ */ React34.createElement(
+          ChakraPage_default,
+          {
+            pageNumber: state2.pageNumber,
+            onLoadSuccess: onRenderSuccess,
+            width: state2.pageWidth,
+            height: state2.pageHeight,
+            scale: state2.scale,
+            loading: /* @__PURE__ */ React34.createElement(React34.Fragment, null)
+          }
+        ))
+      )
     ),
     state: state2,
     manifest,
@@ -8389,11 +8416,13 @@ function useWebReader(args) {
   const readerType = getReaderType(
     manifest ? manifest.metadata.conformsTo : null
   );
+  const getContentHtml = getContent;
+  const getContentPdf = getContent;
   const htmlReader = useHtmlReader(
     readerType === "HTML" && manifest ? {
       webpubManifestUrl,
       manifest,
-      getContent,
+      getContent: getContentHtml,
       injectablesReflowable,
       injectablesFixed,
       height,
@@ -8406,6 +8435,7 @@ function useWebReader(args) {
     readerType === "PDF" && manifest ? {
       webpubManifestUrl,
       manifest,
+      getContent: getContentPdf,
       proxyUrl,
       pdfWorkerSrc,
       height,