@wcardinal/wcardinal-ui 0.427.0 → 0.428.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.427.0
+ Winter Cardinal UI v0.428.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -15463,6 +15463,7 @@ var UtilGestureData = /** @class */ (function () {
         this.center = new pixi_js.Point();
         this.scale = 0;
         this.time = 0;
+        this.distance = 0;
     }
     UtilGestureData.prototype.start = function (e) {
         var oe = e.data.originalEvent;
@@ -15971,6 +15972,150 @@ var UtilGestureEasing = /** @class */ (function () {
     return UtilGestureEasing;
 }());
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var UtilGestureTap = /** @class */ (function () {
+    function UtilGestureTap(on, options) {
+        var _a;
+        this._onTap = on === null || on === void 0 ? void 0 : on.tap;
+        this._threshold = (_a = options === null || options === void 0 ? void 0 : options.threshold) !== null && _a !== void 0 ? _a : 10;
+        this._unused = [];
+        this._used = new Map();
+    }
+    UtilGestureTap.prototype.newData = function (target) {
+        var used = this._used;
+        var result = used.get(target);
+        if (result != null) {
+            return result;
+        }
+        var poped = this._unused.pop();
+        if (poped != null) {
+            used.set(target, poped);
+            return poped;
+        }
+        var created = new UtilGestureData();
+        created.easing = undefined;
+        created.onMove = this.newOnMove(created);
+        created.onEnd = this.newOnEnd(created);
+        used.set(target, created);
+        return created;
+    };
+    UtilGestureTap.prototype.deleteData = function (data) {
+        var target = data.target;
+        if (target) {
+            if (this._used.delete(target)) {
+                data.target = undefined;
+                data.pointers.clear();
+                this._unused.push(data);
+            }
+        }
+    };
+    UtilGestureTap.prototype.newOnMove = function (data) {
+        var _this = this;
+        return function (e) {
+            _this.onMove(e, data);
+        };
+    };
+    UtilGestureTap.prototype.newOnEnd = function (data) {
+        var _this = this;
+        return function (e) {
+            _this.onEnd(e, data);
+        };
+    };
+    UtilGestureTap.prototype.onDown = function (target, e) {
+        var _a;
+        if (this._onTap == null) {
+            return;
+        }
+        var layer = DApplications.getLayer(target);
+        if (layer == null) {
+            return;
+        }
+        e.stopPropagation();
+        if (target.state.isGesturing) {
+            (_a = this._used.get(target)) === null || _a === void 0 ? void 0 : _a.start(e);
+        }
+        else {
+            var data = this.newData(target);
+            data.target = target;
+            data.distance = 0;
+            target.state.isGesturing = true;
+            // Interaction manager
+            var interactionManager = layer.renderer.plugins.interaction;
+            data.interactionManager = interactionManager;
+            // Update the center
+            data.start(e);
+            // Event handler
+            data.bind(e);
+        }
+    };
+    UtilGestureTap.prototype.onMove = function (e, data) {
+        var target = data.target;
+        if (target == null || !target.state.isGesturing) {
+            return;
+        }
+        if (!data.isUpdatable(e)) {
+            return;
+        }
+        // Update the center
+        var center = data.center;
+        var oldCenterX = center.x;
+        var oldCenterY = center.y;
+        data.update(e);
+        var newCenterX = center.x;
+        var newCenterY = center.y;
+        // Calculate the position
+        var dx = newCenterX - oldCenterX;
+        var dy = newCenterY - oldCenterY;
+        // Distance
+        data.distance += Math.abs(dx) + Math.abs(dy);
+    };
+    UtilGestureTap.prototype.onEnd = function (e, data) {
+        var target = data.target;
+        if (target == null || !target.state.isGesturing) {
+            return;
+        }
+        if (!data.end(e)) {
+            return;
+        }
+        // State
+        target.state.isGesturing = false;
+        // Remove event handlers
+        var interactionManager = data.interactionManager;
+        data.interactionManager = undefined;
+        if (interactionManager) {
+            var onMoveBound = data.onMove;
+            if (onMoveBound) {
+                interactionManager.off(UtilPointerEvent.move, onMoveBound);
+            }
+            var onEndBound = data.onEnd;
+            if (onEndBound) {
+                interactionManager.off(UtilPointerEvent.up, onEndBound);
+                interactionManager.off(UtilPointerEvent.cancel, onEndBound);
+            }
+        }
+        // Tap
+        this.end(target, data, e);
+        // Delete this data
+        this.deleteData(data);
+    };
+    UtilGestureTap.prototype.end = function (target, data, e) {
+        var onTap = this._onTap;
+        if (onTap && data.distance < this._threshold) {
+            onTap(target, e);
+        }
+    };
+    UtilGestureTap.prototype.stop = function (target) {
+        var data = this._used.get(target);
+        if (data != null) {
+            this.deleteData(data);
+        }
+    };
+    return UtilGestureTap;
+}());
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -15999,6 +16144,7 @@ var UtilGesture = /** @class */ (function () {
         this._touch = !!options.touch;
         this._unused = [];
         this._used = new Map();
+        this._tap = new UtilGestureTap(options.on, options.tap);
         var bind = options.bind;
         if (bind != null) {
             this.bind(bind);
@@ -16071,10 +16217,10 @@ var UtilGesture = /** @class */ (function () {
     UtilGesture.prototype.onDown = function (target, e) {
         var _a;
         if (this._touch && !this.isTouch(e)) {
-            return;
+            return this._tap.onDown(target, e);
         }
         if (!this._checkerStart(e, this._modifier, target)) {
-            return;
+            return this._tap.onDown(target, e);
         }
         var layer = DApplications.getLayer(target);
         if (layer == null) {
@@ -16092,6 +16238,7 @@ var UtilGesture = /** @class */ (function () {
             }
             var data = this.newData(target);
             data.target = target;
+            data.distance = 0;
             target.state.isGesturing = true;
             // Interaction manager
             var interactionManager = layer.renderer.plugins.interaction;
@@ -16144,6 +16291,8 @@ var UtilGesture = /** @class */ (function () {
         var dt = newTime - oldTime;
         var epsilon = 0.00001;
         var ds = epsilon < oldScale && epsilon < newScale ? newScale / oldScale : 1;
+        // Distance
+        data.distance += Math.abs(dx) + Math.abs(dy);
         // Easing
         var easing = data.easing;
         if (easing) {
@@ -16187,6 +16336,8 @@ var UtilGesture = /** @class */ (function () {
         if (onEnd != null) {
             onEnd(target);
         }
+        // Tap
+        this._tap.end(target, data, e);
         // Start the Easing
         var onEasingStart = this._onEasingStart;
         if (onEasingStart) {
@@ -16220,27 +16371,31 @@ var UtilGesture = /** @class */ (function () {
         var x = center.x + dx;
         var y = center.y + dy;
         center.set(x, y);
-        onMove(data.target, dx, dy, x, y, ds);
+        onMove(target, dx, dy, x, y, ds);
     };
     UtilGesture.prototype.onEasingEnd = function (data) {
         var target = data.target;
         this.deleteData(data);
-        var onEasingEnd = this._onEasingEnd;
-        if (onEasingEnd && target != null) {
-            onEasingEnd(target);
+        if (target != null) {
+            var onEasingEnd = this._onEasingEnd;
+            if (onEasingEnd) {
+                onEasingEnd(target);
+            }
         }
     };
     UtilGesture.prototype.stop = function (target) {
-        var _a;
+        this._tap.stop(target);
         var data = this._used.get(target);
-        if (data == null) {
-            return;
-        }
-        (_a = data.easing) === null || _a === void 0 ? void 0 : _a.stop();
-        this.deleteData(data);
-        var onStop = this._onStop;
-        if (onStop) {
-            onStop(target);
+        if (data != null) {
+            var easing = data.easing;
+            if (easing != null) {
+                easing.stop();
+            }
+            this.deleteData(data);
+            var onStop = this._onStop;
+            if (onStop) {
+                onStop(target);
+            }
         }
     };
     return UtilGesture;
@@ -16260,6 +16415,7 @@ var DViewGestureImpl = /** @class */ (function () {
         var mode = toEnum((_a = options === null || options === void 0 ? void 0 : options.mode) !== null && _a !== void 0 ? _a : theme.getGestureMode(), UtilGestureMode);
         var modifier = toEnum((_b = options === null || options === void 0 ? void 0 : options.modifier) !== null && _b !== void 0 ? _b : theme.getGestureModifier(), UtilGestureModifier);
         if (mode === UtilGestureMode.ON || mode === UtilGestureMode.TOUCH) {
+            var work_1 = new pixi_js.Point();
             this._gestureUtil = new UtilGesture({
                 touch: mode === UtilGestureMode.TOUCH,
                 modifier: modifier,
@@ -16272,7 +16428,7 @@ var DViewGestureImpl = /** @class */ (function () {
                         _this.onStart(target);
                     },
                     move: function (target, dx, dy, x, y, ds) {
-                        _this.onGestureMove(toTarget(owner), dx, dy, x, y, ds);
+                        _this.onGestureMove(toTarget(owner), dx, dy, x, y, ds, work_1);
                     },
                     easing: {
                         end: function (target) {
@@ -16281,6 +16437,9 @@ var DViewGestureImpl = /** @class */ (function () {
                     },
                     stop: function (target) {
                         _this.onStop(target);
+                    },
+                    tap: function (target, e) {
+                        _this.onTap(target, e);
                     }
                 }
             });
@@ -16299,8 +16458,12 @@ var DViewGestureImpl = /** @class */ (function () {
         var parent = this._parent;
         parent.emit("gesturestop", target, parent);
     };
-    DViewGestureImpl.prototype.onGestureMove = function (target, dx, dy, x, y, ds) {
-        if (target) {
+    DViewGestureImpl.prototype.onTap = function (target, e) {
+        var parent = this._parent;
+        parent.emit("gesturetap", target, e, parent);
+    };
+    DViewGestureImpl.prototype.onGestureMove = function (target, dx, dy, x, y, ds, work) {
+        if (target != null) {
             // Scale
             var parent_1 = this._parent;
             var oldScale = target.scale;
@@ -16314,6 +16477,12 @@ var DViewGestureImpl = /** @class */ (function () {
             newScaleX = scaleRatio * oldScaleX;
             newScaleY = scaleRatio * oldScaleY;
             // Position
+            var targetParent = target.parent;
+            if (targetParent != null) {
+                targetParent.toLocal(work.set(x, y), undefined, work);
+                x = work.x;
+                y = work.y;
+            }
             var cx = x - dx;
             var cy = y - dy;
             var position = target.position;
@@ -82952,6 +83121,20 @@ var DChartPlotAreaTwofoldSubBase = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "state", {
+        get: function () {
+            return this._plotArea.state;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(DChartPlotAreaTwofoldSubBase.prototype, "view", {
+        get: function () {
+            return this._plotArea.view;
+        },
+        enumerable: false,
+        configurable: true
+    });
     // eslint-disable-next-line @typescript-eslint/ban-types
     DChartPlotAreaTwofoldSubBase.prototype.on = function (name, callback, context) {
         this._plotArea.on(name, callback, context);
@@ -83459,9 +83642,9 @@ var DChartSelectionContainerImpl = /** @class */ (function () {
         this._x.unset();
         this._y.unset();
     };
-    DChartSelectionContainerImpl.prototype.update = function (container, position, mappedPosition) {
-        var isXUpdated = this._x.update(container, position, mappedPosition);
-        var isYUpdated = this._y.update(container, position, mappedPosition);
+    DChartSelectionContainerImpl.prototype.update = function (container, position, mappedPosition, series) {
+        var isXUpdated = this._x.update(container, position, mappedPosition, series);
+        var isYUpdated = this._y.update(container, position, mappedPosition, series);
         return isXUpdated || isYUpdated;
     };
     return DChartSelectionContainerImpl;
@@ -83520,7 +83703,7 @@ var DChartSelectionShapeBase = /** @class */ (function () {
         return theme.newShape(state);
     };
     DChartSelectionShapeBase.prototype.set = function (container, position, mappedPosition, series) {
-        this.update(container, position, mappedPosition);
+        this.update(container, position, mappedPosition, series);
         var shape = this._shape;
         if (shape) {
             this._style(shape, series);
@@ -83562,7 +83745,7 @@ var DChartSelectionGridlineX = /** @class */ (function (_super) {
     function DChartSelectionGridlineX() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DChartSelectionGridlineX.prototype.update = function (container, position, mappedPosition) {
+    DChartSelectionGridlineX.prototype.update = function (container, position, mappedPosition, series) {
         var shape = this._shape;
         if (shape) {
             var mappedX = mappedPosition.x;
@@ -83589,7 +83772,7 @@ var DChartSelectionGridlineY = /** @class */ (function (_super) {
     function DChartSelectionGridlineY() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DChartSelectionGridlineY.prototype.update = function (container, position, mappedPosition) {
+    DChartSelectionGridlineY.prototype.update = function (container, position, mappedPosition, series) {
         var shape = this._shape;
         if (shape) {
             var mappedY = mappedPosition.y;
@@ -83616,16 +83799,17 @@ var DChartSelectionMarker = /** @class */ (function (_super) {
     function DChartSelectionMarker() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DChartSelectionMarker.prototype.update = function (container, position, mappedPosition) {
+    DChartSelectionMarker.prototype.update = function (container, position, mappedPosition, series) {
         var shape = this._shape;
         if (shape) {
             shape.transform.position.copyFrom(mappedPosition);
-            shape.visible = this.isVisible(container, position, mappedPosition);
+            shape.visible = this.isVisible(container, position, mappedPosition, series);
             return true;
         }
         return false;
     };
-    DChartSelectionMarker.prototype.isVisible = function (container, position, mappedPosition) {
+    DChartSelectionMarker.prototype.isVisible = function (container, position, mappedPosition, series) {
+        container = (series === null || series === void 0 ? void 0 : series.container) || container;
         var x = mappedPosition.x;
         var y = mappedPosition.y;
         var bounds = container.plotArea.getPixelBounds();
@@ -83800,8 +83984,9 @@ var DChartSelectionSubImpl = /** @class */ (function (_super) {
             var work = this._work;
             work.set(coordinateX.transform.map(coordinateX.map(position.x)), coordinateY.transform.map(coordinateY.map(position.y)));
             container.plotArea.container.localTransform.apply(work, work);
-            var isGridlineUpdated = this._gridline.update(container, position, work);
-            var isMarkerUpdated = this._marker.update(container, position, work);
+            var series = this._series;
+            var isGridlineUpdated = this._gridline.update(container, position, work, series);
+            var isMarkerUpdated = this._marker.update(container, position, work, series);
             return isGridlineUpdated || isMarkerUpdated;
         }
         return false;
@@ -83822,6 +84007,7 @@ var DChartSelectionSimple = /** @class */ (function (_super) {
         var point = toEnum((_a = options === null || options === void 0 ? void 0 : options.point) !== null && _a !== void 0 ? _a : DChartSelectionPoint.CLOSER, DChartSelectionPoint);
         _this._selected = _this.newSelected(point, options === null || options === void 0 ? void 0 : options.selected);
         _this._hovered = _this.newHovered(point, options === null || options === void 0 ? void 0 : options.hovered);
+        _this._dismiss = _this.toDismiss(options);
         // Events
         var on = options === null || options === void 0 ? void 0 : options.on;
         if (on != null) {
@@ -83832,15 +84018,27 @@ var DChartSelectionSimple = /** @class */ (function (_super) {
                 }
             }
         }
-        //
         _this._onMoveBound = function (e) {
             _this.onMove(e);
         };
-        _this._onClickBound = function (e) {
-            _this.onClick(e);
+        _this._onTapBound = function (target, e) {
+            _this.onTap(e);
         };
         return _this;
     }
+    DChartSelectionSimple.prototype.toDismiss = function (options) {
+        var _a;
+        if (options != null) {
+            var dismiss = options.dismiss;
+            if (dismiss != null) {
+                if (dismiss.enable === false) {
+                    return undefined;
+                }
+                return toEnum((_a = dismiss.modifier) !== null && _a !== void 0 ? _a : UtilGestureModifier.NOT_NONE, UtilGestureModifier);
+            }
+        }
+        return UtilGestureModifier.NOT_NONE;
+    };
     DChartSelectionSimple.prototype.newSelected = function (point, options) {
         return new DChartSelectionSubImpl(this.toSelectedOptions(point, options));
     };
@@ -83886,14 +84084,21 @@ var DChartSelectionSimple = /** @class */ (function (_super) {
         }
         return options;
     };
-    DChartSelectionSimple.prototype.onClick = function (e) {
+    DChartSelectionSimple.prototype.onTap = function (e) {
         var container = this._container;
-        if (container && e.target === container.plotArea) {
+        if (container == null) {
+            return;
+        }
+        var dismiss = this._dismiss;
+        var selected = this._selected;
+        if (dismiss != null && UtilGestureModifiers.match(e, dismiss)) {
+            selected.unset();
+        }
+        else {
             var result = DChartSelectionSimple.WORK_SELECT;
             var global_1 = e.data.global;
             var series = container.calcHitPoint(global_1.x, global_1.y, result);
-            var selected = this._selected;
-            if (series) {
+            if (series != null) {
                 selected.set(series, result);
             }
             else {
@@ -83903,23 +84108,28 @@ var DChartSelectionSimple = /** @class */ (function (_super) {
     };
     DChartSelectionSimple.prototype.onMove = function (e) {
         var container = this._container;
-        if (container) {
-            var hovered = this._hovered;
-            if (e.target === container.plotArea) {
-                var result = DChartSelectionSimple.WORK_SELECT;
-                var global_2 = e.data.global;
-                var series = container.calcHitPoint(global_2.x, global_2.y, result);
-                if (series) {
-                    hovered.set(series, result);
-                }
-                else {
-                    hovered.unset();
-                }
+        if (container == null) {
+            return;
+        }
+        var plotArea = container.plotArea;
+        if (plotArea.state.isGesturing) {
+            return;
+        }
+        var hovered = this._hovered;
+        if (e.target === container.plotArea) {
+            var result = DChartSelectionSimple.WORK_SELECT;
+            var global_2 = e.data.global;
+            var series = container.calcHitPoint(global_2.x, global_2.y, result);
+            if (series) {
+                hovered.set(series, result);
             }
             else {
                 hovered.unset();
             }
         }
+        else {
+            hovered.unset();
+        }
     };
     DChartSelectionSimple.prototype.bind = function (container) {
         this._container = container;
@@ -83927,14 +84137,15 @@ var DChartSelectionSimple = /** @class */ (function (_super) {
         this._hovered.bind(container);
         var plotArea = container.plotArea;
         plotArea.on(UtilPointerEvent.move, this._onMoveBound);
-        plotArea.on(UtilPointerEvent.tap, this._onClickBound);
+        plotArea.view.on("gesturetap", this._onTapBound);
     };
     DChartSelectionSimple.prototype.unbind = function () {
         var container = this._container;
         this._container = null;
-        if (container) {
+        if (container != null) {
             var plotArea = container.plotArea;
             plotArea.off(UtilPointerEvent.move, this._onMoveBound);
+            plotArea.view.off("gesturetap", this._onTapBound);
         }
         this._selected.unbind();
         this._hovered.unbind();
@@ -88736,7 +88947,13 @@ var DDiagram = /** @class */ (function (_super) {
     DDiagram.prototype.onDown = function (e) {
         var canvas = this.canvas;
         if (canvas) {
-            _super.prototype.onDown.call(this, e, canvas.onShapeDown(e));
+            var target = e.target;
+            if (target === this || target === canvas) {
+                _super.prototype.onDown.call(this, e, canvas.onShapeDown(e));
+            }
+            else {
+                _super.prototype.onDown.call(this, e);
+            }
         }
         else {
             _super.prototype.onDown.call(this, e);
@@ -88790,7 +89007,10 @@ var DDiagram = /** @class */ (function (_super) {
     DDiagram.prototype.onShapeRightDown = function (e) {
         var canvas = this.canvas;
         if (canvas) {
-            canvas.onShapeRightDown(e);
+            var target = e.target;
+            if (target === this || target === canvas) {
+                canvas.onShapeRightDown(e);
+            }
         }
     };
     DDiagram.prototype.onShapeRightUp = function (e) {
@@ -102187,6 +102407,7 @@ exports.UtilGestureEasingHistory = UtilGestureEasingHistory;
 exports.UtilGestureMode = UtilGestureMode;
 exports.UtilGestureModifier = UtilGestureModifier;
 exports.UtilGestureModifiers = UtilGestureModifiers;
+exports.UtilGestureTap = UtilGestureTap;
 exports.UtilHsv = UtilHsv;
 exports.UtilHtmlElement = UtilHtmlElement;
 exports.UtilHtmlElementClipperExImpl = UtilHtmlElementClipperExImpl;