@wcardinal/wcardinal-ui 0.376.3 → 0.378.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.376.3
+ Winter Cardinal UI v0.378.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -16204,10 +16204,23 @@
             var parent = this._parent;
             var target = this._toTarget(parent);
             if (target) {
-                var targetRect = target.getLocalBounds(this._workRect);
-                var newTargetX = (parent.width - targetRect.width) * 0.5 - targetRect.x;
-                var newTargetY = (parent.height - targetRect.height) * 0.5 - targetRect.y;
-                this._transform.start(target, newTargetX, newTargetY, 1, 1, duration, stop);
+                var padding = parent.padding;
+                var pl = padding.getLeft();
+                var pt = padding.getTop();
+                var pr = padding.getRight();
+                var pb = padding.getBottom();
+                var w = parent.width;
+                var h = parent.height;
+                var sw = w - pl - pr;
+                var sh = h - pt - pb;
+                var trect = target.getLocalBounds(this._workRect);
+                var tx = trect.x;
+                var ty = trect.y;
+                var tw = trect.width;
+                var th = trect.height;
+                var ntx = pl + (sw - tw) * 0.5 - tx;
+                var nty = pt + (sh - th) * 0.5 - ty;
+                this._transform.start(target, ntx, nty, 1, 1, duration, stop);
             }
         };
         DViewImpl.prototype.fit = function (duration, stop) {
@@ -16215,29 +16228,33 @@
             var target = this._toTarget(parent);
             if (target) {
                 var padding = parent.padding;
-                var width = parent.width;
-                var height = parent.height;
-                var targetRect = target.getLocalBounds(this._workRect);
-                var targetX = targetRect.x;
-                var targetY = targetRect.y;
-                var targetWidth = targetRect.width;
-                var targetHeight = targetRect.height;
-                var newTargetScaleX = (width - padding.getLeft() - padding.getRight()) / targetWidth;
-                var newTargetScaleY = (height - padding.getTop() - padding.getBottom()) / targetHeight;
+                var pl = padding.getLeft();
+                var pt = padding.getTop();
+                var pr = padding.getRight();
+                var pb = padding.getBottom();
+                var w = parent.width;
+                var h = parent.height;
+                var sw = w - pl - pr;
+                var sh = h - pt - pb;
+                var trect = target.getLocalBounds(this._workRect);
+                var tx = trect.x;
+                var ty = trect.y;
+                var tw = trect.width;
+                var th = trect.height;
+                var ntsx = sw / tw;
+                var ntsy = sh / th;
                 if (this._zoomKeepRatio) {
-                    var newTargetScale = this.toNormalizedScale(Math.min(newTargetScaleX, newTargetScaleY));
-                    newTargetScaleX = newTargetScale;
-                    newTargetScaleY = newTargetScale;
+                    var nts = this.toNormalizedScale(Math.min(ntsx, ntsy));
+                    ntsx = nts;
+                    ntsy = nts;
                 }
                 else {
-                    newTargetScaleX = this.toNormalizedScale(newTargetScaleX);
-                    newTargetScaleY = this.toNormalizedScale(newTargetScaleY);
+                    ntsx = this.toNormalizedScale(ntsx);
+                    ntsy = this.toNormalizedScale(ntsy);
                 }
-                var newTargetWidth = targetWidth * newTargetScaleX;
-                var newTargetHeight = targetHeight * newTargetScaleY;
-                var newTargetX = (width - newTargetWidth) * 0.5 - targetX * newTargetScaleX;
-                var newTargetY = (height - newTargetHeight) * 0.5 - targetY * newTargetScaleY;
-                this._transform.start(target, newTargetX, newTargetY, newTargetScaleX, newTargetScaleY, duration, stop);
+                var ntx = pl + (sw - tw * ntsx) * 0.5 - tx * ntsx;
+                var nty = pt + (sh - th * ntsy) * 0.5 - ty * ntsy;
+                this._transform.start(target, ntx, nty, ntsx, ntsy, duration, stop);
             }
         };
         DViewImpl.prototype.zoomIn = function (duration, stop) {
@@ -45637,329 +45654,6 @@
         return EShapeDataValueExtensions;
     }());
 
