@leapfrog/interactive-canvas 1.4.0 → 1.4.2

package/dist/interactive-canvas.es.js

@@ -385,7 +385,6 @@ var UpdateObjectDimensionsLayoutFunction = /** @class */ (function () {
 }());
 
 var MIN_MAGNITUDE = 1;
-var BULLET_MARGIN = 15;
 var StackObjectsLayoutFunction = /** @class */ (function () {
     function StackObjectsLayoutFunction() {
     }
@@ -450,7 +449,7 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
                 var objectMargin = oc(object.getMargin()).left(0);
                 var objectLeft = canvasMargin.left + columnOffset + objectMargin;
                 if (object.getType() === ObjectType.TEXT && object.isBulleted())
-                    objectLeft += BULLET_MARGIN;
+                    objectLeft += object.getBulletMargin();
                 if (object.getType() === ObjectType.VERTICAL_RULE)
                     object.setPosition({ height: row.height });
                 object.setPosition({
@@ -475,7 +474,7 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
             if (object.getType() === ObjectType.VERTICAL_RULE)
                 return;
             if (object.getType() === ObjectType.TEXT && object.isBulleted())
-                actualWidth -= BULLET_MARGIN;
+                actualWidth -= object.getBulletMargin();
             object.setPosition({
                 width: actualWidth
             });
@@ -1951,6 +1950,20 @@ var Text = /** @class */ (function (_super) {
     Text.prototype.getPrefillType = function () {
         return this.data.prefillType;
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.getBulletMargin = function () {
+        var _this = this;
+        if (!this.isBulleted())
+            return 0;
+        var fontSize = 0;
+        each(this.fabricObject._textLines, function (textLine, lineIndex) {
+            fontSize = Math.max(fontSize, _this.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
+        });
+        return fontSize * 0.6;
+    };
     /**
      * @override
      * @inheritDoc
@@ -2532,6 +2545,12 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
      */
     AbstractInteractiveCanvas.prototype.setDimensionRestrictions = function (restrictions) {
         this.dimensionRestrictions$.next(restrictions);
+        var dimensions = this.getDimensions();
+        if (this.dimensionsExceedRestrictions(dimensions)) {
+            var newDimensions = dimensions
+                .withSize(Math.min(Math.max(oc(restrictions).width.min(dimensions.width), dimensions.width), Math.max(oc(restrictions).width.max(dimensions.width))), Math.min(Math.max(oc(restrictions).height.min(dimensions.height), dimensions.height), Math.max(oc(restrictions).height.max(dimensions.height))));
+            this.setBaseDimensions(newDimensions);
+        }
     };
     AbstractInteractiveCanvas.prototype.getMargin = function () {
         var borderWidth = this.getObjectsByTypeInternal(ObjectType.BORDER)

package/dist/interactive-canvas.js

@@ -387,7 +387,6 @@ var UpdateObjectDimensionsLayoutFunction = /** @class */ (function () {
 }());
 
 var MIN_MAGNITUDE = 1;
-var BULLET_MARGIN = 15;
 var StackObjectsLayoutFunction = /** @class */ (function () {
     function StackObjectsLayoutFunction() {
     }
@@ -452,7 +451,7 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
                 var objectMargin = tsOptchain.oc(object.getMargin()).left(0);
                 var objectLeft = canvasMargin.left + columnOffset + objectMargin;
                 if (object.getType() === exports.ObjectType.TEXT && object.isBulleted())
-                    objectLeft += BULLET_MARGIN;
+                    objectLeft += object.getBulletMargin();
                 if (object.getType() === exports.ObjectType.VERTICAL_RULE)
                     object.setPosition({ height: row.height });
                 object.setPosition({
@@ -477,7 +476,7 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
             if (object.getType() === exports.ObjectType.VERTICAL_RULE)
                 return;
             if (object.getType() === exports.ObjectType.TEXT && object.isBulleted())
-                actualWidth -= BULLET_MARGIN;
+                actualWidth -= object.getBulletMargin();
             object.setPosition({
                 width: actualWidth
             });
@@ -1953,6 +1952,20 @@ var Text = /** @class */ (function (_super) {
     Text.prototype.getPrefillType = function () {
         return this.data.prefillType;
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.getBulletMargin = function () {
+        var _this = this;
+        if (!this.isBulleted())
+            return 0;
+        var fontSize = 0;
+        _.each(this.fabricObject._textLines, function (textLine, lineIndex) {
+            fontSize = Math.max(fontSize, _this.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
+        });
+        return fontSize * 0.6;
+    };
     /**
      * @override
      * @inheritDoc
@@ -2532,6 +2545,12 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
      */
     AbstractInteractiveCanvas.prototype.setDimensionRestrictions = function (restrictions) {
         this.dimensionRestrictions$.next(restrictions);
+        var dimensions = this.getDimensions();
+        if (this.dimensionsExceedRestrictions(dimensions)) {
+            var newDimensions = dimensions
+                .withSize(Math.min(Math.max(tsOptchain.oc(restrictions).width.min(dimensions.width), dimensions.width), Math.max(tsOptchain.oc(restrictions).width.max(dimensions.width))), Math.min(Math.max(tsOptchain.oc(restrictions).height.min(dimensions.height), dimensions.height), Math.max(tsOptchain.oc(restrictions).height.max(dimensions.height))));
+            this.setBaseDimensions(newDimensions);
+        }
     };
     AbstractInteractiveCanvas.prototype.getMargin = function () {
         var borderWidth = this.getObjectsByTypeInternal(exports.ObjectType.BORDER)

package/dist/object/impl/text.d.ts

@@ -40,6 +40,10 @@ export interface IText extends ICanvasObject, IMutableColor, IMutableText, IMuta
      * Get the prefill type used for this text field.
      */
     getPrefillType(): string;
+    /**
+     * Return the margin needed for bullets on this object.
+     */
+    getBulletMargin(): number;
 }
 export declare class Text extends AbstractCanvasObject<fabric.Textbox> implements IText {
     private readonly fontLibrary;
@@ -197,6 +201,11 @@ export declare class Text extends AbstractCanvasObject<fabric.Textbox> implement
      * @inheritDoc
      */
     getPrefillType(): string;
+    /**
+     * @override
+     * @inheritDoc
+     */
+    getBulletMargin(): number;
     /**
      * @override
      * @inheritDoc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"