@wcardinal/wcardinal-ui 0.333.0 → 0.335.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.333.0
+ Winter Cardinal UI v0.335.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -49273,6 +49273,31 @@ var DThemeWhiteButtonSelect = /** @class */ (function (_super) {
     return DThemeWhiteButtonSelect;
 }(DThemeWhiteButton));
 
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var toId = function (target) {
+    if (target != null) {
+        if (isString(target)) {
+            return target;
+        }
+        else if (isNumber(target)) {
+            return target;
+        }
+        else if ("id" in target) {
+            return target.id;
+        }
+        else if ("name" in target) {
+            return target.name;
+        }
+        else if ("label" in target) {
+            return target.label;
+        }
+    }
+    return 0;
+};
+
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
@@ -49289,7 +49314,13 @@ var DThemeWhiteDialogSelect = /** @class */ (function (_super) {
         return null;
     };
     DThemeWhiteDialogSelect.prototype.getInputMargin = function () {
-        return 32;
+        return 19;
+    };
+    DThemeWhiteDialogSelect.prototype.toCategoryId = function (category) {
+        return toId(category);
+    };
+    DThemeWhiteDialogSelect.prototype.toCategoryLabel = function (category) {
+        return toLabel$1(category);
     };
     return DThemeWhiteDialogSelect;
 }(DThemeWhiteDialogLayered));
@@ -58564,7 +58595,13 @@ var DThemeDarkDialogSelect = /** @class */ (function (_super) {
         return null;
     };
     DThemeDarkDialogSelect.prototype.getInputMargin = function () {
-        return 32;
+        return 19;
+    };
+    DThemeDarkDialogSelect.prototype.toCategoryId = function (category) {
+        return toId(category);
+    };
+    DThemeDarkDialogSelect.prototype.toCategoryLabel = function (category) {
+        return toLabel$1(category);
     };
     return DThemeDarkDialogSelect;
 }(DThemeDarkDialogLayered));