-    /*
-     * Copyright (C) 2019 Toshiba Corporation
-     * SPDX-License-Identifier: Apache-2.0
-     */
-    /**
-     * {@link EShape} search utility.
-     */
-    var EShapeSearch = /** @class */ (function () {
-        function EShapeSearch() {
-        }
-        /**
-         * Returns indices of the given shapes.
-         *
-         * @param shapes shapes
-         * @return indices
-         */
-        EShapeSearch.toIndices = function (shapes) {
-            var result = [];
-            for (var i = 0, imax = shapes.length; i < imax; ++i) {
-                result.push(shapes[i].index);
-            }
-            return result;
-        };
-        /**
-         * Returns a depth of the given shape.
-         *
-         * @param shape a shape
-         * @return a depth
-         */
-        EShapeSearch.toDepth = function (shape) {
-            var result = 0;
-            var parent = shape.parent;
-            while (parent instanceof EShapeBase) {
-                result += 1;
-                parent = parent.parent;
-            }
-            return result;
-        };
-        /**
-         * Returns a deepest shape on the path to the given shapes.
-         *
-         * @param shapeA a shape
-         * @param shapeB a shape
-         * @return a found shape
-         */
-        EShapeSearch.toSharedParent = function (shapeA, shapeB) {
-            var depthA = this.toDepth(shapeA);
-            var depthB = this.toDepth(shapeB);
-            if (depthA < depthB) {
-                var parent_1 = shapeA.parent;
-                while (parent_1 instanceof EShapeBase) {
-                    if (this.isParent(shapeB, parent_1)) {
-                        return parent_1;
-                    }
-                    parent_1 = parent_1.parent;
-                }
-                return parent_1;
-            }
-            else {
-                var parent_2 = shapeB.parent;
-                while (parent_2 instanceof EShapeBase) {
-                    if (this.isParent(shapeA, parent_2)) {
-                        return parent_2;
-                    }
-                    parent_2 = parent_2.parent;
-                }
-                return parent_2;
-            }
-        };
-        /**
-         * Returns a shape on the path to the given shape whose parent is equals to the given parent.
-         * If there is no such shape, returns a root shape on the path.
-         *
-         * @param shape a shape
-         * @param parent a parent
-         * @returns a found shape
-         */
-        EShapeSearch.toOfParent = function (shape, parent) {
-            var shapeParent = shape.parent;
-            while (shapeParent !== parent && shapeParent instanceof EShapeBase) {
-                shape = shapeParent;
-                shapeParent = shapeParent.parent;
-            }
-            return shape;
-        };
-        /**
-         * Returns true if the given target is on the path to the given shape.
-         *
-         * @param shape a shape
-         * @param target a check target
-         * @return true if the given target is on the path to the given shape
-         */
-        EShapeSearch.isParent = function (shape, target) {
-            var parent = shape.parent;
-            while (parent instanceof EShapeBase) {
-                if (parent === target) {
-                    return true;
-                }
-                parent = parent.parent;
-            }
-            return false;
-        };
-        /**
-         * Returns a selected shape on the path to the given shape.
-         * If there are more than one selected shapes, returns a deepest selected shape.
-         *
-         * @param shape a shape
-         * @return a found selected shape or null
-         */
-        EShapeSearch.toSelected = function (shape) {
-            var target = shape;
-            while (target instanceof EShapeBase) {
-                if (target.selected) {
-                    return target;
-                }
-                target = target.parent;
-            }
-            return null;
-        };
-        EShapeSearch.findChildById = function (shape, id, recursively) {
-            var children = shape.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (child.id === id) {
-                    return child;
-                }
-                if (recursively === true) {
-                    var result = EShapeSearch.findChildById(child, id, recursively);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-            return null;
-        };
-        EShapeSearch.findChildByType = function (shape, type, recursively) {
-            var children = shape.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (child.type === type) {
-                    return child;
-                }
-                if (recursively === true) {
-                    var result = EShapeSearch.findChildByType(child, type, recursively);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-            return null;
-        };
-        EShapeSearch.findChild = function (shape, matcher, recursively) {
-            var children = shape.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (matcher(child)) {
-                    return child;
-                }
-                if (recursively === true) {
-                    var result = EShapeSearch.findChild(child, matcher, recursively);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-            return null;
-        };
-        EShapeSearch.findChildrenByType = function (shape, type, recursively, result) {
-            result = result || [];
-            var children = shape.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (child.type === type) {
-                    result.push(child);
-                }
-                if (recursively === true) {
-                    EShapeSearch.findChildrenByType(child, type, recursively, result);
-                }
-            }
-            return result;
-        };
-        EShapeSearch.findChildren = function (shape, matcher, recursively, result) {
-            result = result || [];
-            var children = shape.children;
-            for (var i = 0, imax = children.length; i < imax; ++i) {
-                var child = children[i];
-                if (matcher(child)) {
-                    result.push(child);
-                }
-                if (recursively === true) {
-                    EShapeSearch.findChildren(child, matcher, recursively, result);
-                }
-            }
-            return result;
-        };
-        EShapeSearch.COMPARATOR_INDEX = function (a, b) {
-            return a.index - b.index;
-        };
-        return EShapeSearch;
-    }());
-
-    /*
-     * Copyright (C) 2019 Toshiba Corporation
-     * SPDX-License-Identifier: Apache-2.0
-     */
-    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;
-                }
-            }
-            // Sort
-            children.sort(EShapeSearch.COMPARATOR_INDEX);
-            // Detach
-            if (generateListOfDetachedShapes === true) {
-                for (var i = length - 1; 0 <= i; --i) {
-                    var child = children[i];
-                    if (child.selected) {
-                        child.index -= length;
-                        child.parent = null;
-                        child.selected = false;
-                        child.uploaded = undefined;
-                        child.onDetach(exceptions);
-                    }
-                    else {
-                        exceptions.clear();
-                        var size = children.length - (i + 1);
-                        if (0 < size) {
-                            var result = children.splice(i + 1, size);
-                            if (shapes != null) {
-                                shapes.length = 0;
-                            }
-                            parent.onChildTransformChange();
-                            parent.toDirty();
-                            return result;
-                        }
-                        else {
-                            if (shapes != null) {
-                                shapes.length = 0;
-                            }
-                            return null;
-                        }
-                    }
-                }
-                exceptions.clear();
-                if (0 < children.length) {
-                    var result = children.splice(0, children.length);
-                    if (shapes != null) {
-                        shapes.length = 0;
-                    }
-                    parent.onChildTransformChange();
-                    parent.toDirty();
-                    return result;
-                }
-                else {
-                    if (shapes != null) {
-                        shapes.length = 0;
-                    }
-                    return null;
-                }
-            }
-            else {
-                for (var i = length - 1; 0 <= i; --i) {
-                    var child = children[i];
-                    if (child.selected) {
-                        child.parent = null;
-                        child.selected = false;
-                        child.uploaded = undefined;
-                        child.onDetach(exceptions);
-                    }
-                    else {
-                        exceptions.clear();
-                        children.length = i + 1;
-                        if (shapes != null) {
-                            shapes.length = 0;
-                        }
-                        parent.onChildTransformChange();
-                        parent.toDirty();
-                        return null;
-                    }
-                }
-                exceptions.clear();
-                if (0 < children.length) {
-                    children.length = 0;
-                    if (shapes != null) {
-                        shapes.length = 0;
-                    }
-                    parent.onChildTransformChange();
-                    parent.toDirty();
-                }
-                else {
-                    if (shapes != null) {
-                        shapes.length = 0;
-                    }
-                }
-                return null;
-            }
-        };
-        return EShapeDeleter;
-    }());
-
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -76418,7 +76112,6 @@
         EShapeDataValueState: EShapeDataValueState,
         EShapeDataValueType: EShapeDataValueType,
         EShapeDefaults: EShapeDefaults,
-        EShapeDeleter: EShapeDeleter,
         EShapeDeserializers: EShapeDeserializers,
         EShapeOnDeserializeds: EShapeOnDeserializeds,
         EShapeEditor: EShapeEditor,
@@ -76444,7 +76137,6 @@
         EShapeRuntimeImpl: EShapeRuntimeImpl,
         EShapeRuntimeReset: EShapeRuntimeReset,
         EShapeRuntimes: EShapeRuntimes,
-        EShapeSearch: EShapeSearch,
         EShapeStateSetImplObservable: EShapeStateSetImplObservable,
         EShapeState: EShapeState,
         EShapeStrokeSide: EShapeStrokeSide,