@wcardinal/wcardinal-ui 0.409.0 → 0.411.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.409.0
+ Winter Cardinal UI v0.411.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1385,12 +1385,14 @@
     var DASHED = 128;
     var DASHED_DENSELY = 256;
     var DASHED_LOOSELY = 512;
-    var CURVE = 1024;
     var FORMATTER_SHIFT = 10;
     var FORMATTER_MASK = 0xffc00;
     var FORMATTER_EXTENSION_LOWEST = 512;
     var FORMATTER_EXTENSION_HIGHEST = 1023;
-    var FORMATTER_CURVE = 1;
+    var FORMATTER_CURVE_SPLINE = 1;
+    var FORMATTER_CURVE_BEZIER_QUADRATIC = 2;
+    var CURVE_SPLINE = FORMATTER_CURVE_SPLINE << FORMATTER_SHIFT;
+    var CURVE_BEZIER_QUADRATIC = FORMATTER_CURVE_BEZIER_QUADRATIC << FORMATTER_SHIFT;
     /**
      * EShape point style.
      *
@@ -1424,12 +1426,18 @@
         DASHED_LOOSELY: DASHED_LOOSELY,
         /** @deprecated in favor of EShapeStrokeStyle. */
         DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
-        CURVE: CURVE,
+        /** @deprecated in favor of CURVE_SPLINE. */
+        CURVE: CURVE_SPLINE,
+        CURVE_SPLINE: CURVE_SPLINE,
+        CURVE_BEZIER_QUADRATIC: CURVE_BEZIER_QUADRATIC,
         FORMATTER_SHIFT: FORMATTER_SHIFT,
         FORMATTER_MASK: FORMATTER_MASK,
         FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
         FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
