@leapfrog/interactive-canvas 2.0.25-beta-9 → 2.0.25-beta-11

package/dist/abstract-interactive-canvas.d.ts

@@ -343,6 +343,7 @@ export declare abstract class AbstractInteractiveCanvas implements IInteractiveC
     private redrawScheduled;
     /**
      * Redraw the canvas.
+     * Uses requestAnimationFrame to batch multiple redraw calls into a single render.
      */
     redraw(): void;
     syncObjectList(): void;

package/dist/interactive-canvas.d.ts

@@ -20,7 +20,6 @@ export declare class InteractiveCanvas extends AbstractInteractiveCanvas {
      */
     redo(): Promise<void>;
     private onFabricSelectionChanged;
-    private enterTextSelectionModeIfRequired;
     private onTextEditing;
     private onDoubleClick;
 }

package/dist/interactive-canvas.es.js

@@ -310,7 +310,6 @@ class StackObjectsLayoutFunction {
         const footerObjects = objects[0];
         const bodyObjects = objects[1];
         const bodyWidth = canvasDimensions.widthPx - canvasMargin.right - canvasMargin.left;
-        // canvas.redraw();
         //Make one pass and set the widths of all elements. This will force objects with dynamic heights (like text) to take on their necessary height before trying to lay them out.
         this.applyWidths(allObjects, bodyWidth);
         const bodyRows = this.getRows(bodyObjects);
@@ -397,12 +396,11 @@ class StackObjectsLayoutFunction {
             object.setPosition({
                 width: actualWidth
             });
-            //object.updateDimensions();
-            _(objects).forEach((object) => {
-                if (object.getType() !== ObjectType.VERTICAL_RULE) {
-                    object.updateDimensions();
-                }
-            });
+        });
+        _(objects).forEach((object) => {
+            if (object.getType() !== ObjectType.VERTICAL_RULE) {
+                object.updateDimensions();
+            }
         });
     }
     adjustCanvasSize(canvas, requiredHeight) {
@@ -1069,7 +1067,8 @@ class AbstractCanvasObject {
             mt: options.allowScale,
             mr: options.allowScale,
             mb: options.allowScale,
-            mtr: options.allowRotate
+            mtr: options.allowRotate,
+            // dragControl: options.allowMove // Show drag control when movement is allowed
         });
     }
 }
