@wcardinal/wcardinal-ui 0.415.0 → 0.418.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.415.0
+ Winter Cardinal UI v0.418.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -21224,6 +21224,34 @@ var DynamicFontAtlasCharacterType = {
     LETTER_RNB: LETTER_RNB
 };
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var DynamicSDFFontAtlasFont = /** @class */ (function () {
+    function DynamicSDFFontAtlasFont(fontFamily) {
+        this.id = DynamicSDFFontAtlasFont.toFontFamily(fontFamily);
+        this.size = 32;
+        this.italic = false;
+        this.measured = false;
+        this.ascent = 0;
+        this.descent = 0;
+    }
+    DynamicSDFFontAtlasFont.toFontFamily = function (fontFamily) {
+        return fontFamily === "auto" ? DynamicSDFFontAtlasFont.getAutoFontFamily() : fontFamily;
+    };
+    DynamicSDFFontAtlasFont.getAutoFontFamily = function () {
+        if (DynamicSDFFontAtlasFont.FONT_FAMILY_AUTO == null) {
+            DynamicSDFFontAtlasFont.FONT_FAMILY_AUTO = DThemes.getInstance()
+                .get("DBase")
+                .getFontFamilly();
+        }
+        return DynamicSDFFontAtlasFont.FONT_FAMILY_AUTO;
+    };
+    DynamicSDFFontAtlasFont.FONT_FAMILY_AUTO = null;
+    return DynamicSDFFontAtlasFont;
+}());
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -21512,6 +21540,69 @@ var DynamicSDFFontGenerator = /** @class */ (function () {
     return DynamicSDFFontGenerator;
 }());
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var UtilFont = /** @class */ (function () {
+    function UtilFont() {
+    }
+    UtilFont.measure = function (context, font) {
+        if (!font.measured) {
+            if ("fontBoundingBoxAscent" in window.TextMetrics.prototype) {
+                var metrics = context.measureText(pixi_js.TextMetrics.METRICS_STRING);
+                font.ascent = metrics.fontBoundingBoxAscent;
+                font.descent = metrics.fontBoundingBoxDescent;
+            }
+            else {
+                var measured = pixi_js.TextMetrics.measureFont(font.id);
+                font.ascent = measured.ascent;
+                font.descent = measured.descent;
+            }
+            font.measured = true;
+        }
+    };
+    UtilFont.toSize = function (font) {
+        this.setup(font);
+        return parseFloat(window.getComputedStyle(this._span).fontSize);
+    };
+    UtilFont.setup = function (font) {
+        var span = this._span;
+        if (span == null) {
+            span = document.createElement("span");
+            span.innerText = "|ÉqÅ";
+            span.style.border = "none";
+            span.style.margin = "0px";
+            this._span = span;
+        }
+        var block = this._block;
+        if (block == null) {
+            block = document.createElement("div");
+            block.style.display = "inline-block";
+            block.style.width = "0px";
+            block.style.height = "0px";
+            block.style.border = "none";
+            block.style.margin = "0px";
+            block.style.verticalAlign = "baseline";
+            this._block = block;
+        }
+        var div = this._div;
+        if (div == null) {
+            div = document.createElement("div");
+            div.style.position = "absolute";
+            div.style.padding = "0px";
+            div.style.margin = "0px";
+            div.style.visibility = "hidden";
+            div.appendChild(span);
+            div.appendChild(block);
+            document.body.appendChild(div);
+            this._div = div;
+        }
+        span.style.font = font;
+    };
+    return UtilFont;
+}());
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -21521,11 +21612,7 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
         this._id = "font-atlas:".concat(fontFamily);
         this._generator = DynamicSDFFontGenerator.getInstance().init();
         this._canvas = document.createElement("canvas");
-        this._font = {
-            family: DynamicSDFFontAtlas.toFontFamily(fontFamily),
-            size: 32,
-            italic: false
-        };
+        this._font = new DynamicSDFFontAtlasFont(fontFamily);
         this._characters = {};
         this._length = 0;
         this._width = 1;
@@ -21544,7 +21631,7 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
             return this._font;
         },
         set: function (font) {
-            this._font.family = font.family;
+            this._font.id = font.id;
             this._font.size = font.size;
             this._font.italic = font.italic;
         },
@@ -21669,19 +21756,20 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
                     var font = this._font;
                     var characters = this._characters;
                     var characterSize = font.size + 14;
-                    var width = DynamicSDFFontAtlas.toPowerOf2(Math.ceil(Math.sqrt(this._length)) * characterSize);
+                    var width = this.toPowerOf2(Math.ceil(Math.sqrt(this._length)) * characterSize);
                     this._width = width;
-                    var fontStyle = (font.italic ? "italic " : "") + (font.size + "px ") + font.family;
+                    var fontStyle = (font.italic ? "italic " : "") + (font.size + "px ") + font.id;
                     context.font = fontStyle;
                     context.textAlign = "left";
