canvu-react 0.3.14 → 0.3.16

package/dist/react.d.cts

@@ -68,6 +68,7 @@ type IngestAssetFileError = {
  */
 type IngestAssetFilesToSceneItemsOptions = {
     files: readonly File[];
+    existingItems?: readonly VectorSceneItem[];
     worldCenter: {
         x: number;
         y: number;

package/dist/react.d.ts

@@ -68,6 +68,7 @@ type IngestAssetFileError = {
  */
 type IngestAssetFilesToSceneItemsOptions = {
     files: readonly File[];
+    existingItems?: readonly VectorSceneItem[];
     worldCenter: {
         x: number;
         y: number;

package/dist/react.js

@@ -1358,12 +1358,12 @@ async function uploadAssetIfNeeded(assetStore, file, kind) {
 async function ingestAssetFilesToSceneItems(options) {
   const {
     files,
+    existingItems = [],
     worldCenter,
     assetStore,
     imageStore = new IndexedDbImageStore(),
     createId = createShapeId,
     gapWorld = 16,
-    stepWorld = 48,
     pdfScale = 1.15,
     pdfPageConcurrency = 2,
     decorateItem,
@@ -1372,10 +1372,7 @@ async function ingestAssetFilesToSceneItems(options) {
   } = options;
   const items = [];
   const errors = [];
-  let imagePlacementIndex = 0;
-  let occupiedBottomY = null;
-  let imageYOffsetAdjustment = 0;
-  let hasImagePlacementBase = false;
+  let occupiedBottomY = existingItems.length > 0 ? Math.max(...existingItems.map((item) => item.bounds.y + item.bounds.height)) : null;
   for (const file of files) {
     const kind = getAssetKindForFile(file);
     if (!kind) {
@@ -1398,10 +1395,10 @@ async function ingestAssetFilesToSceneItems(options) {
             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 stackedTopY2 = occupiedBottomY == null ? naturalTopY2 : occupiedBottomY + gapWorld;
             const bounds2 = {
               x: worldCenter.x - page.width / 2,
-              y: Math.max(naturalTopY2, stackedTopY),
+              y: Math.max(naturalTopY2, stackedTopY2),
               width: page.width,
               height: page.height
             };
@@ -1439,9 +1436,6 @@ async function ingestAssetFilesToSceneItems(options) {
             onItemsReady?.([item2], { file, kind });
           }
         });
-        hasImagePlacementBase = false;
-        imagePlacementIndex = 0;
-        imageYOffsetAdjustment = 0;
         continue;
       }
       const [uploadResult, storedImage] = await Promise.all([
@@ -1452,17 +1446,11 @@ async function ingestAssetFilesToSceneItems(options) {
       const fullUrl = await createBlobUrlFromStore(imageStore, blobId);
       const thumbBlob = await imageStore.getThumbnail(thumbnailBlobId);
       const thumbnailHref = thumbBlob ? URL.createObjectURL(thumbBlob) : null;
-      const ox = imagePlacementIndex % 8 * stepWorld;
-      const oy = Math.floor(imagePlacementIndex / 8) * stepWorld;
-      const naturalTopY = worldCenter.y - height / 2 + oy;
-      if (!hasImagePlacementBase) {
-        const minimumTopY = occupiedBottomY == null ? naturalTopY : occupiedBottomY + gapWorld;
-        imageYOffsetAdjustment = Math.max(0, minimumTopY - naturalTopY);
-        hasImagePlacementBase = true;
-      }
+      const naturalTopY = worldCenter.y - height / 2;
+      const stackedTopY = occupiedBottomY == null ? naturalTopY : occupiedBottomY + gapWorld;
       const bounds = {
-        x: worldCenter.x - width / 2 + ox,
-        y: naturalTopY + imageYOffsetAdjustment,
+        x: worldCenter.x - width / 2,
+        y: Math.max(naturalTopY, stackedTopY),
         width,
         height
       };
@@ -1492,7 +1480,6 @@ async function ingestAssetFilesToSceneItems(options) {
       );
       items.push(item);
       onItemsReady?.([item], { file, kind });
-      imagePlacementIndex++;
       occupiedBottomY = occupiedBottomY == null ? bounds.y + height : Math.max(occupiedBottomY, bounds.y + height);
     } catch (error) {
       const fileError = {
@@ -6003,7 +5990,7 @@ body[data-canvu-pen-active="true"] [data-slot="shape-context-menu"] * {
 }
 `;
 function debugApplePencilPointer(phase, detail) {
-  console.debug(`[canvu][apple-pencil] ${phase}`, detail);
+  return;
 }
 var MARKER_TOOL_STYLE = {
   stroke: "#fde047",
@@ -6603,7 +6590,6 @@ var VectorViewport = forwardRef(
     const captureInteractionPointer = useCallback(
       (target, pointerId, options) => {
         const captureNativePointer = options?.captureNativePointer ?? true;
-        debugApplePencilPointer("capture", { pointerId, captureNativePointer });
         activeInteractionPointerIdRef.current = pointerId;
         activeInteractionPointerTargetRef.current = captureNativePointer ? target : null;
         if (captureNativePointer) {
@@ -6615,7 +6601,6 @@ var VectorViewport = forwardRef(
     const releaseInteractionPointer = useCallback(() => {
       const pointerId = activeInteractionPointerIdRef.current;
       const target = activeInteractionPointerTargetRef.current;
-      debugApplePencilPointer("release", { pointerId });
       if (pointerId != null && target) {
         try {
           if (target.hasPointerCapture(pointerId)) {
@@ -6648,8 +6633,6 @@ var VectorViewport = forwardRef(
         const itemId = strokeState.itemId;
         const style = { ...strokeStyleRef.current };
         debugApplePencilPointer("finalize-stroke", {
-          pointerType,
-          tool,
           points: pts.length
         });
         dragStateRef.current = { kind: "idle" };
@@ -7399,6 +7382,7 @@ var VectorViewport = forwardRef(
           }
           const result = await ingestAssetFilesToSceneItems({
             files,
+            existingItems: itemsRef.current,
             worldCenter: {
               x: worldX,
               y: worldY
@@ -7426,12 +7410,12 @@ var VectorViewport = forwardRef(
     );
     const handleImageFileChange = useCallback(
       async (e) => {
-        const file = e.target.files?.[0];
+        const files = e.target.files ? Array.from(e.target.files) : [];
         e.target.value = "";
         const pending = pendingImagePlacementRef.current;
         pendingImagePlacementRef.current = null;
-        if (!file || !pending) return;
-        await placeImageFilesAtWorld([file], pending.worldX, pending.worldY);
+        if (files.length === 0 || !pending) return;
+        await placeImageFilesAtWorld(files, pending.worldX, pending.worldY);
       },
       [placeImageFilesAtWorld]
     );
@@ -7527,14 +7511,12 @@ var VectorViewport = forwardRef(
             pointerType: e.pointerType,
             pointerId: e.pointerId,
             pressure: e.pointerType === "pen" ? e.pressure : void 0,
-            activePointerId,
             dragKind: currentDragState.kind
           });
         }
         if (e.pointerType === "pen" && currentDragState.kind === "stroke" && currentDragState.pointerType === "pen") {
           debugApplePencilPointer("pen-reentry", {
             pointerId: e.pointerId,
-            previousPointerId: activePointerId,
             previousPoints: currentDragState.points.length
           });
           finalizeStrokeDragState(currentDragState);
@@ -7880,9 +7862,7 @@ var VectorViewport = forwardRef(
         debugApplePencilPointer("native-pointerdown", {
           pointerType: e.pointerType,
           pointerId: e.pointerId,
-          pressure: e.pressure,
-          tool
-        });
+          pressure: e.pressure});
         e.preventDefault();
         e.stopImmediatePropagation();
       };
@@ -7982,9 +7962,7 @@ var VectorViewport = forwardRef(
         debugApplePencilPointer("touchstart-stroke", {
           touchId: touch.identifier,
           touchType: touchKind(touch),
-          force: touchPressure(touch),
-          tool
-        });
+          force: touchPressure(touch)});
         stopTouchEvent(ev);
       };
       const onTouchMove = (ev) => {
@@ -8706,6 +8684,7 @@ var VectorViewport = forwardRef(
             {
               ref: imageInputRef,
               type: "file",
+              multiple: true,
               accept: "image/*,application/pdf",
               style: { display: "none" },
               "aria-label": "Select image or PDF to place on canvas",