@wcardinal/wcardinal-ui 0.298.0 → 0.300.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.298.0
+ Winter Cardinal UI v0.300.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -829,7 +829,7 @@
                 return EShapeTextAlignVertical.OUTSIDE_TOP;
         }
     };
-    var buildTextVertex = function (vertices, uvs, voffset, vcount, originX, originY, sizeX, sizeY, textAtlas, textSize, textValue, textStyle, textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textSpacingHorizontal, textSpacingVertical, textDirection, textPaddingHorizontal, textPaddingVertical, textClipping, textWorld, textureUvs, internalTransform) {
+    var buildTextVertex = function (vertices, uvs, voffset, vcount, originX, originY, sizeX, sizeY, textAtlas, textSize, textValue, textStyle, textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textSpacingHorizontal, textSpacingVertical, textDirection, textPaddingHorizontal, textPaddingVertical, textClipping, textFitting, textWorld, textureUvs, internalTransform) {
         // Calculate the transformed positions
         //
         //  0               1
@@ -919,6 +919,7 @@
         var textSizeY = textSize * vnl;
         var lineHeight = Math.max(0, textSize + textSpacingVertical) * vnl;
         var lineWidth = 0;
+        var lineCount = 1;
         var textAtlasCharacters = textAtlas.characters;
         var iterator = UtilCharacterIterator.from(textValue);
         var advancePrevious = 0;
@@ -943,16 +944,41 @@
                 width = Math.max(width, lineWidth);
                 lineWidth = 0;
                 height += lineHeight;
+                lineCount += 1;
+            }
+        }
+        lineWidth += advancePrevious;
+        width = Math.max(width, lineWidth);
+        height += textSizeY;
+        lineWidth = 0;
+        if (textFitting && isIn(textAlignHorizontal, textAlignVertical)) {
+            var w0 = 0;
+            var h0 = 0;
+            switch (textDirection) {
+                case EShapeTextDirection.LEFT_TO_RIGHT:
+                case EShapeTextDirection.RIGHT_TO_LEFT:
+                    w0 = Math.max(0, hl - textPaddingHorizontal * 2);
+                    h0 = Math.max(0, vl - textPaddingVertical * 2);
+                    break;
+                case EShapeTextDirection.TOP_TO_BOTTOM:
+                case EShapeTextDirection.BOTTOM_TO_TOP:
+                    w0 = Math.max(0, vl - textPaddingVertical * 2);
+                    h0 = Math.max(0, hl - textPaddingHorizontal * 2);
+                    break;
             }
+            var w1 = width * hnl * (textSize / textAtlas.font.size);
+            var h1 = height;
+            var s = Math.min(1, Math.min(w0 / w1, h0 / h1));
+            textSize *= s;
+            textSizeY *= s;
+            lineHeight *= s;
+            height *= s;
         }
         var scaleZ = textSize / textAtlas.font.size;
         var scaleX = hnl * scaleZ;
         var scaleY = vnl * scaleZ;
-        lineWidth += advancePrevious;
-        width = Math.max(width, lineWidth) * scaleX;
-        lineWidth = 0;
+        width *= scaleX;
         heightChar *= scaleY;
-        height += textSizeY;
         //
         var tx0 = 0;
         var ty0 = 0;
@@ -962,80 +988,32 @@
                 getTextBBox(textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textPaddingHorizontal, textPaddingVertical, width, height, x0, y0, x1, y1, x2, y2, x3, y3, hnx, hny, vnx, vny, work);
                 tx0 = work.x;
                 ty0 = work.y;