-                    context.textBaseline = "middle";
+                    context.textBaseline = "alphabetic";
                     context.lineWidth = 0;
                     context.lineCap = "round";
                     context.lineJoin = "miter";
-                    context.miterLimit = 0;
+                    context.miterLimit = 10;
                     context.fillStyle = "#FFFFFF";
+                    UtilFont.measure(context, font);
                     var offsetX = 7;
-                    var offsetY = characterSize >> 1;
+                    var offsetY = Math.round((characterSize - (font.ascent + font.descent)) * 0.5 + font.ascent);
                     var x = 0;
                     var y = 0;
                     for (var id in characters) {
@@ -21710,11 +21798,11 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
                     canvas.height = height;
                     context.font = fontStyle;
                     context.textAlign = "left";
-                    context.textBaseline = "middle";
+                    context.textBaseline = "alphabetic";
                     context.lineWidth = 0;
                     context.lineCap = "round";
                     context.lineJoin = "miter";
-                    context.miterLimit = 4;
+                    context.miterLimit = 10;
                     context.fillStyle = "#FFFFFF";
                     context.clearRect(0, 0, width, height);
                     for (var id in characters) {
@@ -21763,25 +21851,13 @@ var DynamicSDFFontAtlas = /** @class */ (function () {
             delete characters[id];
         }
     };
-    DynamicSDFFontAtlas.toFontFamily = function (fontFamily) {
-        return fontFamily === "auto" ? DynamicSDFFontAtlas.getAutoFontFamily() : fontFamily;
-    };
-    DynamicSDFFontAtlas.toPowerOf2 = function (size) {
+    DynamicSDFFontAtlas.prototype.toPowerOf2 = function (size) {
         var result = 32;
         while (result < size) {
             result <<= 1;
         }
         return result;
     };
-    DynamicSDFFontAtlas.getAutoFontFamily = function () {
-        if (DynamicSDFFontAtlas.FONT_FAMILY_AUTO == null) {
-            DynamicSDFFontAtlas.FONT_FAMILY_AUTO = DThemes.getInstance()
-                .get("DBase")
-                .getFontFamilly();
-        }
-        return DynamicSDFFontAtlas.FONT_FAMILY_AUTO;
-    };
-    DynamicSDFFontAtlas.FONT_FAMILY_AUTO = null;
     return DynamicSDFFontAtlas;
 }());
 
@@ -29126,77 +29202,6 @@ var DDynamicTextGeometry = /** @class */ (function (_super) {
     return DDynamicTextGeometry;
 }(pixi_js.MeshGeometry));
 
-/*
- * Copyright (C) 2019 Toshiba Corporation
- * SPDX-License-Identifier: Apache-2.0
- */
-var UtilFont = /** @class */ (function () {
-    function UtilFont() {
-    }
-    UtilFont.measure = function (font) {
-        var results = this._results;
-        if (results == null) {
-            results = new Map();
-            this._results = results;
-        }
-        var result = results.get(font);
-        if (result != null) {
-            return result;
-        }
-        this.setup(font);
-        var blockRect = this._block.getBoundingClientRect();
-        var blockRectTop = blockRect.top;
-        var spanRect = this._span.getBoundingClientRect();
-        var ascent = blockRectTop - spanRect.top;
-        var descent = spanRect.bottom - blockRectTop;
-        result = {
-            ascent: ascent,
-            descent: descent
-        };
-        results.set(font, result);
-        return result;
-    };
-    UtilFont.toSize = function (font) {
-        this.setup(font);
-        return parseFloat(window.getComputedStyle(this._span).fontSize);
-    };
-    UtilFont.setup = function (font) {
-        var span = this._span;
-        if (span == null) {
-            span = document.createElement("span");
-            span.innerText = "|ÉqÅ";
-            span.style.border = "none";
-            span.style.margin = "0px";
-            this._span = span;
-        }
-        var block = this._block;
-        if (block == null) {
-            block = document.createElement("div");
-            block.style.display = "inline-block";
-            block.style.width = "0px";
-            block.style.height = "0px";
-            block.style.border = "none";
-            block.style.margin = "0px";
-            block.style.verticalAlign = "baseline";
-            this._block = block;
-        }
-        var div = this._div;
-        if (div == null) {
-            div = document.createElement("div");
-            div.style.position = "absolute";
-            div.style.padding = "0px";
-            div.style.margin = "0px";
-            div.style.visibility = "hidden";
-            div.appendChild(span);
-            div.appendChild(block);
-            document.body.appendChild(div);
-            this._div = div;
-        }
-        span.style.font = font;
-    };
-    return UtilFont;
-}());
-
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -48452,7 +48457,7 @@ var DThemeWhiteFont = /** @class */ (function () {
     function DThemeWhiteFont() {
     }
     DThemeWhiteFont.prototype.getFontFamilly = function () {
-        return "\"Helvetica Neue\",\"Helvetica\",\"Hiragino Sans\",\"Hiragino Kaku Gothic ProN\",\"BIZ UDPGothic\",\"Arial\",\"Yu Gothic\",\"Meiryo\",sans-serif";
+        return "\"Helvetica Neue\",\"Helvetica\",\"Hiragino Sans\",\"Hiragino Kaku Gothic ProN\",\"BIZ UDPGothic\",\"Arial\",\"Yu Gothic UI\",\"Meiryo UI\",sans-serif";
     };
     DThemeWhiteFont.prototype.getFontSize = function () {
         return 14;
@@ -59601,7 +59606,7 @@ var DThemeDarkFont = /** @class */ (function () {
     function DThemeDarkFont() {
     }
     DThemeDarkFont.prototype.getFontFamilly = function () {
-        return "\"Helvetica Neue\",\"Helvetica\",\"Hiragino Sans\",\"Hiragino Kaku Gothic ProN\",\"BIZ UDPGothic\",\"Arial\",\"Yu Gothic\",\"Meiryo\",sans-serif";
+        return "\"Helvetica Neue\",\"Helvetica\",\"Hiragino Sans\",\"Hiragino Kaku Gothic ProN\",\"BIZ UDPGothic\",\"Arial\",\"Yu Gothic UI\",\"Meiryo UI\",sans-serif";
     };
     DThemeDarkFont.prototype.getFontSize = function () {
         return 14;
@@ -70060,9 +70065,9 @@ var DynamicFontAtlasFont = /** @class */ (function () {
         this.size = size;
         this.color = pixi_js.utils.hex2string(color);
         this.height = size + padding * 2;
-        var metrics = UtilFont.measure(fontId);
-        this.ascent = metrics.ascent;
-        this.descent = metrics.descent;
+        this.measured = false;
+        this.ascent = 0;
+        this.descent = 0;
     }
     return DynamicFontAtlasFont;
 }());
@@ -70263,7 +70268,7 @@ var DynamicFontAtlas = /** @class */ (function () {
             context.lineWidth = 0;
             context.lineCap = "round";
             context.lineJoin = "miter";
-            context.miterLimit = 0;
+            context.miterLimit = 10;
             context.fillStyle = font.color;
             context.strokeStyle = "#0000ff";
         }
@@ -70280,7 +70285,6 @@ var DynamicFontAtlas = /** @class */ (function () {
                 var characters = this._characters;
                 var width = (this._width = this.toPowerOf2(Math.ceil(Math.sqrt(this._length)) * fontHeight));
                 var offsetX = this._padding;
-                var offsetY = Math.round((fontHeight - (font.ascent + font.descent)) * 0.5 + font.ascent);
                 var x = 0;
                 var y = 0;
                 for (var key in characters) {
@@ -70292,7 +70296,6 @@ var DynamicFontAtlas = /** @class */ (function () {
                     character.x = x;
                     character.y = y;
                     character.origin.x = x + offsetX;
-                    character.origin.y = y + offsetY;
                     x += character.width;
                 }
                 var height = (this._height = y + fontHeight);
@@ -70307,11 +70310,14 @@ var DynamicFontAtlas = /** @class */ (function () {
                 canvas.height = realHeight;
                 var context = this.getContext();
                 if (context != null) {
+                    UtilFont.measure(context, font);
+                    var offsetY = Math.round((fontHeight - (font.ascent + font.descent)) * 0.5 + font.ascent);
                     context.save();
                     context.scale(resolution, resolution);
                     context.clearRect(0, 0, width, height);
                     for (var key in characters) {
                         var character = characters[key];
+                        character.origin.y = character.y + offsetY;
                         context.fillText(key, character.origin.x, character.origin.y);
                     }
                     context.restore();
@@ -100079,6 +100085,8 @@ exports.DTableCategory = DTableCategory;
 exports.DTableCategoryCell = DTableCategoryCell;
 exports.DTableCategoryColumnImpl = DTableCategoryColumnImpl;
 exports.DTableCategoryContainerImpl = DTableCategoryContainerImpl;
+exports.DTableCellEdge = DTableCellEdge;
+exports.DTableCellEdgeHovered = DTableCellEdgeHovered;
 exports.DTableColumnContainerImpl = DTableColumnContainerImpl;
 exports.DTableColumnImpl = DTableColumnImpl;
 exports.DTableColumnType = DTableColumnType;
@@ -100679,6 +100687,7 @@ exports.DynamicFontAtlasCharacterType = DynamicFontAtlasCharacterType;
 exports.DynamicFontAtlasFont = DynamicFontAtlasFont;
 exports.DynamicFontAtlases = DynamicFontAtlases;
 exports.DynamicSDFFontAtlas = DynamicSDFFontAtlas;
+exports.DynamicSDFFontAtlasFont = DynamicSDFFontAtlasFont;
 exports.DynamicSDFFontAtlases = DynamicSDFFontAtlases;
 exports.DynamicSDFFontGenerator = DynamicSDFFontGenerator;
 exports.EShapeAcceptorEdgeSide = EShapeAcceptorEdgeSide;