-        FORMATTER_CURVE: FORMATTER_CURVE
+        /** @deprecated in favor of FORMATTER_CURVE_SPLINE. */
+        FORMATTER_CURVE: FORMATTER_CURVE_SPLINE,
+        FORMATTER_CURVE_SPLINE: FORMATTER_CURVE_SPLINE,
+        FORMATTER_CURVE_BEZIER_QUADRATIC: FORMATTER_CURVE_BEZIER_QUADRATIC
     };
 
     /*
@@ -13941,12 +13949,20 @@
             if (this._renderable) {
                 var list = phase ? this._befores : this._afters;
                 for (var i = 0, imax = list.length; i < imax; ++i) {
-                    var snippet = list[i];
-                    snippet.updateTransform();
-                    snippet.render(renderer);
+                    list[i].render(renderer);
                 }
             }
         };
+        DBaseSnippetContainer.prototype.updateTransform = function () {
+            var befores = this._befores;
+            for (var i = 0, imax = befores.length; i < imax; ++i) {
+                befores[i].updateTransform();
+            }
+            var afters = this._afters;
+            for (var i = 0, imax = afters.length; i < imax; ++i) {
+                afters[i].updateTransform();
+            }
+        };
         return DBaseSnippetContainer;
     }());
 
@@ -14338,6 +14354,13 @@
             get: function () {
                 return this._weight;
             },
+            set: function (weight) {
+                if (this._weight !== weight) {
+                    this._weight = weight;
+                    this.toHierarchyDirty();
+                    DApplications.update(this);
+                }
+            },
             enumerable: false,
             configurable: true
         });
@@ -15225,6 +15248,10 @@
                 snippet.render(renderer, false);
             }
         };
+        DBase.prototype.updateTransform = function () {
+            _super.prototype.updateTransform.call(this);
+            this._snippet.updateTransform();
+        };
         //
         DBase.prototype.getThemeDefault = function () {
             return DThemes.getInstance().get(this.getType());
@@ -15786,6 +15813,7 @@
             this._dt = 0;
             this._dtw = 0;
             this._t = 0;
+            this._duration = 333 * ((_a = options === null || options === void 0 ? void 0 : options.duration) !== null && _a !== void 0 ? _a : 1);
             this._animation = new DAnimationBase({
                 onTime: function (t) {
                     _this.onEase(t);
@@ -15794,7 +15822,7 @@
                     _this.onEaseEnd();
                 },
                 timing: DAnimationTimings.LINEAR,
-                duration: 333 * ((_a = options === null || options === void 0 ? void 0 : options.duration) !== null && _a !== void 0 ? _a : 1)
+                duration: this._duration
             });
             this._onMove = onMove;
             this._onEnd = onEnd;
@@ -15875,6 +15903,11 @@
             }
         };
         UtilGestureEasing.prototype.onEnd = function (ldt) {
+            var d0 = this._duration;
+            var d = d0 - ldt;
+            if (d <= 0) {
+                return this.onEaseEnd();
+            }
             this.updateHistoriesSorted(ldt);
             var sorted = this._historiesSorted;
             var sortedLength = sorted.length;
@@ -15899,22 +15932,27 @@
             dx *= w;
             dy *= w;
             ds *= w;
-            dt *= w;
+            dt *= w * (d0 / d); // Effectively, this lowers the velocity (dx, dy, ds) by d / d0.
             this._dx = dx;
             this._dy = dy;
             this._ds = ds;
             this._dt = dt;
             // Start animation
             var animation = this._animation;
-            var d = animation.duration;
-            this._t = -ldt / d;
+            animation.duration = d;
+            this._t = 0;
             this._dtw = d / dt;
             animation.start();
         };
         UtilGestureEasing.prototype.onEase = function (t) {
             var ot = this._t;
             this._t = t;
-            // Note: Integral of (1-x) is x (1 - 0.5 x) + c.
+            // Note: Integral_{x=ot...t} (1-x) dx
+            //       = [x (1 - 0.5 x)]_{x=ot...t}
+            //       = t (1 - 0.5 t) - ot (1 - 0.5 ot)
+            //       = t - ot - 0.5 t t + 0.5 ot ot
+            //       = (t - ot) - 0.5 (t + ot) (t - ot)
+            //       = (1 - 0.5 (t + ot)) * (t - ot)
             var w = (1 - 0.5 * (t + ot)) * (t - ot) * this._dtw;
             this._onMove(this._dx * w, this._dy * w, 1 + (this._ds - 1) * w, t);
         };
@@ -16119,6 +16157,7 @@
             if (target == null || !target.state.isGesturing) {
                 return;
             }
+            var oldTime = data.time;
             if (!data.end(e)) {
                 return;
             }
@@ -16150,7 +16189,7 @@
             }
             var easing = data.easing;
             if (easing) {
-                easing.onEnd(e.data.originalEvent.timeStamp - data.time);
+                easing.onEnd(data.time - oldTime);
             }
             else {
                 this.deleteData(data);
@@ -19437,7 +19476,7 @@
         var a = source.angle;
         return pset(c[0], c[1], a1[0], a1[1], a2[0], a2[1], a[0], a[1], a[2], result);
     };
-    var acopy = function (source, result) {
+    var acopy$1 = function (source, result) {
         var sourceLength = source.length;
         for (var i = 0; i < sourceLength; ++i) {
             result[i] = source[i];
@@ -19502,8 +19541,8 @@
             var rvalues = result.values;
             var rsegments = result.segments;
             if (length <= 2) {
-                acopy(values, rvalues);
-                acopy(segments, rsegments);
+                acopy$1(values, rvalues);
+                acopy$1(segments, rsegments);
                 return result;
             }
             var c0 = this.WORK_P0 || pnew();
@@ -19782,6 +19821,168 @@
         return result;
     };
 
+    /*
+     * Copyright (C) 2019 Toshiba Corporation
+     * SPDX-License-Identifier: Apache-2.0
+     */
+    var acopy = function (source, result) {
+        var sourceLength = source.length;
+        for (var i = 0; i < sourceLength; ++i) {
+            result[i] = source[i];
+        }
+        if (result.length !== sourceLength) {
+            result.length = sourceLength;
+        }
+        return result;
+    };
+    var amix = function (x0, y0, x1, y1, t, result) {
+        var u = 1 - t;
+        result[0] = x0 * u + x1 * t;
+        result[1] = y0 * u + y1 * t;
+        return result;
+    };
+    var interpolate2 = function (x0, y0, x1, y1, x2, y2, is0, is1, nsegment, rvalues, rvaluesCount) {
+        var v3 = [0, 0];
+        var v4 = [0, 0];
+        var v5 = [0, 0];
+        for (var is = is0; is < is1; ++is) {
+            var t = is / nsegment;
+            amix(x0, y0, x1, y1, t, v3);
+            amix(x1, y1, x2, y2, t, v4);
+            amix(v3[0], v3[1], v4[0], v4[1], t, v5);
+            rvalues[++rvaluesCount] = v5[0];
+            rvalues[++rvaluesCount] = v5[1];
+        }
+        return rvaluesCount;
+    };
+    var interpolate1 = function (length, values, segments, isClosed, nsegment, result) {
+        var rvalues = result.values;
+        var rsegments = result.segments;
+        if (length <= 2) {
+            acopy(values, rvalues);
+            acopy(segments, rsegments);
+            return result;
+        }
+        var rvaluesCount = -1;
+        var rsegmentsCount = -1;
+        var ism = nsegment >> 1;
+        if (isClosed) {
+            var i = 0;
+            for (; i + 2 < length; i += 2) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, i + 2);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            if (i + 1 < length) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, 0);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[0];
+                    rvalues[++rvaluesCount] = values[1];
+                    rsegments.unshift(0);
+                    rsegmentsCount += 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[0], values[1], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            else if (i < length) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                if (0 <= toIndexOf(segments, 0)) {
+                    rsegments.unshift(0);
+                    rsegmentsCount += 1;
+                }
+            }
+        }
+        else {
+            var i = 0;
+            for (; i + 2 < length; i += 2) {
+                var j = i << 1;
+                var s0 = 0 <= toIndexOf(segments, i + 1);
+                var s1 = 0 <= toIndexOf(segments, i + 2);
+                if (s0 && s1) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else if (s0) {
+                    rvalues[++rvaluesCount] = values[j + 0];
+                    rvalues[++rvaluesCount] = values[j + 1];
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], ism, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+                else if (s1) {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, ism, nsegment, rvalues, rvaluesCount);
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+                else {
+                    rvaluesCount = interpolate2(values[j + 0], values[j + 1], values[j + 2], values[j + 3], values[j + 4], values[j + 5], 0, nsegment, nsegment, rvalues, rvaluesCount);
+                }
+            }
+            for (; i + 1 < length; ++i) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+                rvalues[++rvaluesCount] = values[j + 2];
+                rvalues[++rvaluesCount] = values[j + 3];
+                if (0 <= toIndexOf(segments, i + 1)) {
+                    rsegments[++rsegmentsCount] = (rvaluesCount >> 1) + 1;
+                }
+            }
+            for (; i < length; ++i) {
+                var j = i << 1;
+                rvalues[++rvaluesCount] = values[j + 0];
+                rvalues[++rvaluesCount] = values[j + 1];
+            }
+        }
+        rvaluesCount += 1;
+        if (rvalues.length !== rvaluesCount) {
+            rvalues.length = rvaluesCount;
+        }
+        rsegmentsCount += 1;
+        if (rsegments.length !== rsegmentsCount) {
+            rsegments.length = rsegmentsCount;
+        }
+        return result;
+    };
+    var eShapePointsFormatterCurveBezierQuadratic = function (length, values, segments, style, result) {
+        interpolate1(length, values, segments, !!(style & EShapePointsStyle.CLOSED), EShapeDefaults.CURVE_SEGMENT_COUNT, result);
+        result.length = result.values.length >> 1;
+        result.style = style;
+        return result;
+    };
+
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -19815,10 +20016,14 @@
         EShapePointsFormatters.newData = function () {
             var result = new Map();
             var theme = DThemes.get("EShapePointsFormatter");
-            result.set(EShapePointsStyle.FORMATTER_CURVE, {
-                label: theme.getCurveLabel(),
+            result.set(EShapePointsStyle.FORMATTER_CURVE_SPLINE, {
+                label: theme.getCurveSplineLabel(),
                 formatter: eShapePointsFormatterCurve
             });
+            result.set(EShapePointsStyle.FORMATTER_CURVE_BEZIER_QUADRATIC, {
+                label: theme.getCurveBezierQuadraticLabel(),
+                formatter: eShapePointsFormatterCurveBezierQuadratic
+            });
             return result;
         };
         return EShapePointsFormatters;
@@ -55828,6 +56033,7 @@
                     }
                     if (!this.visible) {
                         this.visible = true;
+                        this.updateTransform();
                     }
                 }
                 else {
@@ -77864,6 +78070,7 @@
         EShapeEditor: EShapeEditor,
         EShapeLayerState: EShapeLayerState,
         toPointsBoundary: toPointsBoundary,
+        eShapePointsFormatterCurveBezierQuadratic: eShapePointsFormatterCurveBezierQuadratic,
         eShapePointsFormatterCurve: eShapePointsFormatterCurve,
         EShapePointsFormatters: EShapePointsFormatters,
         EShapePointsMarkerBase: EShapePointsMarkerBase,