-                if (textClipping) {
-                    switch (textAlignHorizontal) {
-                        case EShapeTextAlignHorizontal.LEFT:
-                        case EShapeTextAlignHorizontal.CENTER:
-                        case EShapeTextAlignHorizontal.RIGHT:
-                            switch (textAlignVertical) {
-                                case EShapeTextAlignVertical.TOP:
-                                case EShapeTextAlignVertical.MIDDLE:
-                                case EShapeTextAlignVertical.BOTTOM:
-                                    lineWidthMaximum = hl - textPaddingHorizontal * 2;
-                                    break;
-                            }
-                            break;
-                    }
+                if (textClipping && isIn(textAlignHorizontal, textAlignVertical)) {
+                    lineWidthMaximum = hl - textPaddingHorizontal * 2;
                 }
                 break;
             case EShapeTextDirection.TOP_TO_BOTTOM:
                 getTextBBox(rotateAlignVerticalRight(textAlignVertical), rotateAlignHorizontalRight(textAlignHorizontal), textOffsetVertical, textOffsetHorizontal, textPaddingVertical, textPaddingHorizontal, width, height, x1, y1, x2, y2, x3, y3, x0, y0, hnx, hny, vnx, vny, work);
                 tx0 = work.x;
                 ty0 = work.y;
-                if (textClipping) {
-                    switch (textAlignVertical) {
-                        case EShapeTextAlignVertical.TOP:
-                        case EShapeTextAlignVertical.MIDDLE:
-                        case EShapeTextAlignVertical.BOTTOM:
-                            switch (textAlignHorizontal) {
-                                case EShapeTextAlignHorizontal.LEFT:
-                                case EShapeTextAlignHorizontal.CENTER:
-                                case EShapeTextAlignHorizontal.RIGHT:
-                                    lineWidthMaximum = vl - textPaddingVertical * 2;
-                                    break;
-                            }
-                            break;
-                    }
+                if (textClipping && isIn(textAlignHorizontal, textAlignVertical)) {
+                    lineWidthMaximum = vl - textPaddingVertical * 2;
                 }
                 break;
             case EShapeTextDirection.BOTTOM_TO_TOP:
                 getTextBBox(rotateAlignVerticalLeft(textAlignVertical), rotateAlignHorizontalLeft(textAlignHorizontal), textOffsetVertical, textOffsetHorizontal, textPaddingVertical, textPaddingHorizontal, width, height, x3, y3, x0, y0, x1, y1, x2, y2, hnx, hny, vnx, vny, work);
                 tx0 = work.x;
                 ty0 = work.y;
-                if (textClipping) {
-                    switch (textAlignVertical) {
-                        case EShapeTextAlignVertical.TOP:
-                        case EShapeTextAlignVertical.MIDDLE:
-                        case EShapeTextAlignVertical.BOTTOM:
-                            switch (textAlignHorizontal) {
-                                case EShapeTextAlignHorizontal.LEFT:
-                                case EShapeTextAlignHorizontal.CENTER:
-                                case EShapeTextAlignHorizontal.RIGHT:
-                                    lineWidthMaximum = vl - textPaddingVertical * 2;
-                                    break;
-                            }
-                            break;
-                    }
+                if (textClipping && isIn(textAlignHorizontal, textAlignVertical)) {
+                    lineWidthMaximum = vl - textPaddingVertical * 2;
                 }
                 break;
             case EShapeTextDirection.RIGHT_TO_LEFT:
                 getTextBBox(invertAlignHorizontal(textAlignHorizontal), invertAlignVertical(textAlignVertical), textOffsetHorizontal, textOffsetVertical, textPaddingHorizontal, textPaddingVertical, width, height, x2, y2, x3, y3, x0, y0, x1, y1, hnx, hny, vnx, vny, work);
                 tx0 = work.x;
                 ty0 = work.y;
-                if (textClipping) {
-                    switch (textAlignHorizontal) {
-                        case EShapeTextAlignHorizontal.LEFT:
-                        case EShapeTextAlignHorizontal.CENTER:
-                        case EShapeTextAlignHorizontal.RIGHT:
-                            switch (textAlignVertical) {
-                                case EShapeTextAlignVertical.TOP:
-                                case EShapeTextAlignVertical.MIDDLE:
-                                case EShapeTextAlignVertical.BOTTOM:
-                                    lineWidthMaximum = hl - textPaddingHorizontal * 2;
-                                    break;
-                            }
-                            break;
-                    }
+                if (textClipping && isIn(textAlignHorizontal, textAlignVertical)) {
+                    lineWidthMaximum = hl - textPaddingHorizontal * 2;
                 }
                 break;
         }
@@ -1096,7 +1074,7 @@
         lineWidth = 0;
         advancePrevious = 0;
         iterator.position = 0;
-        var lineCount = 0;
+        lineCount = 0;
         var iv = voffset * 2;
         for (; iterator.hasNext(); iv += 8) {
             var character = iterator.next();
@@ -1184,6 +1162,21 @@
             uvs[iv + 1] = uvy0;
         }
     };
+    var isIn = function (textAlignHorizontal, textAlignVertical) {
+        switch (textAlignHorizontal) {
+            case EShapeTextAlignHorizontal.LEFT:
+            case EShapeTextAlignHorizontal.CENTER:
+            case EShapeTextAlignHorizontal.RIGHT:
+                switch (textAlignVertical) {
+                    case EShapeTextAlignVertical.TOP:
+                    case EShapeTextAlignVertical.MIDDLE:
+                    case EShapeTextAlignVertical.BOTTOM:
+                        return true;
+                }
+                break;
+        }
+        return false;
+    };
     var writeCharacterEmpty = function (vertices, uvs, iv, cx0, cy0, cx3, cy3, uvx0, uvy0, uvx3, uvy3) {
         vertices[iv + 0] = cx0;
         vertices[iv + 1] = cy0;
@@ -7248,6 +7241,7 @@
             this._direction = EShapeTextDirection.LEFT_TO_RIGHT;
             this.padding = new EShapeTextOffsetImpl(parent, 10, 10);
             this._clipping = false;
+            this._fitting = false;
         }
         Object.defineProperty(EShapeTextImpl.prototype, "enable", {
             get: function () {
@@ -7406,9 +7400,22 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EShapeTextImpl.prototype, "fitting", {
+            get: function () {
+                return this._fitting;
+            },
+            set: function (fitting) {
+                if (this._fitting !== fitting) {
+                    this._fitting = fitting;
+                    this._parent.updateUploaded();
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         EShapeTextImpl.prototype.copy = function (target) {
             if (target) {
-                this.set(target.value, target.color, target.alpha, target.family, target.size, target.weight, target.style, target.direction, target.clipping);
+                this.set(target.value, target.color, target.alpha, target.family, target.size, target.weight, target.style, target.direction, target.clipping, target.fitting);
                 this.align.copy(target.align);
                 this.offset.copy(target.offset);
                 this.outline.copy(target.outline);
@@ -7417,7 +7424,7 @@
             }
             return this;
         };
-        EShapeTextImpl.prototype.set = function (value, color, alpha, family, size, weight, style, direction, clipping) {
+        EShapeTextImpl.prototype.set = function (value, color, alpha, family, size, weight, style, direction, clipping, fitting) {
             var isChangedDirty = false;
             var isChangedUploaded = false;
             if (value != null && this._value !== value) {
@@ -7456,6 +7463,10 @@
                 this._clipping = clipping;
                 isChangedUploaded = true;
             }
+            if (fitting != null && this._fitting !== fitting) {
+                this._fitting = fitting;
+                isChangedUploaded = true;
+            }
             if (isChangedDirty) {
                 this._parent.toDirty();
             }
@@ -7479,7 +7490,8 @@
                 direction: this._direction,
                 spacing: this.spacing.toObject(),
                 padding: this.padding.toObject(),
-                clipping: this._clipping
+                clipping: this._clipping,
+                fitting: this._fitting
             };
         };
         EShapeTextImpl.prototype.serialize = function (manager) {
@@ -7490,9 +7502,11 @@
             var outlineId = this.outline.serialize(manager);
             var spacingId = this.spacing.serialize(manager);
             var paddingId = this.padding.serialize(manager);
+            var clipping = this._clipping ? 1 : 0;
+            var fitting = this._fitting ? 1 : 0;
             var serialized = "[".concat(valueId, ",").concat(this._color, ",").concat(this._alpha, ",").concat(familyId, ",").concat(this._size, ",") +
                 "".concat(this._weight, ",").concat(alignId, ",").concat(offsetId, ",").concat(this._style, ",").concat(outlineId, ",") +
-                "".concat(spacingId, ",").concat(this._direction, ",").concat(paddingId, ",").concat(this._clipping ? 1 : 0, "]");
+                "".concat(spacingId, ",").concat(this._direction, ",").concat(paddingId, ",").concat(clipping, ",").concat(fitting, "]");
             return manager.addResource(serialized);
         };
         EShapeTextImpl.prototype.deserialize = function (target, manager) {
@@ -7503,7 +7517,7 @@
                     parsed = JSON.parse(resources[target]);
                     manager.setText(target, parsed);
                 }
-                this.set(resources[parsed[0]] || "", parsed[1], parsed[2], resources[parsed[3]] || "auto", parsed[4], parsed[5], parsed[8], parsed[11], !!parsed[13]);
+                this.set(resources[parsed[0]] || "", parsed[1], parsed[2], resources[parsed[3]] || "auto", parsed[4], parsed[5], parsed[8], parsed[11], !!parsed[13], !!parsed[14]);
                 this.align.deserialize(parsed[6], manager);
                 this.offset.deserialize(parsed[7], manager);
                 this.outline.deserialize(parsed[9], manager);
@@ -8083,6 +8097,7 @@
             this.paddingHorizontal = NaN;
             this.paddingVertical = NaN;
             this.clipping = false;
+            this.fitting = false;
         }
         BuilderText.prototype.init = function (buffer) {
             var vcount = this.vertexCount;
@@ -8133,6 +8148,7 @@
             var textPaddingHorizontal = text.padding.horizontal;
             var textPaddingVertical = text.padding.vertical;
             var textClipping = text.clipping;
+            var textFitting = text.fitting;
             var textTexture = text.texture || pixi_js.Texture.WHITE;
             var textTextureTransformId = toTextureTransformId(textTexture);
             var isCharChanged = textValue !== this.value || textFamily !== this.family;
@@ -8148,6 +8164,7 @@
                 textPaddingVertical !== this.paddingVertical;
             var isCharDirectionChanged = textDirection !== this.direction;
             var isClippingChanged = this.clipping !== textClipping;
+            var isFittingChanged = this.fitting !== textFitting;
             var isTextureChanged = textTexture !== this.texture || textTextureTransformId !== this.textureTransformId;
             if (isSizeChanged ||
                 isTransformChanged ||
@@ -8159,6 +8176,7 @@
                 isCharSpacingChanged ||
                 isCharDirectionChanged ||
                 isClippingChanged ||
+                isFittingChanged ||
                 isTextureChanged) {
                 this.size = textSize;
                 this.family = textFamily;
@@ -8174,9 +8192,10 @@
                 this.paddingHorizontal = textPaddingHorizontal;
                 this.paddingVertical = textPaddingVertical;
                 this.clipping = textClipping;
+                this.fitting = textFitting;
                 this.texture = textTexture;
                 this.textureTransformId = textTextureTransformId;
-                if (isCharSizeChanged) {
+                if (isCharSizeChanged || isFittingChanged || (textFitting && isSizeChanged)) {
                     // Invalidate the text weight to update the text steps.
                     this.weight = NaN;
                 }
@@ -8189,7 +8208,7 @@
                     textWorld = [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0];
                     text.world = textWorld;
                 }
-                buildTextVertex(buffer.vertices, buffer.uvs, this.vertexOffset, this.vertexCount, 0, 0, shapeSize.x, shapeSize.y, textAtlas, textSize, textValue, textStyle, textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textSpacingHorizontal, textSpacingVertical, textDirection, textPaddingHorizontal, textPaddingVertical, textClipping, textWorld, toTextureUvs(textTexture), shape.transform.internalTransform);
+                buildTextVertex(buffer.vertices, buffer.uvs, this.vertexOffset, this.vertexCount, 0, 0, shapeSize.x, shapeSize.y, textAtlas, textSize, textValue, textStyle, textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textSpacingHorizontal, textSpacingVertical, textDirection, textPaddingHorizontal, textPaddingVertical, textClipping, textFitting, textWorld, toTextureUvs(textTexture), shape.transform.internalTransform);
             }
         };
         BuilderText.prototype.updateColorFill = function (buffer, shape) {
@@ -68403,6 +68422,17 @@
         function DTableDataListMapped(parent) {
             this._parent = parent;
         }
+        Object.defineProperty(DTableDataListMapped.prototype, "rows", {
+            get: function () {
+                var result = [];
+                this.each(function (row) {
+                    result.push(row);
+                });
+                return result;
+            },
+            enumerable: false,
+            configurable: true
+        });
         DTableDataListMapped.prototype.map = function (unmappedIndex) {
             var parent = this._parent;
             var sortedIndex = parent.sorter.map(unmappedIndex);