@wcardinal/wcardinal-ui 0.377.0 → 0.378.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.377.0
+ Winter Cardinal UI v0.378.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -16207,10 +16207,23 @@ var DViewImpl = /** @class */ (function (_super) {
         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) {
@@ -16218,29 +16231,33 @@ var DViewImpl = /** @class */ (function (_super) {
         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) {
@@ -56430,10 +56447,10 @@ var DThemeWhiteView = /** @class */ (function () {
         return 333;
     };
     DThemeWhiteView.prototype.getZoomMin = function () {
-        return 0.05;
+        return 0.01;
     };
     DThemeWhiteView.prototype.getZoomMax = function () {
-        return 20;
+        return 100;
     };
     DThemeWhiteView.prototype.getZoomKeepRatio = function () {
         return true;
@@ -65717,10 +65734,10 @@ var DThemeDarkView = /** @class */ (function () {
         return 333;
     };
     DThemeDarkView.prototype.getZoomMin = function () {
-        return 0.05;
+        return 0.01;
     };
     DThemeDarkView.prototype.getZoomMax = function () {
-        return 20;
+        return 100;
     };
     DThemeDarkView.prototype.getZoomKeepRatio = function () {
         return true;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.377.0
+ 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);
-                }
-                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);
+                    ntsx = this.toNormalizedScale(ntsx);
+                    ntsy = this.toNormalizedScale(ntsy);
+                }
+                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) {