@@ -73623,7 +73660,7 @@ var DDialogSelectSearhImpl = /** @class */ (function (_super) {
     DDialogSelectSearhImpl.prototype.create = function (args) {
         var _this = this;
         var id = ++this._id;
-        this._search(args[0]).then(function (searchResult) {
+        this._search(args[0], args[1]).then(function (searchResult) {
             if (_this._id === id) {
                 _this._idCompleted = id;
                 _this.emit("success", _this, searchResult);
@@ -73836,7 +73873,7 @@ var DDialogSelect = /** @class */ (function (_super) {
         get: function () {
             var result = this._inputLayout;
             if (result == null) {
-                result = this.newInputLayout(this.input, this.theme, this._options);
+                result = this.newInputLayout();
                 this._inputLayout = result;
             }
             return result;
@@ -73844,20 +73881,78 @@ var DDialogSelect = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    DDialogSelect.prototype.newInputLayout = function (input, theme, options) {
-        return new DLayoutHorizontal(this.toInputLayoutOptions(input, theme, options));
-    };
-    DDialogSelect.prototype.toInputLayoutOptions = function (input, theme, options) {
-        var margin = this.toInputMargin(theme, options);
-        return {
+    DDialogSelect.prototype.newInputLayout = function () {
+        return new DLayoutHorizontal({
             width: "padding",
             height: "auto",
-            children: [
-                new DLayoutSpace({ width: margin }),
-                input,
-                new DLayoutSpace({ width: margin })
-            ]
-        };
+            children: [this.spaceLeft, this.selectCategory, this.input, this.spaceRight]
+        });
+    };
+    Object.defineProperty(DDialogSelect.prototype, "spaceLeft", {
+        get: function () {
+            var result = this._spaceLeft;
+            if (result == null) {
+                result = this.newSpace();
+                this._spaceLeft = result;
+            }
+            return result;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(DDialogSelect.prototype, "spaceRight", {
+        get: function () {
+            var result = this._spaceRight;
+            if (result == null) {
+                result = this.newSpace();
+                this._spaceRight = result;
+            }
+            return result;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    DDialogSelect.prototype.newSpace = function () {
+        return new DLayoutSpace({
+            width: this.toInputMargin(this.theme, this._options)
+        });
+    };
+    Object.defineProperty(DDialogSelect.prototype, "selectCategory", {
+        get: function () {
+            var result = this._selectCategory;
+            if (result === undefined) {
+                result = this.newSelectCategory();
+                this._selectCategory = result;
+            }
+            return result;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    DDialogSelect.prototype.newSelectCategory = function () {
+        var _this = this;
+        var options = this._options;
+        if (options != null) {
+            var controller = options.controller;
+            if (controller != null && controller.getCategories != null) {
+                var result = new DSelect(this.toSelectCategoryOptions(this.theme, this._options));
+                result.on("change", function (value) {
+                    _this.onSelectCategoryChange(value);
+                });
+                return result;
+            }
+        }
+        return null;
+    };
+    DDialogSelect.prototype.toSelectCategoryOptions = function (theme, options) {
+        var result = (options === null || options === void 0 ? void 0 : options.category) || {};
+        if (result.width === undefined && result.weight === undefined) {
+            result.width = 140;
+        }
+        return result;
+    };
+    DDialogSelect.prototype.onSelectCategoryChange = function (categoryId) {
+        this.search.create([this.input.value, categoryId]);
     };
     Object.defineProperty(DDialogSelect.prototype, "input", {
         get: function () {
@@ -73875,7 +73970,7 @@ var DDialogSelect = /** @class */ (function (_super) {
         var _this = this;
         var result = new DInputSearch(this.toInputOptions(this.theme, this._options));
         result.on("input", function (value) {
-            _this.search.create([value]);
+            _this.onInputInput(value);
         });
         return result;
     };
@@ -73890,6 +73985,10 @@ var DDialogSelect = /** @class */ (function (_super) {
         var _a, _b;
         return (_b = (_a = options === null || options === void 0 ? void 0 : options.input) === null || _a === void 0 ? void 0 : _a.margin) !== null && _b !== void 0 ? _b : theme.getInputMargin();
     };
+    DDialogSelect.prototype.onInputInput = function (value) {
+        var _a, _b;
+        this.search.create([value, (_b = (_a = this.selectCategory) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null]);
+    };
     Object.defineProperty(DDialogSelect.prototype, "list", {
         get: function () {
             var result = this._list;
@@ -74068,9 +74167,91 @@ var DDialogSelect = /** @class */ (function (_super) {
         return "DDialogSelect";
     };
     DDialogSelect.prototype.onOpen = function () {
+        var _this = this;
         _super.prototype.onOpen.call(this);
         this.list.selection.clear();
-        this.search.create([this.input.value]);
+        var selectCategory = this.selectCategory;
+        if (selectCategory != null) {
+            if (this._isCategoryFetched !== true) {
+                this._isCategoryFetched = true;
+                var categoriesOrPromise = this.findCategories();
+                if (categoriesOrPromise == null) {
+                    this.search.create([this.input.value, null]);
+                }
+                else if (isArray(categoriesOrPromise)) {
+                    this.onCategoryFetched(selectCategory, categoriesOrPromise);
+                }
+                else {
+                    selectCategory.state.isEnabled = false;
+                    categoriesOrPromise.then(function (categories) {
+                        selectCategory.state.isEnabled = true;
+                        _this.onCategoryFetched(selectCategory, categories);
+                    });
+                }
+            }
+            else {
+                this.search.create([this.input.value, selectCategory.value]);
+            }
+        }
+        else {
+            this.search.create([this.input.value, null]);
+        }
+    };
+    DDialogSelect.prototype.onCategoryFetched = function (selectCategory, categories) {
+        var items = [];
+        for (var i = 0, imax = categories.length; i < imax; ++i) {
+            var category = categories[i];
+            items.push({
+                value: this.toCategoryId(category),
+                text: {
+                    value: this.toCategoryLabel(category)
+                }
+            });
+        }
+        selectCategory.menu = new DMenu({
+            fit: true,
+            items: items
+        });
+        var newValue = 0 < items.length ? items[0].value : null;
+        selectCategory.value = newValue;
+        selectCategory.show();
+        this.search.create([this.input.value, newValue]);
+    };
+    DDialogSelect.prototype.toCategoryId = function (target) {
+        var options = this._options;
+        if (options != null) {
+            var category = options.category;
+            if (category != null) {
+                var toId = category.toId;
+                if (toId != null) {
+                    return toId(target);
+                }
+            }
+        }
+        return this.theme.toCategoryId(target);
+    };
+    DDialogSelect.prototype.toCategoryLabel = function (target) {
+        var options = this._options;
+        if (options != null) {
+            var category = options.category;
+            if (category != null) {
+                var toLabel = category.toLabel;
+                if (toLabel != null) {
+                    return toLabel(target);
+                }
+            }
+        }
+        return this.theme.toCategoryLabel(target);
+    };
+    DDialogSelect.prototype.findCategories = function () {
+        var options = this._options;
+        if (options != null) {
+            var controller = options.controller;
+            if (controller != null && controller.getCategories != null) {
+                return controller.getCategories();
+            }
+        }
+        return null;
     };
     DDialogSelect.prototype.onOk = function (value) {
         this.emit("select", value, this);
@@ -74113,47 +74294,12 @@ var defaultGetter$1 = function (dialog) {
 var defaultSetter$1 = function () {
     // DO NOTHING
 };
-var toOptions = function (options) {
-    var _a, _b, _c;
-    if (options) {
-        // Try to copy text.formatter to dialog.item.text.formatter at first
-        var formatter = (_a = options.text) === null || _a === void 0 ? void 0 : _a.formatter;
-        if (formatter !== undefined) {
-            var dialog = options.dialog;
-            if (!(dialog && "open" in dialog)) {
-                dialog = dialog || {};
-                var item = (dialog.item = dialog.item || {});
-                var text = (item.text = item.text || {});
-                if (text.formatter === undefined) {
-                    // Assumes formatter is ( value: DIALOG_VALUE | null, caller: any ) => string.
-                    text.formatter = formatter;
-                }
-            }
-        }
-        else {
-            // Try to copy dialog.item.text.formatter to text.formatter
-            var dialog = options.dialog;
-            if (!(dialog && "open" in dialog)) {
-                var dialogFormatter = (_c = (_b = dialog === null || dialog === void 0 ? void 0 : dialog.item) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.formatter;
-                if (dialogFormatter !== undefined) {
-                    var text = options.text || {};
-                    options.text = text;
-                    if (text.formatter === undefined) {
-                        // Assumes dialogFormatter is ( value: VALUE | null, caller: any ) => string.
-                        text.formatter = dialogFormatter;
-                    }
-                }
-            }
-        }
-    }
-    return options;
-};
 var DButtonSelect = /** @class */ (function (_super) {
     __extends(DButtonSelect, _super);
     function DButtonSelect(options) {
         var _this = this;
         var _a, _b;
-        _this = _super.call(this, toOptions(options)) || this;
+        _this = _super.call(this, options) || this;
         _this._dialogGetter = (_a = options === null || options === void 0 ? void 0 : options.getter) !== null && _a !== void 0 ? _a : defaultGetter$1;
         _this._dialogSetter = (_b = options === null || options === void 0 ? void 0 : options.setter) !== null && _b !== void 0 ? _b : defaultSetter$1;
         return _this;
@@ -74183,7 +74329,7 @@ var DButtonSelect = /** @class */ (function (_super) {
                     dialog = options;
                 }
                 else {
-                    // Assumes DIALOG === DDialogSelect<DIALOG_VALUE>.
+                    // Assumes DIALOG === DDialogSelect<DIALOG_VALUE, DIALOG_CATEGORY, DIALOG_CATEGORY_ID>.
                     dialog = new DDialogSelect(options);
                 }
                 this._dialog = dialog;
@@ -95130,6 +95276,7 @@ exports.toDash = toDash;
 exports.toEnum = toEnum;
 exports.toGradientImageUrl = toGradientImageUrl;
 exports.toGradientSerialized = toGradientSerialized;
+exports.toId = toId;
 exports.toImageElement = toImageElement;
 exports.toIndexOf = toIndexOf;
 exports.toLabel = toLabel$1;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.333.0
+ Winter Cardinal UI v0.335.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -46990,6 +46990,31 @@
         return target;
     };
 
+    /*
+     * Copyright (C) 2019 Toshiba Corporation
+     * SPDX-License-Identifier: Apache-2.0
+     */
+    var toId = function (target) {
+        if (target != null) {
+            if (isString(target)) {
+                return target;
+            }
+            else if (isNumber(target)) {
+                return target;
+            }
+            else if ("id" in target) {
+                return target.id;
+            }
+            else if ("name" in target) {
+                return target.name;
+            }
+            else if ("label" in target) {
+                return target.label;
+            }
+        }
+        return 0;
+    };
+
     /*
      * Copyright (C) 2019 Toshiba Corporation
      * SPDX-License-Identifier: Apache-2.0
@@ -55103,7 +55128,7 @@
         DDialogSelectSearhImpl.prototype.create = function (args) {
             var _this = this;
             var id = ++this._id;
-            this._search(args[0]).then(function (searchResult) {
+            this._search(args[0], args[1]).then(function (searchResult) {
                 if (_this._id === id) {
                     _this._idCompleted = id;
                     _this.emit("success", _this, searchResult);
@@ -55316,7 +55341,7 @@
             get: function () {
                 var result = this._inputLayout;
                 if (result == null) {
-                    result = this.newInputLayout(this.input, this.theme, this._options);
+                    result = this.newInputLayout();
                     this._inputLayout = result;
                 }
                 return result;
@@ -55324,20 +55349,78 @@
             enumerable: false,
             configurable: true
         });
-        DDialogSelect.prototype.newInputLayout = function (input, theme, options) {
-            return new DLayoutHorizontal(this.toInputLayoutOptions(input, theme, options));
-        };
-        DDialogSelect.prototype.toInputLayoutOptions = function (input, theme, options) {
-            var margin = this.toInputMargin(theme, options);
-            return {
+        DDialogSelect.prototype.newInputLayout = function () {
+            return new DLayoutHorizontal({
                 width: "padding",
                 height: "auto",
-                children: [
-                    new DLayoutSpace({ width: margin }),
-                    input,
-                    new DLayoutSpace({ width: margin })
-                ]
-            };
+                children: [this.spaceLeft, this.selectCategory, this.input, this.spaceRight]
+            });
+        };
+        Object.defineProperty(DDialogSelect.prototype, "spaceLeft", {
+            get: function () {
+                var result = this._spaceLeft;
+                if (result == null) {
+                    result = this.newSpace();
+                    this._spaceLeft = result;
+                }
+                return result;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(DDialogSelect.prototype, "spaceRight", {
+            get: function () {
+                var result = this._spaceRight;
+                if (result == null) {
+                    result = this.newSpace();
+                    this._spaceRight = result;
+                }
+                return result;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DDialogSelect.prototype.newSpace = function () {
+            return new DLayoutSpace({
+                width: this.toInputMargin(this.theme, this._options)
+            });
+        };
+        Object.defineProperty(DDialogSelect.prototype, "selectCategory", {
+            get: function () {
+                var result = this._selectCategory;
+                if (result === undefined) {
+                    result = this.newSelectCategory();
+                    this._selectCategory = result;
+                }
+                return result;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        DDialogSelect.prototype.newSelectCategory = function () {
+            var _this = this;
+            var options = this._options;
+            if (options != null) {
+                var controller = options.controller;
+                if (controller != null && controller.getCategories != null) {
+                    var result = new DSelect(this.toSelectCategoryOptions(this.theme, this._options));
+                    result.on("change", function (value) {
+                        _this.onSelectCategoryChange(value);
+                    });
+                    return result;
+                }
+            }
+            return null;
+        };
+        DDialogSelect.prototype.toSelectCategoryOptions = function (theme, options) {
+            var result = (options === null || options === void 0 ? void 0 : options.category) || {};
+            if (result.width === undefined && result.weight === undefined) {
+                result.width = 140;
+            }
+            return result;
+        };
+        DDialogSelect.prototype.onSelectCategoryChange = function (categoryId) {
+            this.search.create([this.input.value, categoryId]);
         };
         Object.defineProperty(DDialogSelect.prototype, "input", {
             get: function () {
@@ -55355,7 +55438,7 @@
             var _this = this;
             var result = new DInputSearch(this.toInputOptions(this.theme, this._options));
             result.on("input", function (value) {
-                _this.search.create([value]);
+                _this.onInputInput(value);
             });
             return result;
         };
@@ -55370,6 +55453,10 @@
             var _a, _b;
             return (_b = (_a = options === null || options === void 0 ? void 0 : options.input) === null || _a === void 0 ? void 0 : _a.margin) !== null && _b !== void 0 ? _b : theme.getInputMargin();
         };
+        DDialogSelect.prototype.onInputInput = function (value) {
+            var _a, _b;
+            this.search.create([value, (_b = (_a = this.selectCategory) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : null]);
+        };
         Object.defineProperty(DDialogSelect.prototype, "list", {
             get: function () {
                 var result = this._list;
@@ -55548,9 +55635,91 @@
             return "DDialogSelect";
         };
         DDialogSelect.prototype.onOpen = function () {
+            var _this = this;
             _super.prototype.onOpen.call(this);
             this.list.selection.clear();
-            this.search.create([this.input.value]);
+            var selectCategory = this.selectCategory;
+            if (selectCategory != null) {
+                if (this._isCategoryFetched !== true) {
+                    this._isCategoryFetched = true;
+                    var categoriesOrPromise = this.findCategories();
+                    if (categoriesOrPromise == null) {
+                        this.search.create([this.input.value, null]);
+                    }
+                    else if (isArray(categoriesOrPromise)) {
+                        this.onCategoryFetched(selectCategory, categoriesOrPromise);
+                    }
+                    else {
+                        selectCategory.state.isEnabled = false;
+                        categoriesOrPromise.then(function (categories) {
+                            selectCategory.state.isEnabled = true;
+                            _this.onCategoryFetched(selectCategory, categories);
+                        });
+                    }
+                }
+                else {
+                    this.search.create([this.input.value, selectCategory.value]);
+                }
+            }
+            else {
+                this.search.create([this.input.value, null]);
+            }
+        };
+        DDialogSelect.prototype.onCategoryFetched = function (selectCategory, categories) {
+            var items = [];
+            for (var i = 0, imax = categories.length; i < imax; ++i) {
+                var category = categories[i];
+                items.push({
+                    value: this.toCategoryId(category),
+                    text: {
+                        value: this.toCategoryLabel(category)
+                    }
+                });
+            }
+            selectCategory.menu = new DMenu({
+                fit: true,
+                items: items
+            });
+            var newValue = 0 < items.length ? items[0].value : null;
+            selectCategory.value = newValue;
+            selectCategory.show();
+            this.search.create([this.input.value, newValue]);
+        };
+        DDialogSelect.prototype.toCategoryId = function (target) {
+            var options = this._options;
+            if (options != null) {
+                var category = options.category;
+                if (category != null) {
+                    var toId = category.toId;
+                    if (toId != null) {
+                        return toId(target);
+                    }
+                }
+            }
+            return this.theme.toCategoryId(target);
+        };
+        DDialogSelect.prototype.toCategoryLabel = function (target) {
+            var options = this._options;
+            if (options != null) {
+                var category = options.category;
+                if (category != null) {
+                    var toLabel = category.toLabel;
+                    if (toLabel != null) {
+                        return toLabel(target);
+                    }
+                }
+            }
+            return this.theme.toCategoryLabel(target);
+        };
+        DDialogSelect.prototype.findCategories = function () {
+            var options = this._options;
+            if (options != null) {
+                var controller = options.controller;
+                if (controller != null && controller.getCategories != null) {
+                    return controller.getCategories();
+                }
+            }
+            return null;
         };
         DDialogSelect.prototype.onOk = function (value) {
             this.emit("select", value, this);
@@ -55593,47 +55762,12 @@
     var defaultSetter$1 = function () {
         // DO NOTHING
     };
-    var toOptions = function (options) {
-        var _a, _b, _c;
-        if (options) {
-            // Try to copy text.formatter to dialog.item.text.formatter at first
-            var formatter = (_a = options.text) === null || _a === void 0 ? void 0 : _a.formatter;
-            if (formatter !== undefined) {
-                var dialog = options.dialog;
-                if (!(dialog && "open" in dialog)) {
-                    dialog = dialog || {};
-                    var item = (dialog.item = dialog.item || {});
-                    var text = (item.text = item.text || {});
-                    if (text.formatter === undefined) {
-                        // Assumes formatter is ( value: DIALOG_VALUE | null, caller: any ) => string.
-                        text.formatter = formatter;
-                    }
-                }
-            }
-            else {
-                // Try to copy dialog.item.text.formatter to text.formatter
-                var dialog = options.dialog;
-                if (!(dialog && "open" in dialog)) {
-                    var dialogFormatter = (_c = (_b = dialog === null || dialog === void 0 ? void 0 : dialog.item) === null || _b === void 0 ? void 0 : _b.text) === null || _c === void 0 ? void 0 : _c.formatter;
-                    if (dialogFormatter !== undefined) {
-                        var text = options.text || {};
-                        options.text = text;
-                        if (text.formatter === undefined) {
-                            // Assumes dialogFormatter is ( value: VALUE | null, caller: any ) => string.
-                            text.formatter = dialogFormatter;
-                        }
-                    }
-                }
-            }
-        }
-        return options;
-    };
     var DButtonSelect = /** @class */ (function (_super) {
         __extends(DButtonSelect, _super);
         function DButtonSelect(options) {
             var _this = this;
             var _a, _b;
-            _this = _super.call(this, toOptions(options)) || this;
+            _this = _super.call(this, options) || this;
             _this._dialogGetter = (_a = options === null || options === void 0 ? void 0 : options.getter) !== null && _a !== void 0 ? _a : defaultGetter$1;
             _this._dialogSetter = (_b = options === null || options === void 0 ? void 0 : options.setter) !== null && _b !== void 0 ? _b : defaultSetter$1;
             return _this;
@@ -55663,7 +55797,7 @@
                         dialog = options;
                     }
                     else {
-                        // Assumes DIALOG === DDialogSelect<DIALOG_VALUE>.
+                        // Assumes DIALOG === DDialogSelect<DIALOG_VALUE, DIALOG_CATEGORY, DIALOG_CATEGORY_ID>.
                         dialog = new DDialogSelect(options);
                     }
                     this._dialog = dialog;
@@ -75628,6 +75762,7 @@
         toCeilingIndex: toCeilingIndex,
         toCloned: toCloned,
         toEnum: toEnum,
+        toId: toId,
         toIndexOf: toIndexOf,
         toLabel: toLabel$1,
         toMerged: toMerged,