@wcardinal/wcardinal-ui 0.291.0 → 0.292.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.291.0
+ Winter Cardinal UI v0.292.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -72590,7 +72590,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         var _a, _b;
         this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
         this._position = this.toPosition(theme, options);
-        this._tick = this.toTickContainer(theme, options);
+        this._tick = this.toTick(theme, options);
         this._label = this.toLabel(theme, options);
         this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
         this._bar = this.toBar(theme, options);
@@ -72654,7 +72654,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             stroke: this.toBarStroke(theme, options === null || options === void 0 ? void 0 : options.stroke)
         };
     };
-    DChartAxisBaseOptionParser.prototype.toTickContainer = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTick = function (theme, options) {
         var _a;
         var tick = options === null || options === void 0 ? void 0 : options.tick;
         return {
@@ -72765,7 +72765,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_h = (_g = optionsA.width) !== null && _g !== void 0 ? _g : optionsB.width) !== null && _h !== void 0 ? _h : width,
                     align: (_k = (_j = optionsA.align) !== null && _j !== void 0 ? _j : optionsB.align) !== null && _k !== void 0 ? _k : align,
                     side: (_m = (_l = optionsA.side) !== null && _l !== void 0 ? _l : optionsB.side) !== null && _m !== void 0 ? _m : side,
-                    style: (_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style
+                    style: this.toStrokeStyle((_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style)
                 };
             }
             else {
@@ -72776,7 +72776,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_t = optionsA.width) !== null && _t !== void 0 ? _t : width,
                     align: (_u = optionsA.align) !== null && _u !== void 0 ? _u : align,
                     side: (_v = optionsA.side) !== null && _v !== void 0 ? _v : side,
-                    style: (_w = optionsA.style) !== null && _w !== void 0 ? _w : style
+                    style: this.toStrokeStyle((_w = optionsA.style) !== null && _w !== void 0 ? _w : style)
                 };
             }
         }
@@ -72788,7 +72788,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 width: (_0 = optionsB.width) !== null && _0 !== void 0 ? _0 : width,
                 align: (_1 = optionsB.align) !== null && _1 !== void 0 ? _1 : align,
                 side: (_2 = optionsB.side) !== null && _2 !== void 0 ? _2 : side,
