@leapfrog/interactive-canvas 1.14.0-beta.1 → 1.14.1

package/dist/interactive-canvas.es.js

@@ -489,6 +489,8 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
                 return;
             if (object.getType() === ObjectType.TEXT && object.isBulleted())
                 actualWidth -= object.getBulletMargin();
+            if (object.getType() === ObjectType.TEXT && object.isOrderedList())
+                actualWidth -= object.getOrderedListMargin();
             object.setPosition({
                 width: actualWidth
             });
@@ -1893,18 +1895,18 @@ var RichText = /** @class */ (function (_super) {
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text(canvas, fabricObject, persistedField) {
-        var _this = _super.call(this, ObjectType.TEXT, canvas, fabricObject, persistedField) || this;
-        _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.on("changed", function () { return _this.onTextChange(); });
-        _this.fabricObject.on("selection:changed", function () { return _this.onSelectionChange(); });
-        _this.applyBulletListMonkeyPatches();
-        return _this;
+        var _this_1 = _super.call(this, ObjectType.TEXT, canvas, fabricObject, persistedField) || this;
+        _this_1.canvas = canvas;
+        _this_1.fontLibrary = canvas.getFontLibrary();
+        _this_1.baseComponentHeight = _this_1.fabricObject.height;
+        _this_1.text$ = new BehaviorSubject(_this_1.fabricObject.text);
+        _this_1.data.userText = _this_1.fabricObject.text;
+        _this_1.textSelection$ = new BehaviorSubject(new TextSelection(_this_1.fabricObject, _this_1.fontLibrary));
+        _this_1.fabricObject.set({ strokeWidth: 0 });
+        _this_1.fabricObject.on("changed", function () { return _this_1.onTextChange(); });
+        _this_1.fabricObject.on("selection:changed", function () { return _this_1.onSelectionChange(); });
+        _this_1.applyBulletListMonkeyPatches();
+        return _this_1;
     }
     /**
      * @override
@@ -2235,12 +2237,12 @@ var Text = /** @class */ (function (_super) {
      * @inheritDoc
      */
     Text.prototype.getBulletMargin = function () {
-        var _this = this;
+        var _this_1 = 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"));
+            fontSize = Math.max(fontSize, _this_1.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
         });
         return fontSize * 0.6;
     };
@@ -2249,12 +2251,12 @@ var Text = /** @class */ (function (_super) {
      * @inheritDoc
      */
     Text.prototype.getOrderedListMargin = function () {
-        var _this = this;
+        var _this_1 = this;
         if (!this.isOrderedList())
             return 0;
         var fontSize = 0;
         each(this.fabricObject._textLines, function (textLine, lineIndex) {
-            fontSize = Math.max(fontSize, _this.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
+            fontSize = Math.max(fontSize, _this_1.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
         });
         return fontSize * 1.5;
     };
@@ -2363,28 +2365,44 @@ var Text = /** @class */ (function (_super) {
         this.notifyCanvasOfTextChanges();
         this.redraw();
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.setOrderedListStart = function (start) {
+        this.fabricObject.orderedListIndex = start;
+        this.redraw();
+    };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.getOrderedListStart = function () {
+        return this.fabricObject.orderedListIndex || 1;
+    };
     Text.prototype.getSizeIncreaseSinceCreation = function () {
         return Math.max(0, this.fabricObject.height - this.baseComponentHeight);
     };
     Text.prototype.removeBullets = function () {
-        var _this = this;
+        var _this_1 = this;
         if (this.data.bulleted) {
             var bullets = this.fabricObject["_bullets"];
             delete this.fabricObject["_bullets"];
-            each(bullets, function (bullet) { return _this.canvas.removeFabricObject(bullet); });
+            each(bullets, function (bullet) { return _this_1.canvas.removeFabricObject(bullet); });
             this.fabricObject["objectCaching"] = true;
         }
     };
     Text.prototype.removeOrderedList = function () {
-        var _this = this;
+        var _this_1 = this;
         if (this.fabricObject.orderedList) {
             var lineNumbers = this.fabricObject["_currentLineNumbers"];
             delete this.fabricObject["_currentLineNumbers"];
-            each(lineNumbers, function (lineNumber) { return _this.canvas.removeFabricObject(lineNumber); });
+            each(lineNumbers, function (lineNumber) { return _this_1.canvas.removeFabricObject(lineNumber); });
             this.fabricObject["objectCaching"] = true;
         }
     };
     Text.prototype.applyBulletListMonkeyPatches = function () {
+        var _this = this;
         if (this.data.bulleted)
             this.enableBullets();
         if (this.fabricObject.orderedList)
@@ -2542,7 +2560,7 @@ var Text = /** @class */ (function (_super) {
                 var yShift = (fabricText.height / 2) + top - fontSize - 1;
                 var xOffset = (xShift * Math.cos(theta)) - (yShift * Math.sin(theta));
                 var yOffset = (xShift * Math.sin(theta)) + (yShift * Math.cos(theta));
-                var lineNumber = 1;
+                var lineNumber = _this.getOrderedListStart();
                 for (var i = 0; i < lineIndex; i++) {
                     if (currentLineNumbers[i])
                         lineNumber++;
@@ -3460,7 +3478,7 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
         var objects = _(this.objects$.value)
             .map(function (x) { return x.persist(); })
             .value();
-        var includedProperties = ["id", "orderedList"];
+        var includedProperties = ["id", "orderedList", "orderedListIndex"];
         var json = this.fabricCanvas.toJSON(includedProperties);
         return {
             dimensions: this.dimensions$.value,

package/dist/interactive-canvas.js

@@ -491,6 +491,8 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
                 return;
             if (object.getType() === exports.ObjectType.TEXT && object.isBulleted())
                 actualWidth -= object.getBulletMargin();
+            if (object.getType() === exports.ObjectType.TEXT && object.isOrderedList())
+                actualWidth -= object.getOrderedListMargin();
             object.setPosition({
                 width: actualWidth
             });
@@ -1895,18 +1897,18 @@ var RichText = /** @class */ (function (_super) {
 var Text = /** @class */ (function (_super) {
     __extends(Text, _super);
     function Text(canvas, fabricObject, persistedField) {
-        var _this = _super.call(this, exports.ObjectType.TEXT, canvas, fabricObject, persistedField) || this;
-        _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.on("changed", function () { return _this.onTextChange(); });
-        _this.fabricObject.on("selection:changed", function () { return _this.onSelectionChange(); });
-        _this.applyBulletListMonkeyPatches();
-        return _this;
+        var _this_1 = _super.call(this, exports.ObjectType.TEXT, canvas, fabricObject, persistedField) || this;
+        _this_1.canvas = canvas;
+        _this_1.fontLibrary = canvas.getFontLibrary();
+        _this_1.baseComponentHeight = _this_1.fabricObject.height;
+        _this_1.text$ = new rxjs.BehaviorSubject(_this_1.fabricObject.text);
+        _this_1.data.userText = _this_1.fabricObject.text;
+        _this_1.textSelection$ = new rxjs.BehaviorSubject(new TextSelection(_this_1.fabricObject, _this_1.fontLibrary));
+        _this_1.fabricObject.set({ strokeWidth: 0 });
+        _this_1.fabricObject.on("changed", function () { return _this_1.onTextChange(); });
+        _this_1.fabricObject.on("selection:changed", function () { return _this_1.onSelectionChange(); });
+        _this_1.applyBulletListMonkeyPatches();
+        return _this_1;
     }
     /**
      * @override
@@ -2237,12 +2239,12 @@ var Text = /** @class */ (function (_super) {
      * @inheritDoc
      */
     Text.prototype.getBulletMargin = function () {
-        var _this = this;
+        var _this_1 = 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"));
+            fontSize = Math.max(fontSize, _this_1.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
         });
         return fontSize * 0.6;
     };
@@ -2251,12 +2253,12 @@ var Text = /** @class */ (function (_super) {
      * @inheritDoc
      */
     Text.prototype.getOrderedListMargin = function () {
-        var _this = this;
+        var _this_1 = this;
         if (!this.isOrderedList())
             return 0;
         var fontSize = 0;
         _.each(this.fabricObject._textLines, function (textLine, lineIndex) {
-            fontSize = Math.max(fontSize, _this.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
+            fontSize = Math.max(fontSize, _this_1.fabricObject.getValueOfPropertyAt(lineIndex, 0, "fontSize"));
         });
         return fontSize * 1.5;
     };
@@ -2365,28 +2367,44 @@ var Text = /** @class */ (function (_super) {
         this.notifyCanvasOfTextChanges();
         this.redraw();
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.setOrderedListStart = function (start) {
+        this.fabricObject.orderedListIndex = start;
+        this.redraw();
+    };
+    /**
+     * @override
+     * @inheritDoc
+     */
+    Text.prototype.getOrderedListStart = function () {
+        return this.fabricObject.orderedListIndex || 1;
+    };
     Text.prototype.getSizeIncreaseSinceCreation = function () {
         return Math.max(0, this.fabricObject.height - this.baseComponentHeight);
     };
     Text.prototype.removeBullets = function () {
-        var _this = this;
+        var _this_1 = this;
         if (this.data.bulleted) {
             var bullets = this.fabricObject["_bullets"];
             delete this.fabricObject["_bullets"];
-            _.each(bullets, function (bullet) { return _this.canvas.removeFabricObject(bullet); });
+            _.each(bullets, function (bullet) { return _this_1.canvas.removeFabricObject(bullet); });
             this.fabricObject["objectCaching"] = true;
         }
     };
     Text.prototype.removeOrderedList = function () {
-        var _this = this;
+        var _this_1 = this;
         if (this.fabricObject.orderedList) {
             var lineNumbers = this.fabricObject["_currentLineNumbers"];
             delete this.fabricObject["_currentLineNumbers"];
-            _.each(lineNumbers, function (lineNumber) { return _this.canvas.removeFabricObject(lineNumber); });
+            _.each(lineNumbers, function (lineNumber) { return _this_1.canvas.removeFabricObject(lineNumber); });
             this.fabricObject["objectCaching"] = true;
         }
     };
     Text.prototype.applyBulletListMonkeyPatches = function () {
+        var _this = this;
         if (this.data.bulleted)
             this.enableBullets();
         if (this.fabricObject.orderedList)
@@ -2544,7 +2562,7 @@ var Text = /** @class */ (function (_super) {
                 var yShift = (fabricText.height / 2) + top - fontSize - 1;
                 var xOffset = (xShift * Math.cos(theta)) - (yShift * Math.sin(theta));
                 var yOffset = (xShift * Math.sin(theta)) + (yShift * Math.cos(theta));
-                var lineNumber = 1;
+                var lineNumber = _this.getOrderedListStart();
                 for (var i = 0; i < lineIndex; i++) {
                     if (currentLineNumbers[i])
                         lineNumber++;
@@ -3460,7 +3478,7 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
         var objects = _(this.objects$.value)
             .map(function (x) { return x.persist(); })
             .value();
-        var includedProperties = ["id", "orderedList"];
+        var includedProperties = ["id", "orderedList", "orderedListIndex"];
         var json = this.fabricCanvas.toJSON(includedProperties);
         return {
             dimensions: this.dimensions$.value,

package/dist/mutator/mutable-text.interface.d.ts

@@ -68,5 +68,13 @@ export interface IMutableText extends ICanvasObject {
      * Disable ordered list markers.
      */
     disableOrderedList(): void;
+    /**
+     * @param start The start value for the ordered list.
+     */
+    setOrderedListStart(start: number): void;
+    /**
+     * Get the start value for the ordered list.
+     */
+    getOrderedListStart(): number;
 }
 export declare function isMutableText(object: any): object is IMutableText;

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

@@ -285,6 +285,16 @@ export declare class Text extends AbstractCanvasObject<fabric.Textbox> implement
      * @inheritDoc
      */
     disableOrderedList(): void;
+    /**
+     * @override
+     * @inheritDoc
+     */
+    setOrderedListStart(start: number): void;
+    /**
+     * @override
+     * @inheritDoc
+     */
+    getOrderedListStart(): number;
     getSizeIncreaseSinceCreation(): number;
     private removeBullets;
     private removeOrderedList;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "1.14.0-beta.1",
+  "version": "1.14.1",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"