@wcardinal/wcardinal-ui 0.432.0 → 0.434.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.432.0
+ Winter Cardinal UI v0.434.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -56317,9 +56317,23 @@ var loadThemeWhiteEnUsDiagram = function () {
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var toGridSize$1 = function (grid, width, height) {
+var toGridScale$1 = function (scale) {
+    if (scale <= 0 || 1 <= scale) {
+        return 1;
+    }
+    var s = 1 / scale;
+    s = s | (s >> 1);
+    s = s | (s >> 2);
+    s = s | (s >> 4);
+    s = s | (s >> 8);
+    s = s | (s >> 16);
+    s = s | (s >> 32);
+    return s - (s >> 1);
+};
+var toGridSize$1 = function (grid, width, height, scale) {
     var canvas = Math.max(width, height);
     if (0 < grid) {
+        grid *= toGridScale$1(scale);
         var minimum = canvas / 1000;
         for (var i = 0; i < 10 && grid < minimum; ++i) {
             grid *= 10;
@@ -56375,9 +56389,6 @@ var DThemeWhiteDiagramCanvasEditor = /** @class */ (function (_super) {
     DThemeWhiteDiagramCanvasEditor.prototype.getSnapGridSize = function () {
         return toGridSize$1;
     };
-    DThemeWhiteDiagramCanvasEditor.prototype.isSnapGridAdaptive = function () {
-        return true;
-    };
     DThemeWhiteDiagramCanvasEditor.prototype.getSnapTargetColor = function () {
         return DThemeWhiteConstants.HIGHLIGHT_COLOR;
     };
@@ -66853,9 +66864,23 @@ var loadThemeDarkEnUsDiagram = function () {
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var toGridSize = function (grid, width, height) {
+var toGridScale = function (scale) {
+    if (scale <= 0 || 1 <= scale) {
+        return 1;
+    }
+    var s = 1 / scale;
+    s = s | (s >> 1);
+    s = s | (s >> 2);
+    s = s | (s >> 4);
+    s = s | (s >> 8);
+    s = s | (s >> 16);
+    s = s | (s >> 32);
+    return s - (s >> 1);
+};
+var toGridSize = function (grid, width, height, scale) {
     var canvas = Math.max(width, height);
     if (0 < grid) {
+        grid *= toGridScale(scale);
         var minimum = canvas / 1000;
         for (var i = 0; i < 10 && grid < minimum; ++i) {
             grid *= 10;
@@ -66911,9 +66936,6 @@ var DThemeDarkDiagramCanvasEditor = /** @class */ (function (_super) {
     DThemeDarkDiagramCanvasEditor.prototype.getSnapGridSize = function () {
         return toGridSize;
     };
-    DThemeDarkDiagramCanvasEditor.prototype.isSnapGridAdaptive = function () {
-        return true;
-    };
     DThemeDarkDiagramCanvasEditor.prototype.getSnapTargetColor = function () {
         return DThemeDarkConstants.HIGHLIGHT_COLOR;
     };
@@ -87324,25 +87346,26 @@ var DDiagramCanvasEditorSnap = /** @class */ (function () {
         parent.addChildAt(container, parent.children.length - 1);
         // Grid
         this._grid = this.toGrid(theme, options.grid);
-        this._gridScale = this.toGridScale(parent.scale.x);
+        this._gridParentWidth = parent.width;
+        this._gridParentHeight = parent.height;
+        this._gridParentScale = parent.scale.x;
+        this._gridSize = this.newGridSize();
         // Target
         this._target = this.toTarget(theme, options.target);
     }
     DDiagramCanvasEditorSnap.prototype.toGrid = function (theme, options) {
-        var _a, _b;
+        var _a;
         if (options != null) {
             return {
                 major: this.toGridMajor(theme, options.major),
                 minor: this.toGridMinor(theme, options.minor),
-                size: (_a = options.size) !== null && _a !== void 0 ? _a : theme.getSnapGridSize(),
-                adaptive: (_b = options.adaptive) !== null && _b !== void 0 ? _b : theme.isSnapGridAdaptive()
+                size: (_a = options.size) !== null && _a !== void 0 ? _a : theme.getSnapGridSize()
             };
         }
         return {
             major: this.toGridMajor(theme),
             minor: this.toGridMinor(theme),
-            size: theme.getSnapGridSize(),
-            adaptive: theme.isSnapGridAdaptive()
+            size: theme.getSnapGridSize()
         };
     };
     DDiagramCanvasEditorSnap.prototype.toGridMajor = function (theme, options) {
@@ -87413,25 +87436,23 @@ var DDiagramCanvasEditorSnap = /** @class */ (function () {
         return this._controller.serialize();
     };
     DDiagramCanvasEditorSnap.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
-        this._isDirty = true;
+        this._gridParentWidth = newWidth;
+        this._gridParentHeight = newHeight;
+        this.updateGridSize();
     };
     DDiagramCanvasEditorSnap.prototype.onScale = function (newX, newY, oldX, oldY) {
-        var gridScale = this.toGridScale(newX);
-        if (this._gridScale !== gridScale) {
-            this._gridScale = gridScale;
+        this._gridParentScale = newX;
+        this.updateGridSize();
+    };
+    DDiagramCanvasEditorSnap.prototype.updateGridSize = function () {
+        var gridSize = this.newGridSize();
+        if (this._gridSize !== gridSize) {
+            this._gridSize = gridSize;
             this._isDirty = true;
         }
     };
-    DDiagramCanvasEditorSnap.prototype.toGridScale = function (sx) {
-        if (!this._grid.adaptive || sx <= 0 || 1 <= sx) {
-            return 1;
-        }
-        var target = 1 / sx;
-        var result = 1;
-        while (result < target && result < Number.MAX_SAFE_INTEGER) {
-            result <<= 1;
-        }
-        return result;
+    DDiagramCanvasEditorSnap.prototype.newGridSize = function () {
+        return this._grid.size(this._controller.grid.size, this._gridParentWidth, this._gridParentHeight, this._gridParentScale);
     };
     DDiagramCanvasEditorSnap.prototype.onRender = function () {
         if (this._isDirty) {
@@ -87440,14 +87461,13 @@ var DDiagramCanvasEditorSnap = /** @class */ (function () {
         }
     };
     DDiagramCanvasEditorSnap.prototype.updateAll = function () {
-        var parent = this._parent;
         var container = this._container;
         var controller = this._controller;
         var isGridVisible = controller.grid.visible;
         var isTargetVisible = controller.target.visible;
         if (isGridVisible || isTargetVisible) {
-            var w = parent.width;
-            var h = parent.height;
+            var w = this._gridParentWidth;
+            var h = this._gridParentHeight;
             var wh = 0.5 * w;
             var hh = 0.5 * h;
             var TOP = EShapeBarPosition.TOP;
@@ -87460,7 +87480,7 @@ var DDiagramCanvasEditorSnap = /** @class */ (function () {
                 var major = grid.major;
                 var minor = grid.minor;
                 var interval = major.interval;
-                var size = grid.size(controller.grid.size * this._gridScale, w, h);
+                var size = this._gridSize;
                 for (var x = size, ix = 1; x < w; x += size, ix += 1, index += 1) {
                     var style = ix % interval === 0 ? major : minor;
                     this.update(container, shapes, index, x, hh, TOP, w, h, style);

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.432.0
+ Winter Cardinal UI v0.434.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -66157,25 +66157,26 @@
             parent.addChildAt(container, parent.children.length - 1);
             // Grid
             this._grid = this.toGrid(theme, options.grid);
-            this._gridScale = this.toGridScale(parent.scale.x);
+            this._gridParentWidth = parent.width;
+            this._gridParentHeight = parent.height;
+            this._gridParentScale = parent.scale.x;
+            this._gridSize = this.newGridSize();
             // Target
             this._target = this.toTarget(theme, options.target);
         }
         DDiagramCanvasEditorSnap.prototype.toGrid = function (theme, options) {
-            var _a, _b;
+            var _a;
             if (options != null) {
                 return {
                     major: this.toGridMajor(theme, options.major),
                     minor: this.toGridMinor(theme, options.minor),
-                    size: (_a = options.size) !== null && _a !== void 0 ? _a : theme.getSnapGridSize(),
-                    adaptive: (_b = options.adaptive) !== null && _b !== void 0 ? _b : theme.isSnapGridAdaptive()
+                    size: (_a = options.size) !== null && _a !== void 0 ? _a : theme.getSnapGridSize()
                 };
             }
             return {
                 major: this.toGridMajor(theme),
                 minor: this.toGridMinor(theme),
-                size: theme.getSnapGridSize(),
-                adaptive: theme.isSnapGridAdaptive()
+                size: theme.getSnapGridSize()
             };
         };
         DDiagramCanvasEditorSnap.prototype.toGridMajor = function (theme, options) {
@@ -66246,25 +66247,23 @@
             return this._controller.serialize();
         };
         DDiagramCanvasEditorSnap.prototype.onResize = function (newWidth, newHeight, oldWidth, oldHeight) {
-            this._isDirty = true;
+            this._gridParentWidth = newWidth;
+            this._gridParentHeight = newHeight;
+            this.updateGridSize();
         };
         DDiagramCanvasEditorSnap.prototype.onScale = function (newX, newY, oldX, oldY) {
-            var gridScale = this.toGridScale(newX);
-            if (this._gridScale !== gridScale) {
-                this._gridScale = gridScale;
+            this._gridParentScale = newX;
+            this.updateGridSize();
+        };
+        DDiagramCanvasEditorSnap.prototype.updateGridSize = function () {
+            var gridSize = this.newGridSize();
+            if (this._gridSize !== gridSize) {
+                this._gridSize = gridSize;
                 this._isDirty = true;
             }
         };
-        DDiagramCanvasEditorSnap.prototype.toGridScale = function (sx) {
-            if (!this._grid.adaptive || sx <= 0 || 1 <= sx) {
-                return 1;
-            }
-            var target = 1 / sx;
-            var result = 1;
-            while (result < target && result < Number.MAX_SAFE_INTEGER) {
-                result <<= 1;
-            }
-            return result;
+        DDiagramCanvasEditorSnap.prototype.newGridSize = function () {
+            return this._grid.size(this._controller.grid.size, this._gridParentWidth, this._gridParentHeight, this._gridParentScale);
         };
         DDiagramCanvasEditorSnap.prototype.onRender = function () {
             if (this._isDirty) {
@@ -66273,14 +66272,13 @@
             }
         };
         DDiagramCanvasEditorSnap.prototype.updateAll = function () {
-            var parent = this._parent;
             var container = this._container;
             var controller = this._controller;
             var isGridVisible = controller.grid.visible;
             var isTargetVisible = controller.target.visible;
             if (isGridVisible || isTargetVisible) {
-                var w = parent.width;
-                var h = parent.height;
+                var w = this._gridParentWidth;
+                var h = this._gridParentHeight;
                 var wh = 0.5 * w;
                 var hh = 0.5 * h;
                 var TOP = EShapeBarPosition.TOP;
@@ -66293,7 +66291,7 @@
                     var major = grid.major;
                     var minor = grid.minor;
                     var interval = major.interval;
-                    var size = grid.size(controller.grid.size * this._gridScale, w, h);
+                    var size = this._gridSize;
                     for (var x = size, ix = 1; x < w; x += size, ix += 1, index += 1) {
                         var style = ix % interval === 0 ? major : minor;
                         this.update(container, shapes, index, x, hh, TOP, w, h, style);