@wcardinal/wcardinal-ui 0.372.0 → 0.373.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.372.0
+ Winter Cardinal UI v0.373.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -2563,9 +2563,11 @@ var EShapeConnectorContainerImpl = /** @class */ (function () {
         });
         return this;
     };
-    EShapeConnectorContainerImpl.prototype.detach = function () {
+    EShapeConnectorContainerImpl.prototype.detach = function (exceptions) {
         this._edges.forEach(function (edge) {
-            edge.set(null);
+            if (exceptions == null || !exceptions.has(edge.parent)) {
+                edge.set(null);
+            }
         });
         return this;
     };
@@ -4475,7 +4477,7 @@ var PRIMITIVE = ID | COORDINATE | SHAPE | TEXT$2 | TEXTURE | DATA | ACTION | CUR
 var GROUP = PRIMITIVE | UNGROUPING;
 var EMBEDDED = ID | COORDINATE | REPLACING | GROUPING | TEXT$2 | DATA | ACTION | LAYER | DATA_MAPPING;
 var EMBEDDED_ACCEPTOR_EDGE = ID | COORDINATE | REPLACING | FILL$1 | STROKE$1 | TEXT$2 | TEXTURE | DATA | ACTION | CURSOR$1 | LAYER;
-var CONNECTOR = ID | REPLACING | FILL$1 | STROKE$1 | LINE | LINE_TAIL | LINE_HEAD | TEXT$2 | TEXTURE | DATA | ACTION | CURSOR$1 | LAYER | CHILDREN$1;
+var CONNECTOR = ID | SHAPE | TEXT$2 | TEXTURE | DATA | ACTION | CURSOR$1 | LAYER | CHILDREN$1;
 var ALL = PRIMITIVE | STROKE_SIDE | BORDER_RADIUS | DATA_MAPPING | UNGROUPING;
 var EShapeCapability = {
     NONE: NONE,
@@ -4641,6 +4643,44 @@ var EShapeCapabilityContainerImpl = /** @class */ (function () {
     return EShapeCapabilityContainerImpl;
 }());
 
+var EShapeLock = /** @class */ (function () {
+    function EShapeLock() {
+        this._count = 0;
+        this._flag = 0;
+    }
+    EShapeLock.prototype.lock = function () {
+        this._count += 1;
+        if (this._count === 1) {
+            this._flag = 0;
+            return true;
+        }
+        return false;
+    };
+    EShapeLock.prototype.unlock = function () {
+        this._count -= 1;
+        return this._count <= 0 && this._flag !== 0;
+    };
+    EShapeLock.prototype.isLocked = function (high) {
+        if (0 < this._count) {
+            this._flag |= high ? 3 : 1;
+            return true;
+        }
+        return false;
+    };
+    EShapeLock.prototype.isHigh = function () {
+        return 1 < this._flag;
+    };
+    return EShapeLock;
+}());
+
+var EShapeLockPart = {
+    TRANSFORM: 1,
+    TRANSFORM_PARENT: 2,
+    UPLOADED: 4,
+    TRANSFORM_AND_UPLOADED: 7,
+    CONNECTOR: 8
+};
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -4653,13 +4693,11 @@ var EShapeBase = /** @class */ (function (_super) {
         _this.uuid = 0;
         _this.type = type;
         _this.transform = _this.newTransform();
-        _this._onTransformChangeLock = 0;
-        _this._isOnTransformChanged = false;
         _this.action = new EShapeAction();
         _this._visible = true;
-        _this._uploadedUpdateLock = 0;
-        _this._isUploadedUpdated = false;
-        _this._isUploadedUpdatedRecursively = false;
+        _this._lockTransform = new EShapeLock();
+        _this._lockTransformParent = new EShapeLock();
+        _this._lockUploaded = new EShapeLock();
         _this._boundsTransformId = NaN;
         _this._boundsInternalTransformId = NaN;
         _this._boundsLocalTransformId = NaN;
@@ -4700,6 +4738,9 @@ var EShapeBase = /** @class */ (function (_super) {
         this.onParentTransformChange();
     };
     EShapeBase.prototype.onParentTransformChange = function () {
+        if (this._lockTransformParent.isLocked()) {
+            return;
+        }
         this.updateUploaded();
         var connector = this._connector;
         if (connector != null) {
@@ -4711,79 +4752,62 @@ var EShapeBase = /** @class */ (function (_super) {
         }
     };
     EShapeBase.prototype.onTransformChange_ = function () {
-        if (this._onTransformChangeLock === 0) {
-            var parent_1 = this.parent;
-            if (parent_1 != null) {
-                parent_1.onChildTransformChange();
-            }
+        if (this._lockTransform.isLocked()) {
+            return;
         }
-        else {
-            this._isOnTransformChanged = true;
+        var parent = this.parent;
+        if (parent != null) {
+            parent.onChildTransformChange();
         }
     };
-    EShapeBase.prototype.disallowOnTransformChange = function () {
-        this._onTransformChangeLock += 1;
-        if (this._onTransformChangeLock === 1) {
-            this._isOnTransformChanged = false;
+    EShapeBase.prototype.lock = function (part) {
+        if (part & EShapeLockPart.TRANSFORM) {
+            this._lockTransform.lock();
         }
+        if (part & EShapeLockPart.TRANSFORM_PARENT) {
+            this._lockTransformParent.lock();
+        }
+        if (part & EShapeLockPart.UPLOADED) {
+            this._lockUploaded.lock();
+        }
+        return this;
     };
-    EShapeBase.prototype.allowOnTransformChange = function (invokeOnTransformChange) {
-        this._onTransformChangeLock -= 1;
-        if (this._onTransformChangeLock === 0) {
-            if (this._isOnTransformChanged) {
-                this._isOnTransformChanged = false;
-                if (invokeOnTransformChange) {
-                    this.onTransformChange();
-                }
+    EShapeBase.prototype.unlock = function (part, invoke) {
+        if (part & EShapeLockPart.UPLOADED) {
+            var lockUploaded = this._lockUploaded;
+            if (lockUploaded.unlock() && invoke) {
+                this.updateUploaded(lockUploaded.isHigh());
             }
         }
+        if (part & EShapeLockPart.TRANSFORM_PARENT) {
+            if (this._lockTransformParent.unlock() && invoke) {
+                this.onParentTransformChange();
+            }
+        }
+        if (part & EShapeLockPart.TRANSFORM) {
+            if (this._lockTransform.unlock() && invoke) {
+                this.onTransformChange();
+            }
+        }
+        return this;
     };
     EShapeBase.prototype.onChildTransformChange = function () {
         //
     };
-    EShapeBase.prototype.disallowUploadedUpdate = function () {
-        this._uploadedUpdateLock += 1;
-        if (this._uploadedUpdateLock === 1) {
-            this._isUploadedUpdated = false;
-            this._isUploadedUpdatedRecursively = false;
+    EShapeBase.prototype.updateUploaded = function (recursively) {
+        if (this._lockUploaded.isLocked()) {
+            return;
         }
-    };
-    EShapeBase.prototype.allowUploadedUpdate = function () {
-        this._uploadedUpdateLock -= 1;
-        if (this._uploadedUpdateLock === 0) {
-            if (this._isUploadedUpdatedRecursively) {
-                this._isUploadedUpdatedRecursively = false;
-                this._isUploadedUpdated = false;
-                this.updateUploadedRecursively();
-            }
-            else if (this._isUploadedUpdated) {
-                this._isUploadedUpdated = false;
-                this.updateUploaded();
-            }
+        var uploaded = this.uploaded;
+        if (uploaded != null) {
+            uploaded.update(this);
         }
-    };
-    EShapeBase.prototype.updateUploadedRecursively = function () {
-        if (this._uploadedUpdateLock === 0) {
-            this.updateUploaded();
+        if (recursively === true) {
             var children = this.children;
             for (var i = 0, imax = children.length; i < imax; ++i) {
-                children[i].updateUploadedRecursively();
-            }
-        }
-        else {
-            this._isUploadedUpdatedRecursively = true;
-        }
-    };
-    EShapeBase.prototype.updateUploaded = function () {
-        if (this._uploadedUpdateLock === 0) {
-            var uploaded = this.uploaded;
-            if (uploaded != null) {
-                uploaded.update(this);
+                children[i].updateUploaded(true);
             }
         }
-        else {
-            this._isUploadedUpdated = true;
-        }
     };
     Object.defineProperty(EShapeBase.prototype, "image", {
         get: function () {
@@ -4828,9 +4852,9 @@ var EShapeBase = /** @class */ (function (_super) {
     Object.defineProperty(EShapeBase.prototype, "visible", {
         get: function () {
             if (this._visible) {
-                var parent_2 = this.parent;
-                if (parent_2 instanceof EShapeBase) {
-                    return parent_2.visible;
+                var parent_1 = this.parent;
+                if (parent_1 instanceof EShapeBase) {
+                    return parent_1.visible;
                 }
                 return true;
             }
@@ -4839,7 +4863,7 @@ var EShapeBase = /** @class */ (function (_super) {
         set: function (visible) {
             if (this._visible !== visible) {
                 this._visible = visible;
-                this.updateUploadedRecursively();
+                this.updateUploaded(true);
             }
         },
         enumerable: false,
@@ -4848,9 +4872,9 @@ var EShapeBase = /** @class */ (function (_super) {
     Object.defineProperty(EShapeBase.prototype, "worldVisible", {
         get: function () {
             if (this._visible) {
-                var parent_3 = this.parent;
-                if (parent_3) {
-                    return parent_3.worldVisible;
+                var parent_2 = this.parent;
+                if (parent_2) {
+                    return parent_2.worldVisible;
                 }
                 return true;
             }
@@ -4894,7 +4918,7 @@ var EShapeBase = /** @class */ (function (_super) {
             children[i].onAttach();
         }
     };
-    EShapeBase.prototype.detach = function () {
+    EShapeBase.prototype.detach = function (exceptions) {
         var parent = this.parent;
         if (parent) {
             this.parent = null;
@@ -4904,20 +4928,20 @@ var EShapeBase = /** @class */ (function (_super) {
                 children.splice(index, 1);
                 parent.onChildTransformChange();
                 parent.toDirty();
-                this.onDetach();
+                this.onDetach(exceptions);
             }
         }
         return this;
     };
-    EShapeBase.prototype.onDetach = function () {
+    EShapeBase.prototype.onDetach = function (exceptions) {
         this.uploaded = undefined;
         var connector = this._connector;
         if (connector) {
-            connector.detach();
+            connector.detach(exceptions);
         }
         var children = this.children;
         for (var i = 0, imax = children.length; i < imax; ++i) {
-            children[i].onDetach();
+            children[i].onDetach(exceptions);
         }
     };
     // Transform
@@ -16932,10 +16956,10 @@ var EShapeTransforms = /** @class */ (function () {
         // Size
         editor.size.copyFrom(shape.size);
         //
-        shape.disallowOnTransformChange();
+        shape.lock(EShapeLockPart.TRANSFORM);
     };
     EShapeTransforms.finalize = function (shape) {
-        shape.allowOnTransformChange(true);
+        shape.unlock(EShapeLockPart.TRANSFORM, true);
     };
     EShapeTransforms.apply = function (shape, transform, capability) {
         var editor = shape.editor;
@@ -16949,7 +16973,7 @@ var EShapeTransforms = /** @class */ (function () {
         }
     };
     EShapeTransforms.applyLocal = function (shape, localTransform, capability, size) {
-        shape.disallowUploadedUpdate();
+        shape.lock(EShapeLockPart.UPLOADED);
         // Reconstruct the position, the rotation and the size
         var a = localTransform.a;
         var b = localTransform.b;
@@ -17009,7 +17033,7 @@ var EShapeTransforms = /** @class */ (function () {
             }
         }
         //
-        shape.allowUploadedUpdate();
+        shape.unlock(EShapeLockPart.UPLOADED, true);
     };
     return EShapeTransforms;
 }());
@@ -17063,9 +17087,9 @@ var EShapeGroupSizeLayout = /** @class */ (function () {
             .translate(-pivotX, -pivotY)
             .scale(sx, sy)
             .translate(+pivotX, +pivotY);
-        shape.disallowOnTransformChange();
+        shape.lock(EShapeLockPart.TRANSFORM);
         EShapeTransforms.applyLocal(shape, transform, EShapeCapability.ALL, childBase);
-        shape.allowOnTransformChange(false);
+        shape.unlock(EShapeLockPart.TRANSFORM, false);
     };
     EShapeGroupSizeLayout.WORK_TRANSFORM = new pixi_js.Matrix();
     return EShapeGroupSizeLayout;
@@ -17169,41 +17193,43 @@ var EShapeGroupSizeEditor = /** @class */ (function () {
     };
     EShapeGroupSizeEditor.prototype.doFit = function () {
         var parent = this._parent;
-        parent.disallowOnTransformChange();
+        parent.lock(EShapeLockPart.TRANSFORM | EShapeLockPart.TRANSFORM_PARENT);
         // Calculate the rect
         var rect = this.calcRect(this._workRectForFit);
         // Set size
         var size = this._size;
         size.set(rect.width, rect.height);
-        // Position & Pivot
-        // rx := rect.x
-        // ry := rect.y
+        // Calculating new position & pivot
+        //
+        // cx := rect.x + rect.width * 0.5
+        // cy := rect.y + rect.height * 0.5
+        //
+        // Since the local transform need to be unchanged:
+        //
+        // | a c tx |   | a c px' - (a * pvx' + c * pvy') |
+        // | b d ty | = | b d py' - (b * pvx' + d * pvy') |
+        // | 0 0 1  |   | 0 0 1                           |
+        //
+        // Here, (px', py') and (pvx', pvy') are the new position
+        // and the new pivot, respectively.
         //
-        // | a c tx | | 1 0 +rx | | 1 0 -rx |   | a c tx + (a * rx + c * ry) | | 1 0 -rx |
-        // | b d ty | | 0 1 +ry | | 0 1 -ry | = | b d ty + (b * rx + d * ry) | | 0 1 -ry |
-        // | 0 0 1  | | 0 0  1  | | 0 0  1  |   | 0 0 1                      | | 0 0  1  |
+        // Setting the new pivot (pvx', pvy') to (cx, cy) leads to
         //
-        // tx -> tx + (a * rx + c * ry) = poxition.x - (a * pivot.x + c * pivot.y)
-        // ty -> ty + (b * rx + d * ry) = poxition.y - (b * pivot.x + d * pivot.y)
-        // position.x -> position.x + (a * rx + c * ry) - (a * pivot.x + c * pivot.y)
-        // position.y -> position.y + (b * rx + d * ry) - (b * pivot.x + d * pivot.y)
-        // pivot.x -> 0
-        // pivot.y -> 0
+        // | a c tx |   | a c px' - (a * cx + c * cy) |
+        // | b d ty | = | b d py' - (b * cx + d * cy) |
+        // | 0 0 1  |   | 0 0 1                       |
         //
-        // a -> a', b -> b', c -> c', tx -> tx', ty -> ty'
+        // tx = px - (a * pvx + c * pvy) = px' - (a * cx + c * cy)
+        // ty = py - (b * pvx + d * pvy) = py' - (b * cx + d * cy)
         //
-        // | a' c' tx' | | 1 0 -rx |   | a' c' tx' - (a' * rx + c' * ry) |
-        // | b' d' ty' | | 0 1 -ry | = | b' d' ty' - (b' * rx + d' * ry) |
-        // | 0  0  1   | | 0 0  1  |   | 0  0  1                         |
+        // Thus, the new position (px', py') is
         //
-        // tx' -> tx' - (a' * rx + c' * ry) = poxition.x - (a' * pivot.x + c' * pivot.y)
-        // ty' -> ty' - (b' * rx + d' * ry) = poxition.y - (b' * pivot.x + d' * pivot.y)
-        // pivot.x -> pivot.x + rx
-        // pivot.y -> pivot.y + ry
+        // px' = px + (a * (cx - pvx) + c * (cy - pvy))
+        // py' = py + (b * (cy - pvx) + d * (cy - pvy))
         parent.updateTransform();
         var transform = parent.transform;
-        var x = rect.x + rect.width * 0.5;
-        var y = rect.y + rect.height * 0.5;
+        var cx = rect.x + rect.width * 0.5;
+        var cy = rect.y + rect.height * 0.5;
         var position = transform.position;
         var localTransform = transform.localTransform;
         var a = localTransform.a;
@@ -17211,12 +17237,16 @@ var EShapeGroupSizeEditor = /** @class */ (function () {
         var c = localTransform.c;
         var d = localTransform.d;
         var pivot = transform.pivot;
-        position.set(position.x + (a * x + c * y) - (a * pivot.x + c * pivot.y), position.y + (b * x + d * y) - (b * pivot.x + d * pivot.y));
-        pivot.set(x, y);
+        var pvx = pivot.x;
+        var pvy = pivot.y;
+        var dpvx = cx - pvx;
+        var dpvy = cy - pvy;
+        position.set(position.x + (a * dpvx + c * dpvy), position.y + (b * dpvx + d * dpvy));
+        pivot.set(cx, cy);
         // Reset the data
         this.reset(parent.children, this._layouts, size);
         //
-        parent.allowOnTransformChange(true);
+        parent.unlock(EShapeLockPart.TRANSFORM | EShapeLockPart.TRANSFORM_PARENT, true);
     };
     EShapeGroupSizeEditor.prototype.reset = function (children, layouts, size) {
         for (var i = 0, imax = Math.min(layouts.length, children.length); i < imax; ++i) {
@@ -18611,9 +18641,9 @@ var EShapeConnectorEdgeImpl = /** @class */ (function () {
         }
         return this;
     };
-    EShapeConnectorEdgeImpl.prototype.detach = function () {
+    EShapeConnectorEdgeImpl.prototype.detach = function (exceptions) {
         var shape = this._acceptor.shape;
-        if (shape) {
+        if (shape != null && (exceptions == null || !exceptions.has(shape))) {
             if (shape.connector.remove(this)) {
                 this.onAcceptorChange();
             }
@@ -18725,10 +18755,10 @@ var EShapeConnectorEdgeContainerImpl = /** @class */ (function () {
         this.unlock();
         return this;
     };
-    EShapeConnectorEdgeContainerImpl.prototype.detach = function () {
+    EShapeConnectorEdgeContainerImpl.prototype.detach = function (exceptions) {
         this.lock();
-        this._tail.detach();
-        this._head.detach();
+        this._tail.detach(exceptions);
+        this._head.detach(exceptions);
         this.unlock();
         return this;
     };
@@ -20097,8 +20127,7 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
         _this._headNormalId = 0;
         _this._headMargin = 0;
         _this._bodyId = 0;
-        _this._lockCount = 0;
-        _this._isChanged = false;
+        _this._lockChange = new EShapeLock();
         var sx = EShapeDefaults.SIZE_X;
         var sy = EShapeDefaults.SIZE_Y;
         var hx = sx * 0.5;
@@ -20111,20 +20140,20 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
         _this._body = new EShapeConnectorBodyImpl(_this, onChangeBound);
         return _this;
     }
-    EShapeConnectorLine.prototype.lock = function () {
-        this._lockCount += 1;
-        if (this._lockCount === 1) {
-            this._isChanged = false;
+    EShapeConnectorLine.prototype.lock = function (part) {
+        _super.prototype.lock.call(this, part);
+        if (part & EShapeLockPart.CONNECTOR) {
+            this._lockChange.lock();
         }
+        return this;
     };
-    EShapeConnectorLine.prototype.unlock = function () {
-        this._lockCount -= 1;
-        if (this._lockCount === 0) {
-            if (this._isChanged) {
+    EShapeConnectorLine.prototype.unlock = function (part, invoke) {
+        if (part & EShapeLockPart.CONNECTOR) {
+            if (this._lockChange.unlock() && invoke) {
                 this.onChange();
             }
-            this._isChanged = false;
         }
+        return _super.prototype.unlock.call(this, part, invoke);
     };
     Object.defineProperty(EShapeConnectorLine.prototype, "points", {
         get: function () {
@@ -20151,14 +20180,13 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
         _super.prototype.onAttach.call(this);
         this._edge.attach();
     };
-    EShapeConnectorLine.prototype.onDetach = function () {
-        this._edge.detach();
-        _super.prototype.onDetach.call(this);
+    EShapeConnectorLine.prototype.onDetach = function (exceptions) {
+        this._edge.detach(exceptions);
+        _super.prototype.onDetach.call(this, exceptions);
     };
     EShapeConnectorLine.prototype.onChange = function () {
         var _a;
-        if (0 < this._lockCount) {
-            this._isChanged = true;
+        if (this._lockChange.isLocked()) {
             return;
         }
         var edge = this._edge;
@@ -20206,7 +20234,7 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
                 values[i + 0] -= cx;
                 values[i + 1] -= cy;
             }
-            this.disallowUploadedUpdate();
+            this.lock(EShapeLockPart.TRANSFORM_AND_UPLOADED);
             transformPosition.set(px + cx, py + cy);
             transform.scale.set(1, 1);
             transform.rotation = 0;
@@ -20214,7 +20242,7 @@ var EShapeConnectorLine = /** @class */ (function (_super) {
             points.toFitted(sx, sy);
             this.size.set(sx, sy);
             points.set(values);
-            this.allowUploadedUpdate();
+            this.unlock(EShapeLockPart.TRANSFORM_AND_UPLOADED, true);
         }
     };
     EShapeConnectorLine.prototype.fillPoints = function (tail, tailMargin, head, headMargin, body, px, py, values) {
@@ -24263,12 +24291,12 @@ var EShapeRuntimeImpl = /** @class */ (function () {
         this.interactive = false;
     }
     EShapeRuntimeImpl.prototype.initialize = function (shape) {
-        shape.disallowUploadedUpdate();
+        shape.lock(EShapeLockPart.UPLOADED);
         var actions = this.actions;
         for (var i = 0, imax = actions.length; i < imax; ++i) {
             actions[i].initialize(shape, this);
         }
-        shape.allowUploadedUpdate();
+        shape.unlock(EShapeLockPart.UPLOADED, true);
     };
     EShapeRuntimeImpl.prototype.isActionable = function () {
         return 0 < this.actions.length;
@@ -24595,9 +24623,9 @@ var EShapeRuntimeImpl = /** @class */ (function () {
             if (isEffectTimeUp) {
                 this.effect = NaN;
             }
-            shape.disallowUploadedUpdate();
+            shape.lock(EShapeLockPart.UPLOADED);
             this.onUpdate(shape, time);
-            shape.allowUploadedUpdate();
+            shape.unlock(EShapeLockPart.UPLOADED, true);
             var wasStateChanged = this.isStateChanged;
             shape.state.removeAll(EShapeRuntimeImpl.TRANSIENT_STATES);
             this.isStateChanged = wasStateChanged;
@@ -38653,7 +38681,7 @@ var onDeserializedConnectorLine = function (item, shape, mapping, manager) {
                 manager.setExtension(resourceId, parsed);
             }
             // Lock
-            shape.lock();
+            shape.lock(EShapeLockPart.CONNECTOR);
             // Points
             var points = shape.points;
             points.deserialize(parsed[1], manager);
@@ -38671,7 +38699,7 @@ var onDeserializedConnectorLine = function (item, shape, mapping, manager) {
                 body.set(EShapeConnectorBodies.from(points.values, edge.tail.margin, edge.head.margin));
             }
             // Unlock
-            shape.unlock();
+            shape.unlock(EShapeLockPart.CONNECTOR, true);
         }
     }
 };
@@ -39611,6 +39639,7 @@ var EShapeGroup = /** @class */ (function (_super) {
             clone.parent = result;
             result.children.push(clone);
         }
+        EShapeConnectors.moveAll(children, result.children, children, result.children);
         result.onChildTransformChange();
         result.toDirty();
         return result;
@@ -45498,7 +45527,7 @@ var toResized = function (shape, from, to, centerMode, isPerfect) {
     var cposition = EShapeCapabilities.contains(shape, EShapeCapability.POSITION);
     var cwidth = EShapeCapabilities.contains(shape, EShapeCapability.WIDTH);
     var cheight = EShapeCapabilities.contains(shape, EShapeCapability.HEIGHT);
-    shape.disallowUploadedUpdate();
+    shape.lock(EShapeLockPart.UPLOADED);
     var position = shape.transform.position;
     if (centerMode) {
         var dx = Math.abs(to.x - from.x);
@@ -45595,7 +45624,7 @@ var toResized = function (shape, from, to, centerMode, isPerfect) {
             }
         }
     }
-    shape.allowUploadedUpdate();
+    shape.unlock(EShapeLockPart.UPLOADED, true);
 };
 
 /*
@@ -45851,14 +45880,26 @@ var EShapeSearch = /** @class */ (function () {
 var EShapeDeleter = /** @class */ (function () {
     function EShapeDeleter() {
     }
+    EShapeDeleter.addAll = function (shapes, result) {
+        for (var i = 0, imax = shapes.length; i < imax; ++i) {
+            var shape = shapes[i];
+            result.add(shape);
+            this.addAll(shape.children, result);
+        }
+        return result;
+    };
     EShapeDeleter.delete = function (parent, shapes, generateListOfDetachedShapes) {
+        var _a;
         var children = parent.children;
         var length = children.length;
         // Update indices
+        var exceptions = ((_a = EShapeDeleter.EXCEPTIONS) !== null && _a !== void 0 ? _a : (EShapeDeleter.EXCEPTIONS = new Set()));
         for (var i = 0; i < length; ++i) {
             var child = children[i];
             if (child.selected) {
                 child.index = length + i;
+                exceptions.add(child);
+                this.addAll(child.children, exceptions);
             }
             else {
                 child.index = i;
@@ -45875,9 +45916,10 @@ var EShapeDeleter = /** @class */ (function () {
                     child.parent = null;
                     child.selected = false;
                     child.uploaded = undefined;
-                    child.onDetach();
+                    child.onDetach(exceptions);
                 }
                 else {
+                    exceptions.clear();
                     var size = children.length - (i + 1);
                     if (0 < size) {
                         var result = children.splice(i + 1, size);
@@ -45896,6 +45938,7 @@ var EShapeDeleter = /** @class */ (function () {
                     }
                 }
             }
+            exceptions.clear();
             if (0 < children.length) {
                 var result = children.splice(0, children.length);
                 if (shapes != null) {
@@ -45919,9 +45962,10 @@ var EShapeDeleter = /** @class */ (function () {
                     child.parent = null;
                     child.selected = false;
                     child.uploaded = undefined;
-                    child.onDetach();
+                    child.onDetach(exceptions);
                 }
                 else {
+                    exceptions.clear();
                     children.length = i + 1;
                     if (shapes != null) {
                         shapes.length = 0;
@@ -45931,6 +45975,7 @@ var EShapeDeleter = /** @class */ (function () {
                     return null;
                 }
             }
+            exceptions.clear();
             if (0 < children.length) {
                 children.length = 0;
                 if (shapes != null) {
@@ -46866,7 +46911,7 @@ var UtilSvgAtlasBuilder = /** @class */ (function () {
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var DThemeWhiteAtlas = new UtilSvgAtlasBuilder(256, 1, 3);
+var DThemeWhiteAtlas = new UtilSvgAtlasBuilder(512, 1, 3);
 
 /*
  * Copyright (C) 2019 Toshiba Corporation
@@ -56802,7 +56847,7 @@ var loadThemeWhiteAll = function () {
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var DThemeDarkAtlas = new UtilSvgAtlasBuilder(256, 1, 3);
+var DThemeDarkAtlas = new UtilSvgAtlasBuilder(512, 1, 3);
 
 /*
  * Copyright (C) 2019 Toshiba Corporation
@@ -74985,7 +75030,7 @@ var DChartAxisBaseBar = /** @class */ (function () {
             var plotAreaWidth = plotArea.width;
             var plotAreaHeight = plotArea.height;
             var offset = this._parser.padding * index;
-            shape.disallowUploadedUpdate();
+            shape.lock(EShapeLockPart.UPLOADED);
             var position = shape.transform.position;
             var size = shape.size;
             switch (this._parser.position) {
@@ -75006,7 +75051,7 @@ var DChartAxisBaseBar = /** @class */ (function () {
                     size.set(0, plotAreaHeight);
                     break;
             }
-            shape.allowUploadedUpdate();
+            shape.unlock(EShapeLockPart.UPLOADED, true);
             return true;
         }
         return false;
@@ -76054,18 +76099,18 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
         return true;
     };
     DChartAxisBaseTickContainer.prototype.showMajor = function (shape, x, y, text) {
-        shape.disallowUploadedUpdate();
+        shape.lock(EShapeLockPart.UPLOADED);
         shape.visible = true;
         shape.transform.position.set(x, y);
         shape.text.value = text != null ? text : "";
-        shape.allowUploadedUpdate();
+        shape.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartAxisBaseTickContainer.prototype.showMajorGridline = function (shape, value, x, y, sx, sy) {
-        shape.disallowUploadedUpdate();
+        shape.lock(EShapeLockPart.UPLOADED);
         shape.visible = true;
         shape.transform.position.set(x, y);
         shape.size.set(sx, sy);
-        shape.allowUploadedUpdate();
+        shape.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartAxisBaseTickContainer.prototype.hideMajor = function (shape) {
         shape.visible = false;
@@ -76074,11 +76119,11 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
         shape.visible = false;
     };
     DChartAxisBaseTickContainer.prototype.showMinor = function (shape, x, y, text) {
-        shape.disallowUploadedUpdate();
+        shape.lock(EShapeLockPart.UPLOADED);
         shape.visible = true;
         shape.transform.position.set(x, y);
         shape.text.value = text != null ? text : "";
-        shape.allowUploadedUpdate();
+        shape.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartAxisBaseTickContainer.prototype.hideMinor = function (shape) {
         shape.visible = false;
@@ -76541,7 +76586,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
     DChartAxisGuideSimpleShapeImpl.prototype.update = function (position, x, y, visible, width, height, offset) {
         var bar = this._bar;
         if (bar != null) {
-            bar.disallowUploadedUpdate();
+            bar.lock(EShapeLockPart.UPLOADED);
             switch (position) {
                 case DChartAxisPosition.TOP:
                     bar.transform.position.set(x, y);
@@ -76564,7 +76609,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
                     bar.visible = visible;
                     break;
             }
-            bar.allowUploadedUpdate();
+            bar.unlock(EShapeLockPart.UPLOADED, true);
         }
         var label = this._label;
         if (label != null) {
@@ -76572,7 +76617,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
             var s = label.size;
             var ox = offset + s.x * 0.5 + m;
             var oy = offset + s.y * 0.5 + m;
-            label.disallowUploadedUpdate();
+            label.lock(EShapeLockPart.UPLOADED);
             switch (position) {
                 case DChartAxisPosition.TOP:
                     label.transform.position.set(x, -oy);
@@ -76591,7 +76636,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
                     label.visible = visible;
                     break;
             }
-            label.allowUploadedUpdate();
+            label.unlock(EShapeLockPart.UPLOADED, true);
         }
         var tick = this._tick;
         if (tick != null) {
@@ -76599,7 +76644,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
             var s = tick.size;
             var ox = offset + s.x * 0.5 + m;
             var oy = offset + s.y * 0.5 + m;
-            tick.disallowUploadedUpdate();
+            tick.lock(EShapeLockPart.UPLOADED);
             switch (position) {
                 case DChartAxisPosition.TOP:
                     tick.transform.position.set(x, -oy);
@@ -76618,7 +76663,7 @@ var DChartAxisGuideSimpleShapeImpl = /** @class */ (function () {
                     tick.visible = visible;
                     break;
             }
-            tick.allowUploadedUpdate();
+            tick.unlock(EShapeLockPart.UPLOADED, true);
         }
         return true;
     };
@@ -79429,9 +79474,9 @@ var DChartSeriesLineOfAny = /** @class */ (function (_super) {
             values[i + 0] -= cx;
             values[i + 1] -= cy;
         }
-        line.disallowUploadedUpdate();
+        line.lock(EShapeLockPart.UPLOADED);
         this.applyLine(line, xcoordinate, ycoordinate, sx, sy, cx, cy, values);
-        line.allowUploadedUpdate();
+        line.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartSeriesLineOfAny.prototype.adjustLineRegion = function (xmin, xmax, ymin, ymax, result) {
         result.xmin = xmin;
@@ -79921,7 +79966,7 @@ var DChartSeriesLine = /** @class */ (function (_super) {
         return false;
     };
     DChartSeriesLine.prototype.doUpdateLine = function (line, xcoordinate, ycoordinate, isPointsDirty) {
-        line.disallowUploadedUpdate();
+        line.lock(EShapeLockPart.UPLOADED);
         if (isPointsDirty) {
             var values = line.points.values;
             var segments = line.points.segments;
@@ -80004,7 +80049,7 @@ var DChartSeriesLine = /** @class */ (function (_super) {
         }
         line.transform.position.set(xcoordinate.transform.map(this._centerX), ycoordinate.transform.map(this._centerY));
         line.transform.scale.set(xcoordinate.transform.scale, ycoordinate.transform.scale);
-        line.allowUploadedUpdate();
+        line.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartSeriesLine.prototype.updateRegion = function () {
         var pointId = this._pointId;
@@ -80363,12 +80408,12 @@ var DChartSeriesLinear = /** @class */ (function (_super) {
         if (0 < segments.length) {
             segments.length = 0;
         }
-        line.disallowUploadedUpdate();
+        line.lock(EShapeLockPart.UPLOADED);
         line.points.set(values, segments);
         line.points.toFitted(sx, sy);
         line.size.set(sx, sy);
         line.transform.position.set(cx, cy);
-        line.allowUploadedUpdate();
+        line.unlock(EShapeLockPart.UPLOADED, true);
     };
     DChartSeriesLinear.prototype.updateRegion = function () {
         // DO NOTHING
@@ -81959,23 +82004,23 @@ var DDiagramCanvasEditorSnap = /** @class */ (function () {
         var shape = null;
         if (index < shapes.length) {
             shape = shapes[index];
-            shape.disallowUploadedUpdate();
+            shape.lock(EShapeLockPart.UPLOADED);
             shape.points.position = position;
             shape.transform.position.set(x, y);
             shape.stroke.set(true, style.color, style.alpha, style.width, undefined, undefined, style.style);
             shape.size.set(w, h);
             shape.visible = true;
-            shape.allowUploadedUpdate();
+            shape.unlock(EShapeLockPart.UPLOADED, true);
         }
         else {
             shape = new EShapeBar();
-            shape.disallowUploadedUpdate();
+            shape.lock(EShapeLockPart.UPLOADED);
             shape.points.position = position;
             shape.transform.position.set(x, y);
             shape.stroke.set(true, style.color, style.alpha, style.width, undefined, undefined, style.style);
             shape.size.set(w, h);
             shape.visible = true;
-            shape.allowUploadedUpdate();
+            shape.unlock(EShapeLockPart.UPLOADED, true);
             shape.attach(container);
         }
     };
@@ -95722,6 +95767,8 @@ exports.EShapeLineOfRectangles = EShapeLineOfRectangles;
 exports.EShapeLineOfTriangleRoundeds = EShapeLineOfTriangleRoundeds;
 exports.EShapeLineOfTriangles = EShapeLineOfTriangles;
 exports.EShapeLinePoints = EShapeLinePoints;
+exports.EShapeLock = EShapeLock;
+exports.EShapeLockPart = EShapeLockPart;
 exports.EShapeNull = EShapeNull;
 exports.EShapeOnDeserializeds = EShapeOnDeserializeds;
 exports.EShapePointsFormatters = EShapePointsFormatters;