@aurigma/design-atoms - npm Package Compare versions

Comparing version 6.9.2 to 6.9.3

Canvas.d.ts

@@ -20,2 +20,3 @@ import { ItemHandler } from "./ItemHandlers/ItemHandler";
 import { History } from "./History";
+import { CcEvent } from "./Viewer/BaseViewer";
 import { ISelectionOptions } from "./CanvasElementHandler";
@@ -445,2 +446,3 @@ import { SnapLinesHandler } from "./Viewer/SnapLinesHandler";
     raiseKeyUp(params: any): void;
+    raiseTouchStart(event: CcEvent): void;
     add_currentItemHandlerChanged(handler: (itemHandler: ItemHandler) => void): void;
@@ -447,0 +449,0 @@ remove_currentItemHandlerChanged(handler: (itemHandler: ItemHandler) => void): void;

Commands/ItemsCommands/DeleteItemsCommand.d.ts

@@ -16,2 +16,3 @@ import { Item } from "@aurigma/design-atoms-model/Product/Items/Item";
     deleteItems(items: Array<Item>, force: boolean, autoUngroup: boolean, autoParentGroupDelete: boolean): void;
+    private _removeChildItemsFromGroup;
     deleteItem(item: Item): void;
@@ -18,0 +19,0 @@ redo(): Promise<void>;

Commands/ItemsCommands/DeleteItemsCommand.js

