canvu-react 0.3.13 → 0.3.14

package/dist/react.cjs

@@ -956,10 +956,32 @@ async function runWithConcurrency(items, concurrency, execute) {
 async function loadPdfToStore(file, store, options) {
   const scale = options?.scale ?? 1.5;
   const pageConcurrency = options?.pageConcurrency ?? 2;
+  const storeThumbnails = options?.storeThumbnails ?? false;
   const pdfjs = await getPdfJs();
   const arrayBuffer = await file.arrayBuffer();
   const pdf = await pdfjs.getDocument({ data: arrayBuffer }).promise;
   const pageNumbers = normalizePdfPageNumbers(options?.pageNumbers, pdf.numPages);
+  const bufferedResults = /* @__PURE__ */ new Map();
+  let nextEmitIndex = 0;
+  let emitChain = Promise.resolve();
+  const queuePageEmission = async (pageResult) => {
+    bufferedResults.set(pageResult.pageNumber, pageResult);
+    const run = async () => {
+      while (nextEmitIndex < pageNumbers.length) {
+        const nextPageNumber = pageNumbers[nextEmitIndex];
+        if (nextPageNumber == null) break;
+        const bufferedResult = bufferedResults.get(nextPageNumber);
+        if (!bufferedResult) break;
+        bufferedResults.delete(nextPageNumber);
+        nextEmitIndex += 1;
+        await options?.onPageStored?.(bufferedResult);
+      }
+    };
+    const nextChain = emitChain.then(run, run);
+    emitChain = nextChain.catch(() => {
+    });
+    await nextChain;
+  };
   return await runWithConcurrency(
     pageNumbers,
     pageConcurrency,
@@ -969,27 +991,31 @@ async function loadPdfToStore(file, store, options) {
       const mime = "image/png";
       const pageBlob = await canvasToBlob2(canvas, mime);
       const blobId = await store.storeOriginal(pageBlob);
-      const thumbScale = Math.min(1, 256 / Math.max(width, height));
-      const tw = Math.max(1, Math.round(width * thumbScale));
-      const th = Math.max(1, Math.round(height * thumbScale));
-      const thumbCanvas = document.createElement("canvas");
-      thumbCanvas.width = tw;
-      thumbCanvas.height = th;
-      const tCtx = thumbCanvas.getContext("2d");
-      if (tCtx) {
-        tCtx.imageSmoothingEnabled = true;
-        tCtx.imageSmoothingQuality = "high";
-        tCtx.drawImage(canvas, 0, 0, tw, th);
-      }
-      const thumbBlob = await canvasToBlob2(thumbCanvas, mime);
-      const thumbnailBlobId = await store.storeThumbnail(thumbBlob);
-      return {
+      const thumbnailBlobId = storeThumbnails ? await (async () => {
+        const thumbScale = Math.min(1, 256 / Math.max(width, height));
+        const tw = Math.max(1, Math.round(width * thumbScale));
+        const th = Math.max(1, Math.round(height * thumbScale));
+        const thumbCanvas = document.createElement("canvas");
+        thumbCanvas.width = tw;
+        thumbCanvas.height = th;
+        const tCtx = thumbCanvas.getContext("2d");
+        if (tCtx) {
+          tCtx.imageSmoothingEnabled = true;
+          tCtx.imageSmoothingQuality = "high";
+          tCtx.drawImage(canvas, 0, 0, tw, th);
+        }
+        const thumbBlob = await canvasToBlob2(thumbCanvas, mime);
+        return await store.storeThumbnail(thumbBlob);
+      })() : "";
+      const pageResult = {
         blobId,
         thumbnailBlobId,
         width,
         height,
         pageNumber
       };
+      await queuePageEmission(pageResult);
+      return pageResult;
     }
   );
 }
@@ -1345,9 +1371,10 @@ async function ingestAssetFilesToSceneItems(options) {
     createId = createShapeId,
     gapWorld = 16,
     stepWorld = 48,
-    pdfScale = 1.5,
+    pdfScale = 1.15,
     pdfPageConcurrency = 2,
     decorateItem,
+    onItemsReady,
     onError
   } = options;
   const items = [];
@@ -1369,55 +1396,56 @@ async function ingestAssetFilesToSceneItems(options) {
     }
     try {
       if (kind === "pdf") {
-        const [uploadResult2, pages] = await Promise.all([
-          uploadAssetIfNeeded(assetStore, file, kind),
-          loadPdfToStore(file, imageStore, {
-            scale: pdfScale,
-            pageConcurrency: pdfPageConcurrency
-          })
-        ]);
-        for (const page of pages) {
-          const fullUrl2 = await createBlobUrlFromStore(imageStore, page.blobId);
-          const naturalTopY2 = worldCenter.y - page.height / 2;
-          const stackedTopY = occupiedBottomY == null ? naturalTopY2 : occupiedBottomY + gapWorld;
-          const bounds2 = {
-            x: worldCenter.x - page.width / 2,
-            y: Math.max(naturalTopY2, stackedTopY),
-            width: page.width,
-            height: page.height
-          };
-          const itemContext2 = {
-            file,
-            kind,
-            itemIndex: items.length,
-            pageNumber: page.pageNumber
-          };
-          const item2 = finalizeIngestedItem(
-            {
-              id: createId(),
-              x: bounds2.x,
-              y: bounds2.y,
-              bounds: { ...bounds2 },
-              toolKind: "image",
-              imageBlobId: page.blobId,
-              imageRasterHref: fullUrl2 ?? void 0,
-              imageIntrinsicSize: {
-                width: page.width,
-                height: page.height
+        const uploadResultPromise = uploadAssetIfNeeded(assetStore, file, kind);
+        await loadPdfToStore(file, imageStore, {
+          scale: pdfScale,
+          pageConcurrency: pdfPageConcurrency,
+          storeThumbnails: false,
+          onPageStored: async (page) => {
+            const uploadResult2 = await uploadResultPromise;
+            const fullUrl2 = await createBlobUrlFromStore(imageStore, page.blobId);
+            const naturalTopY2 = worldCenter.y - page.height / 2;
+            const stackedTopY = occupiedBottomY == null ? naturalTopY2 : occupiedBottomY + gapWorld;
+            const bounds2 = {
+              x: worldCenter.x - page.width / 2,
+              y: Math.max(naturalTopY2, stackedTopY),
+              width: page.width,
+              height: page.height
+            };
+            const itemContext2 = {
+              file,
+              kind,
+              itemIndex: items.length,
+              pageNumber: page.pageNumber
+            };
+            const item2 = finalizeIngestedItem(
+              {
+                id: createId(),
+                x: bounds2.x,
+                y: bounds2.y,
+                bounds: { ...bounds2 },
+                toolKind: "image",
+                imageBlobId: page.blobId,
+                imageRasterHref: fullUrl2 ?? void 0,
+                imageIntrinsicSize: {
+                  width: page.width,
+                  height: page.height
+                },
+                childrenSvg: fullUrl2 ? buildRasterImageChildrenSvg(
+                  fullUrl2,
+                  { width: page.width, height: page.height },
+                  bounds2
+                ) : ""
               },
-              childrenSvg: fullUrl2 ? buildRasterImageChildrenSvg(
-                fullUrl2,
-                { width: page.width, height: page.height },
-                bounds2
-              ) : ""
-            },
-            itemContext2,
-            uploadResult2,
-            decorateItem
-          );
-          items.push(item2);
-          occupiedBottomY = bounds2.y + page.height;
-        }
+              itemContext2,
+              uploadResult2,
+              decorateItem
+            );
+            items.push(item2);
+            occupiedBottomY = bounds2.y + page.height;
+            onItemsReady?.([item2], { file, kind });
+          }
+        });
         hasImagePlacementBase = false;
         imagePlacementIndex = 0;
         imageYOffsetAdjustment = 0;
@@ -1470,6 +1498,7 @@ async function ingestAssetFilesToSceneItems(options) {
         decorateItem
       );
       items.push(item);
+      onItemsReady?.([item], { file, kind });
       imagePlacementIndex++;
       occupiedBottomY = occupiedBottomY == null ? bounds.y + height : Math.max(occupiedBottomY, bounds.y + height);
     } catch (error) {
@@ -7382,7 +7411,13 @@ var VectorViewport = react.forwardRef(
               y: worldY
             },
             imageStore: store,
-            assetStore: assetStoreRef.current ?? void 0
+            assetStore: assetStoreRef.current ?? void 0,
+            onItemsReady: (nextItems) => {
+              if (nextItems.length === 0) return;
+              setLoadingSkeletons([]);
+              change([...itemsRef.current, ...nextItems]);
+              setEffectiveSelectedIdsRef.current(nextItems.map((item) => item.id));
+            }
           });
           if (result.errors.length > 0) {
             for (const error of result.errors) {
@@ -7390,8 +7425,6 @@ var VectorViewport = react.forwardRef(
             }
           }
           if (result.items.length === 0) return;
-          change([...itemsRef.current, ...result.items]);
-          setEffectiveSelectedIdsRef.current(result.items.map((item) => item.id));
         } finally {
           setLoadingSkeletons([]);
         }