-                style: (_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style
+                style: this.toStrokeStyle((_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style)
             };
         }
         else {
@@ -72803,6 +72803,19 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
+    DChartAxisBaseOptionParser.prototype.toStrokeStyle = function (target) {
+        if (isString(target)) {
+            return EShapeStrokeStyle[target];
+        }
+        else if (isArray(target)) {
+            var result = EShapeStrokeStyle.NONE;
+            for (var i = 0, imax = target.length; i < imax; ++i) {
+                result |= EShapeStrokeStyle[target[i]];
+            }
+            return result;
+        }
+        return target;
+    };
     DChartAxisBaseOptionParser.prototype.toTickMajorFormatter = function (theme, options) {
         var text = options === null || options === void 0 ? void 0 : options.text;
         if (text) {
@@ -72836,10 +72849,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             alpha: options.alpha,
             family: options.family,
             size: options.size,
-            weight: options.weight,
+            weight: toEnum(options.weight, EShapeTextWeight),
             align: this.toTickMajorTextAlign(theme, options.align),
             offset: this.toTickMajorTextOffset(theme, options.offset),
-            style: options.style,
+            style: toEnum(options.style, EShapeTextStyle),
             outline: this.toTickMajorTextOutline(theme, options.outline),
             spacing: this.toTickMajorTextSpacing(theme, options.spacing),
             direction: this.toTickMajorTextDirection(theme, options.direction),
@@ -72889,7 +72902,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMajorTextDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toTickMajorTextColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getMajorTickTextColor();
@@ -72927,10 +72940,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             alpha: options.alpha,
             family: options.family,
             size: options.size,
-            weight: options.weight,
+            weight: toEnum(options.weight, EShapeTextWeight),
             align: this.toTickMinorTextAlign(theme, options.align),
             offset: this.toTickMinorTextOffset(theme, options.offset),
-            style: options.style,
+            style: toEnum(options.style, EShapeTextStyle),
             outline: this.toTickMinorTextOutline(theme, options.outline),
             spacing: this.toTickMinorTextSpacing(theme, options.spacing),
             direction: this.toTickMinorTextDirection(theme, options.direction),
@@ -72980,7 +72993,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMinorTextDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toTickMinorTextColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getMinorTickTextColor();
@@ -72994,10 +73007,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 alpha: label.alpha,
                 family: label.family,
                 size: label.size,
-                weight: label.weight,
+                weight: toEnum(label.weight, EShapeTextWeight),
                 align: this.toLabelAlign(theme, label.align),
                 offset: this.toLabelOffset(theme, label.offset),
-                style: label.style,
+                style: toEnum(label.style, EShapeTextStyle),
                 outline: this.toLabelOutline(theme, label.outline),
                 spacing: this.toLabelSpacing(theme, label.spacing),
                 direction: this.toLabelDirection(theme, label.direction),
@@ -73048,7 +73061,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toLabelDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getLabelDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getLabelDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toLabelColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getLabelColor();
@@ -73293,11 +73306,11 @@ var DChartAxisBaseTickMinor = /** @class */ (function () {
 }());
 
 var DChartAxisBaseTickContainer = /** @class */ (function () {
-    function DChartAxisBaseTickContainer(parser) {
+    function DChartAxisBaseTickContainer(parser, options) {
         this._parser = parser;
         this._index = 0;
-        this._major = this.newMajor(parser);
-        this._minor = this.newMinor(parser);
+        this._major = this.newMajor(parser, options);
+        this._minor = this.newMinor(parser, options);
         this._majorTicks = [];
         this._minorTicks = [];
     }
@@ -73308,7 +73321,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    DChartAxisBaseTickContainer.prototype.newMajor = function (parser) {
+    DChartAxisBaseTickContainer.prototype.newMajor = function (parser, options) {
         return new DChartAxisBaseTickMajor(parser);
     };
     Object.defineProperty(DChartAxisBaseTickContainer.prototype, "minor", {
@@ -73318,7 +73331,7 @@ var DChartAxisBaseTickContainer = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    DChartAxisBaseTickContainer.prototype.newMinor = function (parser) {
+    DChartAxisBaseTickContainer.prototype.newMinor = function (parser, options) {
         return new DChartAxisBaseTickMinor(parser);
     };
     DChartAxisBaseTickContainer.prototype.bind = function (container, index) {
@@ -73542,11 +73555,11 @@ var DChartAxisBase = /** @class */ (function () {
     function DChartAxisBase(options) {
         var theme = this.toTheme(options);
         this._theme = theme;
-        var parser = new DChartAxisBaseOptionParser(theme, options);
+        var parser = this.newParser(theme, options);
         this._parser = parser;
         this._index = 0;
-        this._bar = this.newBar(parser);
-        this._tick = this.newTick(parser);
+        this._bar = this.newBar(parser, theme, options);
+        this._tick = this.newTick(parser, theme, options);
     }
     Object.defineProperty(DChartAxisBase.prototype, "parser", {
         get: function () {
@@ -73555,6 +73568,9 @@ var DChartAxisBase = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    DChartAxisBase.prototype.newParser = function (theme, options) {
+        return new DChartAxisBaseOptionParser(theme, options);
+    };
     Object.defineProperty(DChartAxisBase.prototype, "position", {
         get: function () {
             return this._parser.position;
@@ -73569,7 +73585,7 @@ var DChartAxisBase = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    DChartAxisBase.prototype.newBar = function (parser) {
+    DChartAxisBase.prototype.newBar = function (parser, theme, options) {
         return new DChartAxisBaseBar(parser);
     };
     Object.defineProperty(DChartAxisBase.prototype, "tick", {
@@ -73579,7 +73595,7 @@ var DChartAxisBase = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    DChartAxisBase.prototype.newTick = function (parser) {
+    DChartAxisBase.prototype.newTick = function (parser, theme, options) {
         return new DChartAxisBaseTickContainer(parser);
     };
     DChartAxisBase.prototype.bind = function (container, index) {

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.291.0
+ Winter Cardinal UI v0.292.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -54274,7 +54274,7 @@
             var _a, _b;
             this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
             this._position = this.toPosition(theme, options);
-            this._tick = this.toTickContainer(theme, options);
+            this._tick = this.toTick(theme, options);
             this._label = this.toLabel(theme, options);
             this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
             this._bar = this.toBar(theme, options);
@@ -54338,7 +54338,7 @@
                 stroke: this.toBarStroke(theme, options === null || options === void 0 ? void 0 : options.stroke)
             };
         };
-        DChartAxisBaseOptionParser.prototype.toTickContainer = function (theme, options) {
+        DChartAxisBaseOptionParser.prototype.toTick = function (theme, options) {
             var _a;
             var tick = options === null || options === void 0 ? void 0 : options.tick;
             return {
@@ -54449,7 +54449,7 @@
                         width: (_h = (_g = optionsA.width) !== null && _g !== void 0 ? _g : optionsB.width) !== null && _h !== void 0 ? _h : width,
                         align: (_k = (_j = optionsA.align) !== null && _j !== void 0 ? _j : optionsB.align) !== null && _k !== void 0 ? _k : align,
                         side: (_m = (_l = optionsA.side) !== null && _l !== void 0 ? _l : optionsB.side) !== null && _m !== void 0 ? _m : side,
-                        style: (_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style
+                        style: this.toStrokeStyle((_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style)
                     };
                 }
                 else {
@@ -54460,7 +54460,7 @@
                         width: (_t = optionsA.width) !== null && _t !== void 0 ? _t : width,
                         align: (_u = optionsA.align) !== null && _u !== void 0 ? _u : align,
                         side: (_v = optionsA.side) !== null && _v !== void 0 ? _v : side,
-                        style: (_w = optionsA.style) !== null && _w !== void 0 ? _w : style
+                        style: this.toStrokeStyle((_w = optionsA.style) !== null && _w !== void 0 ? _w : style)
                     };
                 }
             }
@@ -54472,7 +54472,7 @@
                     width: (_0 = optionsB.width) !== null && _0 !== void 0 ? _0 : width,
                     align: (_1 = optionsB.align) !== null && _1 !== void 0 ? _1 : align,
                     side: (_2 = optionsB.side) !== null && _2 !== void 0 ? _2 : side,
-                    style: (_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style
+                    style: this.toStrokeStyle((_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style)
                 };
             }
             else {
@@ -54487,6 +54487,19 @@
                 };
             }
         };
+        DChartAxisBaseOptionParser.prototype.toStrokeStyle = function (target) {
+            if (isString(target)) {
+                return EShapeStrokeStyle[target];
+            }
+            else if (isArray(target)) {
+                var result = EShapeStrokeStyle.NONE;
+                for (var i = 0, imax = target.length; i < imax; ++i) {
+                    result |= EShapeStrokeStyle[target[i]];
+                }
+                return result;
+            }
+            return target;
+        };
         DChartAxisBaseOptionParser.prototype.toTickMajorFormatter = function (theme, options) {
             var text = options === null || options === void 0 ? void 0 : options.text;
             if (text) {
@@ -54520,10 +54533,10 @@
                 alpha: options.alpha,
                 family: options.family,
                 size: options.size,
-                weight: options.weight,
+                weight: toEnum(options.weight, EShapeTextWeight),
                 align: this.toTickMajorTextAlign(theme, options.align),
                 offset: this.toTickMajorTextOffset(theme, options.offset),
-                style: options.style,
+                style: toEnum(options.style, EShapeTextStyle),
                 outline: this.toTickMajorTextOutline(theme, options.outline),
                 spacing: this.toTickMajorTextSpacing(theme, options.spacing),
                 direction: this.toTickMajorTextDirection(theme, options.direction),
@@ -54573,7 +54586,7 @@
             };
         };
         DChartAxisBaseOptionParser.prototype.toTickMajorTextDirection = function (theme, options) {
-            return options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection();
+            return toEnum(options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection(), EShapeTextDirection);
         };
         DChartAxisBaseOptionParser.prototype.toTickMajorTextColor = function (theme, options) {
             return options !== null && options !== void 0 ? options : theme.getMajorTickTextColor();
@@ -54611,10 +54624,10 @@
                 alpha: options.alpha,
                 family: options.family,
                 size: options.size,
-                weight: options.weight,
+                weight: toEnum(options.weight, EShapeTextWeight),
                 align: this.toTickMinorTextAlign(theme, options.align),
                 offset: this.toTickMinorTextOffset(theme, options.offset),
-                style: options.style,
+                style: toEnum(options.style, EShapeTextStyle),
                 outline: this.toTickMinorTextOutline(theme, options.outline),
                 spacing: this.toTickMinorTextSpacing(theme, options.spacing),
                 direction: this.toTickMinorTextDirection(theme, options.direction),
@@ -54664,7 +54677,7 @@
             };
         };
         DChartAxisBaseOptionParser.prototype.toTickMinorTextDirection = function (theme, options) {
-            return options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection();
+            return toEnum(options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection(), EShapeTextDirection);
         };
         DChartAxisBaseOptionParser.prototype.toTickMinorTextColor = function (theme, options) {
             return options !== null && options !== void 0 ? options : theme.getMinorTickTextColor();
@@ -54678,10 +54691,10 @@
                     alpha: label.alpha,
                     family: label.family,
                     size: label.size,
-                    weight: label.weight,
+                    weight: toEnum(label.weight, EShapeTextWeight),
                     align: this.toLabelAlign(theme, label.align),
                     offset: this.toLabelOffset(theme, label.offset),
-                    style: label.style,
+                    style: toEnum(label.style, EShapeTextStyle),
                     outline: this.toLabelOutline(theme, label.outline),
                     spacing: this.toLabelSpacing(theme, label.spacing),
                     direction: this.toLabelDirection(theme, label.direction),
@@ -54732,7 +54745,7 @@
             };
         };
         DChartAxisBaseOptionParser.prototype.toLabelDirection = function (theme, options) {
-            return options !== null && options !== void 0 ? options : theme.getLabelDirection();
+            return toEnum(options !== null && options !== void 0 ? options : theme.getLabelDirection(), EShapeTextDirection);
         };
         DChartAxisBaseOptionParser.prototype.toLabelColor = function (theme, options) {
             return options !== null && options !== void 0 ? options : theme.getLabelColor();
@@ -54977,11 +54990,11 @@
     }());
 
     var DChartAxisBaseTickContainer = /** @class */ (function () {
-        function DChartAxisBaseTickContainer(parser) {
+        function DChartAxisBaseTickContainer(parser, options) {
             this._parser = parser;
             this._index = 0;
-            this._major = this.newMajor(parser);
-            this._minor = this.newMinor(parser);
+            this._major = this.newMajor(parser, options);
+            this._minor = this.newMinor(parser, options);
             this._majorTicks = [];
             this._minorTicks = [];
         }
@@ -54992,7 +55005,7 @@
             enumerable: false,
             configurable: true
         });
-        DChartAxisBaseTickContainer.prototype.newMajor = function (parser) {
+        DChartAxisBaseTickContainer.prototype.newMajor = function (parser, options) {
             return new DChartAxisBaseTickMajor(parser);
         };
         Object.defineProperty(DChartAxisBaseTickContainer.prototype, "minor", {
@@ -55002,7 +55015,7 @@
             enumerable: false,
             configurable: true
         });
-        DChartAxisBaseTickContainer.prototype.newMinor = function (parser) {
+        DChartAxisBaseTickContainer.prototype.newMinor = function (parser, options) {
             return new DChartAxisBaseTickMinor(parser);
         };
         DChartAxisBaseTickContainer.prototype.bind = function (container, index) {
@@ -55226,11 +55239,11 @@
         function DChartAxisBase(options) {
             var theme = this.toTheme(options);
             this._theme = theme;
-            var parser = new DChartAxisBaseOptionParser(theme, options);
+            var parser = this.newParser(theme, options);
             this._parser = parser;
             this._index = 0;
-            this._bar = this.newBar(parser);
-            this._tick = this.newTick(parser);
+            this._bar = this.newBar(parser, theme, options);
+            this._tick = this.newTick(parser, theme, options);
         }
         Object.defineProperty(DChartAxisBase.prototype, "parser", {
             get: function () {
@@ -55239,6 +55252,9 @@
             enumerable: false,
             configurable: true
         });
+        DChartAxisBase.prototype.newParser = function (theme, options) {
+            return new DChartAxisBaseOptionParser(theme, options);
+        };
         Object.defineProperty(DChartAxisBase.prototype, "position", {
             get: function () {
                 return this._parser.position;
@@ -55253,7 +55269,7 @@
             enumerable: false,
             configurable: true
         });
-        DChartAxisBase.prototype.newBar = function (parser) {
+        DChartAxisBase.prototype.newBar = function (parser, theme, options) {
             return new DChartAxisBaseBar(parser);
         };
         Object.defineProperty(DChartAxisBase.prototype, "tick", {
@@ -55263,7 +55279,7 @@
             enumerable: false,
             configurable: true
         });
-        DChartAxisBase.prototype.newTick = function (parser) {
+        DChartAxisBase.prototype.newTick = function (parser, theme, options) {
             return new DChartAxisBaseTickContainer(parser);
         };
         DChartAxisBase.prototype.bind = function (container, index) {