@@ -50,2 +50,29 @@ var __extends = (this && this.__extends) || (function () {
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 import { NotImplementedException } from "@aurigma/design-atoms-model/Exception";
@@ -81,2 +108,3 @@ import { BaseItemsCommand } from "./BaseItemsCommand";
     DeleteItemsCommand.prototype.deleteItems = function (items, force, autoUngroup, autoParentGroupDelete) {
+        var e_1, _a;
         if (items.length == 0)
@@ -90,2 +118,3 @@ return;
             return;
+        var byParentMap = new Map();
         for (var i = 0; i < items.length; i++) {
@@ -95,12 +124,7 @@ var item = items[i];
             if (parentGroupItem != null) {
-                if (parentGroupItem.items.contains(item)) {
-                    if (parentGroupItem instanceof LayoutItem)
-                        parentGroupItem.removeItems([item]);
-                    else
-                        parentGroupItem.items.remove(item);
+                if (!byParentMap.has(parentGroupItem)) {
+                    byParentMap.set(parentGroupItem, []);
                 }
-                if (autoParentGroupDelete && parentGroupItem.items.length === 0)
-                    this.deleteItem(parentGroupItem);
-                else if (autoUngroup && parentGroupItem.items.length < 2)
-                    this._commandManager.execute(ItemsCommand.ungroupItems, { items: parentGroupItem.items.toArray() });
+                var childItems = byParentMap.get(parentGroupItem);
+                childItems.push(item);
             }
@@ -111,2 +135,15 @@ else {
         }
+        try {
+            for (var byParentMap_1 = __values(byParentMap), byParentMap_1_1 = byParentMap_1.next(); !byParentMap_1_1.done; byParentMap_1_1 = byParentMap_1.next()) {
+                var _b = __read(byParentMap_1_1.value, 2), parent_1 = _b[0], children = _b[1];
+                this._removeChildItemsFromGroup(parent_1, children, autoParentGroupDelete, autoUngroup);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (byParentMap_1_1 && !byParentMap_1_1.done && (_a = byParentMap_1.return)) _a.call(byParentMap_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
         this._canvas.updateTexts();
@@ -116,2 +153,12 @@ this._canvas.updateSelection();
     };
+    DeleteItemsCommand.prototype._removeChildItemsFromGroup = function (parentGroupItem, children, autoParentGroupDelete, autoUngroup) {
+        if (parentGroupItem instanceof LayoutItem)
+            children.forEach(function (x) { return parentGroupItem.removeItems([x]); });
+        else
+            children.forEach(function (x) { return parentGroupItem.items.remove(x); });
+        if (autoParentGroupDelete && parentGroupItem.items.length === 0)
+            this.deleteItem(parentGroupItem);
+        else if (autoUngroup && parentGroupItem.items.length < 2)
+            this._commandManager.execute(ItemsCommand.ungroupItems, { items: parentGroupItem.items.toArray() });
+    };
     DeleteItemsCommand.prototype.deleteItem = function (item) {
@@ -123,4 +170,8 @@ if (item == null)
             : item.parentContainer;
-        if (container != null && container.items.contains(item))
-            container.items.remove(item);
+        if (container != null && container.items.contains(item)) {
+            if (container instanceof LayoutItem)
+                container.removeItems([item]);
+            else
+                container.items.remove(item);
+        }
     };
@@ -127,0 +178,0 @@ DeleteItemsCommand.prototype.redo = function () {

Commands/ItemsCommands/UngroupItemsCommand.js

@@ -145,4 +145,6 @@ var __extends = (this && this.__extends) || (function () {
                             targetGroupitemsOrders = targetGroupItem.getItemsOrder();
-                            groupItemId = targetGroupitemsOrders.indexOf(groupItem.id);
-                            targetOrderIndex = groupItemId;
+                            if (targetGroupitemsOrders) {
+                                groupItemId = targetGroupitemsOrders.indexOf(groupItem.id);
+                                targetOrderIndex = groupItemId;
+                            }
                         }
@@ -149,0 +151,0 @@ return [4 /*yield*/, this._commandManager.execute(ItemsCommand.deleteItems, { items: items, force: true, autoUngroup: false, autoParentGroupDelete: true })];

ItemHandlers/GroupItemHandler.js

@@ -159,3 +159,3 @@ var __extends = (this && this.__extends) || (function () {
             return;
-        var itemHandler = this.canvas.handlerFactory.get(data.item);
+        var itemHandler = this.itemHandlers.firstOrDefault(function (x) { return x.item == data.item; });
         if (this.canvas.isItemHandlerSelected(itemHandler))
@@ -162,0 +162,0 @@ this.canvas.removeSelectedItemHandler(itemHandler);

ItemHandlers/LayoutItemHandler.js

@@ -160,4 +160,6 @@ var __extends = (this && this.__extends) || (function () {
                         _a.sent();
-                        sourceRectangle = this.itemHandlers.cast().select(function (x) { return x.rectangle; }).aggregate(function (a, b) { return RotatedRectangleF.union(a, b); });
-                        this.setSourceRectangle(sourceRectangle);
+                        if (this.itemHandlers.any()) {
+                            sourceRectangle = this.itemHandlers.cast().select(function (x) { return x.rectangle; }).aggregate(function (a, b) { return RotatedRectangleF.union(a, b); });
+                            this.setSourceRectangle(sourceRectangle);
+                        }
                         return [2 /*return*/];
@@ -164,0 +166,0 @@ }

package.json

 {
-  "version": "6.9.2",
+  "version": "6.9.3",
   "name": "@aurigma/design-atoms",
@@ -22,4 +22,4 @@ "license": "SEE LICENSE IN License.md",
   "dependencies": {
-    "@aurigma/design-atoms-model": "6.5.2",
-    "@aurigma/text-whizz": "^1.2.144",
+    "@aurigma/design-atoms-model": "6.5.3",
+    "@aurigma/text-whizz": "1.2.152",
     "clone": "2.1.1",
@@ -26,0 +26,0 @@ "json-cycle": "1.3.0",

SelectionHandler.d.ts

@@ -37,2 +37,4 @@ import { Canvas, HitTestResult } from "./Canvas";
     private _locked;
+    private _allowMoveHorizontal;
+    private _allowMoveVertical;
     private _offset;
@@ -109,2 +111,3 @@ get offset(): PointF;
     private _onSelectedItemHandlersChanged;
+    private _updateCurrentMovePermissions;
     private get _allowManipulation();
@@ -111,0 +114,0 @@ }

SelectionHandler.js

@@ -25,2 +25,4 @@ import { PointF, RotatedRectangleF, RectangleF, EqualsOfFloatNumbers, getTriangleAngle, normalizeAngle } from "@aurigma/design-atoms-model/Math";
         this._locked = false;
+        this._allowMoveHorizontal = true;
+        this._allowMoveVertical = true;
         this._canvas = canvas;
@@ -444,4 +446,7 @@ this._enabled = true;
         }
-        if (!isPlaceholderEditing)
-            this._snapLinesHandler.drawActiveLines(ctx, renderer);
+        if (!isPlaceholderEditing) {
+            var drawVertical = this._allowMoveHorizontal;
+            var drawHorizontal = this._allowMoveVertical;
+            this._snapLinesHandler.drawActiveLines(ctx, renderer, drawVertical, drawHorizontal);
+        }
     };
@@ -748,4 +753,5 @@ SelectionHandler.prototype.processKeyEvent = function (e) {
         if (!isCtrl) {
-            if (this._canvas.contentEditingPlaceholderItemHandler == null)
-                diff = this._snapLinesHandler.constrainDiffToSnapLines(point, this._startPoint, this._canvas);
+            if (this._canvas.contentEditingPlaceholderItemHandler == null) {
+                diff = this._snapLinesHandler.constrainDiffToSnapLines(point, this._startPoint, this._canvas, this._allowMoveHorizontal, this._allowMoveVertical);
+            }
         }
@@ -1005,4 +1011,15 @@ else {
     SelectionHandler.prototype._onSelectedItemHandlersChanged = function () {
+        this._updateCurrentMovePermissions();
         this._selectedItemHandlersChangedEvent.notify(this);
     };
+    SelectionHandler.prototype._updateCurrentMovePermissions = function () {
+        var _this = this;
+        this._allowMoveHorizontal = true;
+        this._allowMoveVertical = true;
+        this._itemHandlers.forEach(function (element) {
+            var permissions = element.getPermissions();
+            _this._allowMoveHorizontal = _this._allowMoveHorizontal && permissions.allowMoveHorizontal;
+            _this._allowMoveVertical = _this._allowMoveVertical && permissions.allowMoveVertical;
+        });
+    };
     Object.defineProperty(SelectionHandler.prototype, "_allowManipulation", {
@@ -1009,0 +1026,0 @@ get: function () {

Services/MouseBehaviorModeHandlers/SelectionBehaviorHandler.d.ts

@@ -23,2 +23,3 @@ import { Canvas } from "../../Canvas";
     dispose(): void;
+    onTouchStart(e: CcEvent): void;
     processMouseEvent(e: CcEvent): void;
@@ -25,0 +26,0 @@ private _getHandlerForSelect;

Services/MouseBehaviorModeHandlers/SelectionBehaviorHandler.js

@@ -21,2 +21,16 @@ import { PointF, RectangleF, RotatedRectangleF } from "@aurigma/design-atoms-model/Math";
     SelectionBehaviorHandler.prototype.dispose = function () { };
+    SelectionBehaviorHandler.prototype.onTouchStart = function (e) {
+        if (!Environment.IsTouchDevice())
+            return;
+        var pt = new PointF(e.x, e.y);
+        var selectionHitTest = this._selection.hitTest(pt, false);
+        if (selectionHitTest.resize || selectionHitTest.rotate || selectionHitTest.body) {
+            e.originalEvent.preventDefault();
+            return;
+        }
+        var itemHandlers = this._canvas.getItemHandlersByHitTest(pt);
+        var currentHandlerForSelect = this._getHandlerForSelect(itemHandlers, pt, e);
+        if (currentHandlerForSelect != null)
+            e.originalEvent.preventDefault();
+    };
     SelectionBehaviorHandler.prototype.processMouseEvent = function (e) {
@@ -23,0 +37,0 @@ var _this = this;

Services/ViolationService/ViolationService.js

@@ -100,3 +100,4 @@ var __assign = (this && this.__assign) || function () {
             _this._violations.forEach(function (v) { return v.prepareItem != null ? v.prepareItem(item) : null; });
-            _this._itemsToCheck.push(item);
+            if (!_this._itemsToCheck.contains(item))
+                _this._itemsToCheck.push(item);
         };
@@ -103,0 +104,0 @@ this._onItemRemoved = function (args) { _this._removeViolationItemData(args.item); };

Viewer/SnapLinesHandler.d.ts

@@ -11,5 +11,13 @@ import { RectangleF, PointF, RotatedRectangleF } from "@aurigma/design-atoms-model/Math";
     get configuration(): ISnapLinesConfiguration;
-    drawActiveLines(ctx: CanvasRenderingContext2D, renderer: CanvasRenderer): void;
+    drawActiveLines(ctx: CanvasRenderingContext2D, renderer: CanvasRenderer, drawVertical: boolean, drawHorizontal: boolean): void;
     resetActiveLines(): void;
-    constrainDiffToSnapLines(point: PointF, startPoint: PointF, canvas: Canvas): PointF;
+    constrainDiffToSnapLines(point: PointF, startPoint: PointF, canvas: Canvas, allowMoveHorizontal: any, allowMoveVertical: any): PointF;
+    static SnapResult: {
+        new (): {
+            diffValue: number;
+            activeAnchorIndex: number;
+            activePointIndex: number;
+        };
+    };
+    private _findSnap;
     constrainRectangleToSnapLines(rect: RotatedRectangleF, oldRectWithBorder: RotatedRectangleF, arbitraryResize: boolean, operation: HitTestResult, rectWithFramesAndBorder: RotatedRectangleF, rectWithBorder: RotatedRectangleF, canvas: Canvas): RotatedRectangleF;
@@ -16,0 +24,0 @@ fillSnapData(startRectangle: RotatedRectangleF, startRectangleWithFrames: RotatedRectangleF, startRectangleWithBorder: RectangleF, region: RectangleF, canvas: Canvas, operation: HitTestResult): void;

Viewer/SnapLinesHandler.js

@@ -41,8 +41,8 @@ var __assign = (this && this.__assign) || function () {
     });
-    SnapLinesHandler.prototype.drawActiveLines = function (ctx, renderer) {
-        if (this._snapData.activeXAnchorIndex != null) {
+    SnapLinesHandler.prototype.drawActiveLines = function (ctx, renderer, drawVertical, drawHorizontal) {
+        if (this._snapData.activeXAnchorIndex != null && drawVertical) {
             var xAnchor = this._snapData.xAnchors[this._snapData.activeXAnchorIndex];
             renderer.drawVerticalLine(ctx, xAnchor.position, this._conf.snapElements[xAnchor.type].color);
         }
-        if (this._snapData.activeYAnchorIndex != null) {
+        if (this._snapData.activeYAnchorIndex != null && drawHorizontal) {
             var yAnchor = this._snapData.yAnchors[this._snapData.activeYAnchorIndex];
@@ -56,3 +56,3 @@ renderer.drawHorizontalLine(ctx, yAnchor.position, this._conf.snapElements[yAnchor.type].color);
     };
-    SnapLinesHandler.prototype.constrainDiffToSnapLines = function (point, startPoint, canvas) {
+    SnapLinesHandler.prototype.constrainDiffToSnapLines = function (point, startPoint, canvas, allowMoveHorizontal, allowMoveVertical) {
         if (startPoint == null)
@@ -72,44 +72,38 @@ return new PointF();
         this._snapData.activeXAnchorIndex = null;
-        //indexesInArray?
-        var xAnchorStart = directionX > 0 ? 0 : this._snapData.xAnchors.length - 1;
-        var xAnchorEnd = directionX > 0 ? this._snapData.xAnchors.length - 1 : 0;
-        var xAnchorStep = directionX > 0 ? 1 : -1;
-        var xPointStart = directionX > 0 ? this._snapData.xPoints.length - 1 : 0;
-        var xPointEnd = directionX > 0 ? 0 : this._snapData.xPoints.length - 1;
-        var xPointStep = directionX > 0 ? -1 : 1;
-        for (var xAnchorIndex = xAnchorStart; xAnchorIndex !== (xAnchorEnd + xAnchorStep); xAnchorIndex += xAnchorStep) {
-            var xAnchor = this._snapData.xAnchors[xAnchorIndex];
-            for (var xPointIndex = xPointStart; xPointIndex !== (xPointEnd + xPointStep); xPointIndex += xPointStep) {
-                var xPoint = this._snapData.xPoints[xPointIndex];
-                var tolerance = this._getSnapLineTolerance(canvas, xAnchor.type);
-                if (Math.abs(xPoint + diff.x - xAnchor.position) < tolerance) {
-                    var oldTypeConf = this._snapData.activeXAnchorIndex != null ? this._conf.snapElements[this._snapData.xAnchors[this._snapData.activeXAnchorIndex].type] : null;
-                    var currentTypeConf = this._conf.snapElements[xAnchor.type];
-                    if (this._snapData.activeXAnchorIndex == null || currentTypeConf.priority > oldTypeConf.priority) {
-                        resultDiff.x = xAnchor.position - xPoint;
-                        this._snapData.activeXAnchorIndex = xAnchorIndex;
-                        this._snapData.activeXPointIndex = xPointIndex;
-                    }
-                }
-            }
+        if (allowMoveHorizontal) {
+            var snapResultX = this._findSnap(canvas, diff.x, directionX, this._snapData.xAnchors, this._snapData.xPoints);
+            resultDiff.x = snapResultX.diffValue;
+            this._snapData.activeXAnchorIndex = snapResultX.activeAnchorIndex;
+            this._snapData.activeXPointIndex = snapResultX.activePointIndex;
         }
         this._snapData.activeYAnchorIndex = null;
-        var yAnchorStart = directionY > 0 ? 0 : this._snapData.yAnchors.length - 1;
-        var yAnchorEnd = directionY > 0 ? this._snapData.yAnchors.length - 1 : 0;
-        var yAnchorStep = directionY > 0 ? 1 : -1;
-        var yPointStart = directionY > 0 ? this._snapData.yPoints.length - 1 : 0;
-        var yPointEnd = directionY > 0 ? 0 : this._snapData.yPoints.length - 1;
-        var yPointStep = directionY > 0 ? -1 : 1;
-        for (var yAnchorIndex = yAnchorStart; yAnchorIndex !== (yAnchorEnd + yAnchorStep); yAnchorIndex += yAnchorStep) {
-            var yAnchor = this._snapData.yAnchors[yAnchorIndex];
-            for (var yPointIndex = yPointStart; yPointIndex !== (yPointEnd + yPointStep); yPointIndex += yPointStep) {
-                var yPoint = this._snapData.yPoints[yPointIndex];
-                var tolerance = this._getSnapLineTolerance(canvas, yAnchor.type);
-                if (Math.abs(yPoint + diff.y - yAnchor.position) < tolerance) {
-                    var oldTypeConf = this._snapData.activeYAnchorIndex != null ? this._conf.snapElements[this._snapData.yAnchors[this._snapData.activeYAnchorIndex].type] : null;
-                    var currentTypeConf = this._conf.snapElements[yAnchor.type];
-                    if (this._snapData.activeYAnchorIndex == null || currentTypeConf.priority > oldTypeConf.priority) {
-                        resultDiff.y = yAnchor.position - yPoint;
-                        this._snapData.activeYAnchorIndex = yAnchorIndex;
-                        this._snapData.activeYPointIndex = yPointIndex;
+        if (allowMoveVertical) {
+            var snapResultY = this._findSnap(canvas, diff.y, directionY, this._snapData.yAnchors, this._snapData.yPoints);
+            resultDiff.y = snapResultY.diffValue;
+            this._snapData.activeYAnchorIndex = snapResultY.activeAnchorIndex;
+            this._snapData.activeYPointIndex = snapResultY.activePointIndex;
+        }
+        return resultDiff;
+    };
+    SnapLinesHandler.prototype._findSnap = function (canvas, diff, direction, anchors, points) {
+        var result = new SnapLinesHandler.SnapResult();
+        result.diffValue = diff;
+        var anchorStart = direction > 0 ? 0 : anchors.length - 1;
+        var anchorEnd = direction > 0 ? anchors.length - 1 : 0;
+        var anchorStep = direction > 0 ? 1 : -1;
+        var pointStart = direction > 0 ? points.length - 1 : 0;
+        var pointEnd = direction > 0 ? 0 : points.length - 1;
+        var pointStep = direction > 0 ? -1 : 1;
+        for (var anchorIndex = anchorStart; anchorIndex !== (anchorEnd + anchorStep); anchorIndex += anchorStep) {
+            var anchor = anchors[anchorIndex];
+            for (var pointIndex = pointStart; pointIndex !== (pointEnd + pointStep); pointIndex += pointStep) {
+                var yPoint = points[pointIndex];
+                var tolerance = this._getSnapLineTolerance(canvas, anchor.type);
+                if (Math.abs(yPoint + diff - anchor.position) < tolerance) {
+                    var oldTypeConf = result.activeAnchorIndex != null ? this._conf.snapElements[anchors[result.activeAnchorIndex].type] : null;
+                    var currentTypeConf = this._conf.snapElements[anchor.type];
+                    if (result.activeAnchorIndex == null || currentTypeConf.priority > oldTypeConf.priority) {
+                        result.diffValue = anchor.position - yPoint;
+                        result.activeAnchorIndex = anchorIndex;
+                        result.activePointIndex = pointIndex;
                     }
@@ -119,3 +113,3 @@ }
         }
-        return resultDiff;
+        return result;
     };
@@ -179,3 +173,3 @@ SnapLinesHandler.prototype.constrainRectangleToSnapLines = function (rect, oldRectWithBorder, arbitraryResize, operation, rectWithFramesAndBorder, rectWithBorder, canvas) {
             fillSnapData(SelectionHandler.cw[operation.resizeIndex] !== (0 ^ (isReverse ? 1 : 0)), SelectionHandler.ch[operation.resizeIndex] !== (0 ^ (isReverse ? 1 : 0)));
-            var snapLinesDiff = this.constrainDiffToSnapLines(activeFramePoint, activeFramePoint, canvas);
+            var snapLinesDiff = this.constrainDiffToSnapLines(activeFramePoint, activeFramePoint, canvas, true, true);
             if (snapLinesDiff == null ||
@@ -208,3 +202,3 @@ (EqualsOfFloatNumbers(snapLinesDiff.x, 0, 0.1) &&
             fillSnapData();
-            var proportionalLinesDiff = this.constrainDiffToSnapLines(activePoint, activePoint, canvas);
+            var proportionalLinesDiff = this.constrainDiffToSnapLines(activePoint, activePoint, canvas, true, true);
             var ifXDiffIsZero = EqualsOfFloatNumbers(proportionalLinesDiff.x, 0, 0.01);
@@ -389,2 +383,10 @@ var ifYDiffIsZero = EqualsOfFloatNumbers(proportionalLinesDiff.y, 0, 0.01);
     });
+    SnapLinesHandler.SnapResult = /** @class */ (function () {
+        function class_1() {
+            this.diffValue = null;
+            this.activeAnchorIndex = null;
+            this.activePointIndex = null;
+        }
+        return class_1;
+    }());
     return SnapLinesHandler;
@@ -391,0 +393,0 @@ }());

Viewer/Viewer.d.ts

@@ -172,3 +172,3 @@ import { Canvas } from "../Canvas";
     _ignoreSelectionClick(e: any): boolean;
-    _onMouseMove(e: any): void;
+    _onMouseMove(e: MouseEvent): void;
     _onTouch(e: any): void;
@@ -175,0 +175,0 @@ _onPinch(e: any): void;

No alert changes

Improved metrics

Total package byte prevSize

3604893

increased by0.16%

Lines of code

47934

increased by0.22%

Dependency changes

• + Added@aurigma/text-whizz@1.2.152(transitive)

• - Removed@aurigma/text-whizz@1.7.46(transitive)

• Updated@aurigma/design-atoms-model@6.5.3

• Updated@aurigma/text-whizz@1.2.152