@wcardinal/wcardinal-ui 0.284.0 → 0.286.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.284.0
+ Winter Cardinal UI v0.286.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -12793,17 +12793,44 @@
                 var keyExpression = void 0;
                 var event_1;
                 if (0 <= arrowIndex) {
-                    keyExpression = expression.substring(0, arrowIndex).trim();
+                    keyExpression = expression.substring(0, arrowIndex).trim().toLowerCase();
                     event_1 = expression.substring(arrowIndex + 2).trim();
                 }
                 else {
-                    keyExpression = expression.trim();
+                    keyExpression = expression.trim().toLowerCase();
+                }
+                var alt = false;
+                var ctrl = false;
+                var shift = false;
+                var key = "a";
+                var length_1 = keyExpression.length;
+                var i = 0;
+                var j = 1;
+                for (; j < length_1; ++j) {
+                    var c = keyExpression.charAt(j);
+                    if (c === "+") {
+                        var part = keyExpression.substring(i, j);
+                        switch (part) {
+                            case "alt":
+                                alt = true;
+                                break;
+                            case "ctrl":
+                                ctrl = true;
+                                break;
+                            case "shift":
+                                shift = true;
+                                break;
+                            default:
+                                key = part;
+                                break;
+                        }
+                        j += 1;
+                        i = j;
+                    }
+                }
+                if (i !== j) {
+                    key = keyExpression.substring(i, j);
                 }
-                var keys = keyExpression.toLowerCase().split("+");
-                var alt = 0 <= keys.indexOf("alt");
-                var ctrl = 0 <= keys.indexOf("ctrl");
-                var shift = 0 <= keys.indexOf("shift");
-                var key = keys[keys.length - 1];
                 return setShortcutKeyAndWhich({
                     alt: alt,
                     ctrl: ctrl,
@@ -67174,7 +67201,18 @@
             }
             var data = body.data;
             if (data && data.toggle) {
-                data.toggle(row);
+                if (data.isExpanded(row)) {
+                    if (data.collapse(row)) {
+                        this.emit("collapse", this);
+                        data.emit("collapse", row, this);
+                    }
+                }
+                else {
+                    if (data.expand(row)) {
+                        this.emit("expand", this);
+                        data.emit("expand", row, this);
+                    }
+                }
             }
         };
         DTableBodyCellInputTree.prototype.onRowSelect = function (e, local) {
@@ -67605,7 +67643,18 @@
             }
             var data = body.data;
             if (data && data.toggle) {
-                data.toggle(row);
+                if (data.isExpanded(row)) {
+                    if (data.collapse(row)) {
+                        this.emit("collapse", this);
+                        data.emit("collapse", row, this);
+                    }
+                }
+                else {
+                    if (data.expand(row)) {
+                        this.emit("expand", this);
+                        data.emit("expand", row, this);
+                    }
+                }
             }
         };
         DTableBodyCellTree.prototype.onRowSelect = function (e, local) {
@@ -70196,7 +70245,6 @@
                 this._isRowsDirty = true;
                 this._filter.toDirty();
                 this.update(true);
-                this.emit("expand", node, this);
                 return true;
             }
             return false;
@@ -70208,7 +70256,6 @@
                 this._isRowsDirty = true;
                 this._filter.toDirty();
                 this.update(true);
-                this.emit("collapse", node, this);
                 return true;
             }
             return false;