@@ -1808,14 +1807,13 @@ class Text extends AbstractCanvasObject {
     constructor(canvas, fabricObject, persistedField) {
         super(ObjectType.TEXT, canvas, fabricObject, persistedField);
         this.notifyCanvasTimeout = null;
-        this.NOTIFY_DELAY_MS = 150;
+        this.NOTIFY_DELAY_MS = 150; // Debounce canvas notifications
         this.canvas = canvas;
         this.fontLibrary = canvas.getFontLibrary();
         this.baseComponentHeight = this.fabricObject.height;
         this.text$ = new BehaviorSubject(this.fabricObject.text);
         this.data.userText = this.fabricObject.text;
         this.textSelection$ = new BehaviorSubject(new TextSelection(this.fabricObject, this.fontLibrary));
-        //this.fabricObject.set({strokeWidth: 0});
         this.fabricObject.set({
             strokeWidth: 0,
             perPixelTargetFind: false // Disable per-pixel detection for this object
@@ -2453,6 +2451,7 @@ class Text extends AbstractCanvasObject {
                                     lockMovementY: true,
                                     hasControls: false,
                                     selectable: false,
+                                    // evented: false, // Don't capture mouse events - allows clicks to pass through to textbox
                                     originX: "left",
                                     originY: "top"
                                 });
@@ -2547,7 +2546,7 @@ class Text extends AbstractCanvasObject {
                     text: `${lineNumber}.`
                 });
             }
-            if (method === "fillText" && this.fabricObject.left <= 3) {
+            if (method === "fillText" && this.isOrderedList() && this.fabricObject.left <= 3) {
                 left = left + this.getOrderedListMargin();
             }
             this.fabricObject.dirty = true;
@@ -2559,12 +2558,16 @@ class Text extends AbstractCanvasObject {
      * @inheritDoc
      */
     updateFabricObjectBehavior() {
+        // DON'T call super.updateFabricObjectBehavior() for textboxes
+        // because it locks movement which interferes with text editing in Fabric v7
         super.updateFabricObjectBehavior();
         const profile = this.canvas.getProfile();
         const allowManualPositioning = !this.canvas.getLayoutManager().isEnforcedPositioning;
+        // For textboxes, we keep them moveable but hide all controls except drag control
+        // This allows text editing to work properly while still supporting drag via the icon
         this.fabricObject.set({
-            lockMovementX: false,
-            lockMovementY: false,
+            lockMovementX: false, // Allow dragging
+            lockMovementY: false, // Allow dragging
             lockScalingY: true,
             lockScalingX: this.isPinToBottom(),
             lockScalingFlip: true,
@@ -2583,13 +2586,14 @@ class Text extends AbstractCanvasObject {
             mt: false,
             mr: allowManualPositioning && profile.allowScale && !this.isPinToBottom(),
             mb: false,
-            mtr: false
+            mtr: false,
         });
         this.redraw();
     }
     onTextChange() {
         this.data.userText = this.fabricObject.text;
         this.text$.next(this.fabricObject.text);
+        // Only check width bounds if text is close to canvas edge (performance optimization)
         const currentLeft = this.fabricObject.left || 0;
         const canvasWidth = this.canvas.getDimensions().widthPx;
         // Skip expensive getBoundingBox if object is clearly within bounds
@@ -2813,7 +2817,7 @@ class AbstractInteractiveCanvas {
         this.fabricCanvas.stateful = true;
         this.fabricCanvas.preserveObjectStacking = true;
         this.fabricCanvas.perPixelTargetFind = true;
-        this.fabricCanvas.targetFindTolerance = 4;
+        this.fabricCanvas.targetFindTolerance = 4; // Reduced tolerance for more precise text selection
         this.setBackgroundColor("#FFFFFF");
     }
     /**
@@ -3117,7 +3121,6 @@ class AbstractInteractiveCanvas {
      */
     addImageObject(imageUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Don't let the image be more than half the canvas in size.
             const maxSizeScale = 2;
             const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
             const options = { crossOrigin: "anonymous" };
@@ -3129,7 +3132,6 @@ class AbstractInteractiveCanvas {
                 if (curWidth > maxWidth) {
                     newScale = maxWidth / curWidth;
                 }
-                // Set image properties and add to the canvas
                 const fabricImage = new this.fabric.Image(image, {
                     id: id,
                     scaleX: newScale,
@@ -3149,7 +3151,6 @@ class AbstractInteractiveCanvas {
                 return object;
             }
             else {
-                // Browser-side logic
                 return yield new Promise((resolve) => {
                     this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
                         const id = this.randomId();
@@ -3201,15 +3202,13 @@ class AbstractInteractiveCanvas {
                 fontFamily: profile.defaultFont,
                 textAlign: profile.defaultTextAlignment,
                 hoverCursor: "move",
-                moveCursor: 'move',
+                moveCursor: "move",
+                editable: false,
+                editingBorderColor: '#2196F3',
                 multiLine: true,
                 lineHeight: profile.defaultLineHeight,
                 charSpacing: profile.defaultCharacterSpacing,
-                perPixelTargetFind: false,
-                targetFindTolerance: 4,
                 splitByGrapheme: true,
-                editable: false, // Only enable on double-click
-                editingBorderColor: '#2196F3',
                 padding: 0,
                 cornerSize: 8,
                 touchCornerSize: 12
@@ -3659,6 +3658,7 @@ class AbstractInteractiveCanvas {
     }
     /**
      * Redraw the canvas.
+     * Uses requestAnimationFrame to batch multiple redraw calls into a single render.
      */
     redraw() {
         if (this.redrawScheduled) {
@@ -3794,7 +3794,6 @@ class AbstractInteractiveCanvas {
      * Update the actual dimensions of the canvas by multiplying the requested dimensions by the current zoom factor.
      */
     updateCanvasDimensions(dims, zoom) {
-        const oldWidth = this.fabricCanvas.getWidth();
         const width = dims.widthPx * zoom;
         const height = dims.heightPx * zoom;
         this.fabricCanvas.setZoom(zoom);
@@ -3802,34 +3801,6 @@ class AbstractInteractiveCanvas {
             width,
             height
         });
-        const scaleFactor = width / oldWidth;
-        const objects = this.fabricCanvas.getObjects();
-        objects.forEach((obj) => {
-            obj.set({
-                left: obj.left * scaleFactor,
-            });
-            if (obj.type === "textbox" || obj.type === "text") {
-                obj.set({
-                    scaleX: 1,
-                    scaleY: 1,
-                    width: obj.width * scaleFactor,
-                });
-            }
-            else if (obj.type === "border" || obj.type === "rect") {
-                obj.set({
-                    width: obj.width * scaleFactor,
-                    scaleX: 1,
-                    strokeUniform: true,
-                });
-            }
-            else {
-                obj.set({
-                    scaleX: obj.scaleX * scaleFactor,
-                });
-            }
-            obj.setCoords();
-        });
-        this.fabricCanvas.requestRenderAll();
     }
     onProfileChanged(profile) {
         this.setMultiSelect(profile.allowMultiSelect);
@@ -3984,7 +3955,6 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
         this.fabricCanvas.on("selection:created", (event) => this.onFabricSelectionChanged(event));
         this.fabricCanvas.on("selection:cleared", (event) => this.onFabricSelectionChanged(event));
         this.fabricCanvas.on("text:editing:entered", () => this.onTextEditing());
-        //this.fabricCanvas.on("text:editing:exited", () => this.onTextEditing());
         this.fabricCanvas.on("text:editing:exited", (event) => {
             this.onTextEditing();
             const target = event.target;
@@ -3993,8 +3963,6 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
             }
         });
         this.fabricCanvas.on("text:changed", () => this.onTextChange());
-        // Handle double-click on textbox to enter editing mode
-        // @ts-ignore
         this.fabricCanvas.on("mouse:dblclick", (event) => this.onDoubleClick(event));
     }
     /**
@@ -4029,29 +3997,20 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
             selection.setEvent(event);
         }
         this.selection$.next(selection);
-        this.enterTextSelectionModeIfRequired();
-    }
-    enterTextSelectionModeIfRequired() {
-        var _a, _b;
-        if (!this.profile$.value.enterTextEditImmediatelyOnSelect && !this.layoutManager$.value.enterTextEditImmediatelyOnSelect)
-            return;
-        if (((_b = (_a = this.selection$.value) === null || _a === void 0 ? void 0 : _a.objects[0]) === null || _b === void 0 ? void 0 : _b.getType()) !== ObjectType.TEXT)
-            return;
-        const text = this.selection$.value.objects[0];
-        text.enterEditing();
     }
     onTextEditing() {
         const selected = this.getFieldsByCanvasObject(this.fabricCanvas.getActiveObjects());
         this.selection$.next(new SelectionData(selected));
     }
     onDoubleClick(event) {
+        var _a, _b;
         const target = event.target;
         if (target && (target.type === 'textbox' || target.type === 'i-text')) {
-            if (!target.isEditing) {
+            const targetIText = target;
+            if (!targetIText.isEditing) {
                 target.set({ editable: true, hoverCursor: 'text' });
-                // target.enterEditing();
-                // target.hiddenTextarea?.focus();
-                this.enterTextSelectionModeIfRequired();
+                (_a = targetIText.enterEditing) === null || _a === void 0 ? void 0 : _a.call(targetIText);
+                (_b = targetIText.hiddenTextarea) === null || _b === void 0 ? void 0 : _b.focus();
             }
         }
     }

package/dist/interactive-canvas.js

@@ -331,7 +331,6 @@ class StackObjectsLayoutFunction {
         const footerObjects = objects[0];
         const bodyObjects = objects[1];
         const bodyWidth = canvasDimensions.widthPx - canvasMargin.right - canvasMargin.left;
-        // canvas.redraw();
         //Make one pass and set the widths of all elements. This will force objects with dynamic heights (like text) to take on their necessary height before trying to lay them out.
         this.applyWidths(allObjects, bodyWidth);
         const bodyRows = this.getRows(bodyObjects);
@@ -418,12 +417,11 @@ class StackObjectsLayoutFunction {
             object.setPosition({
                 width: actualWidth
             });
-            //object.updateDimensions();
-            _(objects).forEach((object) => {
-                if (object.getType() !== exports.ObjectType.VERTICAL_RULE) {
-                    object.updateDimensions();
-                }
-            });
+        });
+        _(objects).forEach((object) => {
+            if (object.getType() !== exports.ObjectType.VERTICAL_RULE) {
+                object.updateDimensions();
+            }
         });
     }
     adjustCanvasSize(canvas, requiredHeight) {
@@ -1090,7 +1088,8 @@ class AbstractCanvasObject {
             mt: options.allowScale,
             mr: options.allowScale,
             mb: options.allowScale,
-            mtr: options.allowRotate
+            mtr: options.allowRotate,
+            // dragControl: options.allowMove // Show drag control when movement is allowed
         });
     }
 }
@@ -1829,14 +1828,13 @@ class Text extends AbstractCanvasObject {
     constructor(canvas, fabricObject, persistedField) {
         super(exports.ObjectType.TEXT, canvas, fabricObject, persistedField);
         this.notifyCanvasTimeout = null;
-        this.NOTIFY_DELAY_MS = 150;
+        this.NOTIFY_DELAY_MS = 150; // Debounce canvas notifications
         this.canvas = canvas;
         this.fontLibrary = canvas.getFontLibrary();
         this.baseComponentHeight = this.fabricObject.height;
         this.text$ = new rxjs.BehaviorSubject(this.fabricObject.text);
         this.data.userText = this.fabricObject.text;
         this.textSelection$ = new rxjs.BehaviorSubject(new TextSelection(this.fabricObject, this.fontLibrary));
-        //this.fabricObject.set({strokeWidth: 0});
         this.fabricObject.set({
             strokeWidth: 0,
             perPixelTargetFind: false // Disable per-pixel detection for this object
@@ -2474,6 +2472,7 @@ class Text extends AbstractCanvasObject {
                                     lockMovementY: true,
                                     hasControls: false,
                                     selectable: false,
+                                    // evented: false, // Don't capture mouse events - allows clicks to pass through to textbox
                                     originX: "left",
                                     originY: "top"
                                 });
@@ -2568,7 +2567,7 @@ class Text extends AbstractCanvasObject {
                     text: `${lineNumber}.`
                 });
             }
-            if (method === "fillText" && this.fabricObject.left <= 3) {
+            if (method === "fillText" && this.isOrderedList() && this.fabricObject.left <= 3) {
                 left = left + this.getOrderedListMargin();
             }
             this.fabricObject.dirty = true;
@@ -2580,12 +2579,16 @@ class Text extends AbstractCanvasObject {
      * @inheritDoc
      */
     updateFabricObjectBehavior() {
+        // DON'T call super.updateFabricObjectBehavior() for textboxes
+        // because it locks movement which interferes with text editing in Fabric v7
         super.updateFabricObjectBehavior();
         const profile = this.canvas.getProfile();
         const allowManualPositioning = !this.canvas.getLayoutManager().isEnforcedPositioning;
+        // For textboxes, we keep them moveable but hide all controls except drag control
+        // This allows text editing to work properly while still supporting drag via the icon
         this.fabricObject.set({
-            lockMovementX: false,
-            lockMovementY: false,
+            lockMovementX: false, // Allow dragging
+            lockMovementY: false, // Allow dragging
             lockScalingY: true,
             lockScalingX: this.isPinToBottom(),
             lockScalingFlip: true,
@@ -2604,13 +2607,14 @@ class Text extends AbstractCanvasObject {
             mt: false,
             mr: allowManualPositioning && profile.allowScale && !this.isPinToBottom(),
             mb: false,
-            mtr: false
+            mtr: false,
         });
         this.redraw();
     }
     onTextChange() {
         this.data.userText = this.fabricObject.text;
         this.text$.next(this.fabricObject.text);
+        // Only check width bounds if text is close to canvas edge (performance optimization)
         const currentLeft = this.fabricObject.left || 0;
         const canvasWidth = this.canvas.getDimensions().widthPx;
         // Skip expensive getBoundingBox if object is clearly within bounds
@@ -2834,7 +2838,7 @@ class AbstractInteractiveCanvas {
         this.fabricCanvas.stateful = true;
         this.fabricCanvas.preserveObjectStacking = true;
         this.fabricCanvas.perPixelTargetFind = true;
-        this.fabricCanvas.targetFindTolerance = 4;
+        this.fabricCanvas.targetFindTolerance = 4; // Reduced tolerance for more precise text selection
         this.setBackgroundColor("#FFFFFF");
     }
     /**
@@ -3138,7 +3142,6 @@ class AbstractInteractiveCanvas {
      */
     addImageObject(imageUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Don't let the image be more than half the canvas in size.
             const maxSizeScale = 2;
             const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
             const options = { crossOrigin: "anonymous" };
@@ -3150,7 +3153,6 @@ class AbstractInteractiveCanvas {
                 if (curWidth > maxWidth) {
                     newScale = maxWidth / curWidth;
                 }
-                // Set image properties and add to the canvas
                 const fabricImage = new this.fabric.Image(image, {
                     id: id,
                     scaleX: newScale,
@@ -3170,7 +3172,6 @@ class AbstractInteractiveCanvas {
                 return object;
             }
             else {
-                // Browser-side logic
                 return yield new Promise((resolve) => {
                     this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
                         const id = this.randomId();
@@ -3222,15 +3223,13 @@ class AbstractInteractiveCanvas {
                 fontFamily: profile.defaultFont,
                 textAlign: profile.defaultTextAlignment,
                 hoverCursor: "move",
-                moveCursor: 'move',
+                moveCursor: "move",
+                editable: false,
+                editingBorderColor: '#2196F3',
                 multiLine: true,
                 lineHeight: profile.defaultLineHeight,
                 charSpacing: profile.defaultCharacterSpacing,
-                perPixelTargetFind: false,
-                targetFindTolerance: 4,
                 splitByGrapheme: true,
-                editable: false, // Only enable on double-click
-                editingBorderColor: '#2196F3',
                 padding: 0,
                 cornerSize: 8,
                 touchCornerSize: 12
@@ -3680,6 +3679,7 @@ class AbstractInteractiveCanvas {
     }
     /**
      * Redraw the canvas.
+     * Uses requestAnimationFrame to batch multiple redraw calls into a single render.
      */
     redraw() {
         if (this.redrawScheduled) {
@@ -3815,7 +3815,6 @@ class AbstractInteractiveCanvas {
      * Update the actual dimensions of the canvas by multiplying the requested dimensions by the current zoom factor.
      */
     updateCanvasDimensions(dims, zoom) {
-        const oldWidth = this.fabricCanvas.getWidth();
         const width = dims.widthPx * zoom;
         const height = dims.heightPx * zoom;
         this.fabricCanvas.setZoom(zoom);
@@ -3823,34 +3822,6 @@ class AbstractInteractiveCanvas {
             width,
             height
         });
-        const scaleFactor = width / oldWidth;
-        const objects = this.fabricCanvas.getObjects();
-        objects.forEach((obj) => {
-            obj.set({
-                left: obj.left * scaleFactor,
-            });
-            if (obj.type === "textbox" || obj.type === "text") {
-                obj.set({
-                    scaleX: 1,
-                    scaleY: 1,
-                    width: obj.width * scaleFactor,
-                });
-            }
-            else if (obj.type === "border" || obj.type === "rect") {
-                obj.set({
-                    width: obj.width * scaleFactor,
-                    scaleX: 1,
-                    strokeUniform: true,
-                });
-            }
-            else {
-                obj.set({
-                    scaleX: obj.scaleX * scaleFactor,
-                });
-            }
-            obj.setCoords();
-        });
-        this.fabricCanvas.requestRenderAll();
     }
     onProfileChanged(profile) {
         this.setMultiSelect(profile.allowMultiSelect);
@@ -4005,7 +3976,6 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
         this.fabricCanvas.on("selection:created", (event) => this.onFabricSelectionChanged(event));
         this.fabricCanvas.on("selection:cleared", (event) => this.onFabricSelectionChanged(event));
         this.fabricCanvas.on("text:editing:entered", () => this.onTextEditing());
-        //this.fabricCanvas.on("text:editing:exited", () => this.onTextEditing());
         this.fabricCanvas.on("text:editing:exited", (event) => {
             this.onTextEditing();
             const target = event.target;
@@ -4014,8 +3984,6 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
             }
         });
         this.fabricCanvas.on("text:changed", () => this.onTextChange());
-        // Handle double-click on textbox to enter editing mode
-        // @ts-ignore
         this.fabricCanvas.on("mouse:dblclick", (event) => this.onDoubleClick(event));
     }
     /**
@@ -4050,29 +4018,20 @@ class InteractiveCanvas extends AbstractInteractiveCanvas {
             selection.setEvent(event);
         }
         this.selection$.next(selection);
-        this.enterTextSelectionModeIfRequired();
-    }
-    enterTextSelectionModeIfRequired() {
-        var _a, _b;
-        if (!this.profile$.value.enterTextEditImmediatelyOnSelect && !this.layoutManager$.value.enterTextEditImmediatelyOnSelect)
-            return;
-        if (((_b = (_a = this.selection$.value) === null || _a === void 0 ? void 0 : _a.objects[0]) === null || _b === void 0 ? void 0 : _b.getType()) !== exports.ObjectType.TEXT)
-            return;
-        const text = this.selection$.value.objects[0];
-        text.enterEditing();
     }
     onTextEditing() {
         const selected = this.getFieldsByCanvasObject(this.fabricCanvas.getActiveObjects());
         this.selection$.next(new SelectionData(selected));
     }
     onDoubleClick(event) {
+        var _a, _b;
         const target = event.target;
         if (target && (target.type === 'textbox' || target.type === 'i-text')) {
-            if (!target.isEditing) {
+            const targetIText = target;
+            if (!targetIText.isEditing) {
                 target.set({ editable: true, hoverCursor: 'text' });
-                // target.enterEditing();
-                // target.hiddenTextarea?.focus();
-                this.enterTextSelectionModeIfRequired();
+                (_a = targetIText.enterEditing) === null || _a === void 0 ? void 0 : _a.call(targetIText);
+                (_b = targetIText.hiddenTextarea) === null || _b === void 0 ? void 0 : _b.focus();
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "2.0.25-beta-9",
+  "version": "2.0.25-beta-11",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"