@wcardinal/wcardinal-ui 0.294.0 → 0.295.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.294.0
+ Winter Cardinal UI v0.295.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -87882,43 +87882,47 @@ var DTableDataTreeFilter = /** @class */ (function (_super) {
         }
     };
     DTableDataTreeFilter.prototype.hasFiltered = function (parent, nodes, filter) {
-        var toChildren = this._parent.accessor.toChildren;
+        var accessor = this._parent.accessor;
+        var toChildren = accessor.toChildren;
+        var hasChildren = accessor.hasChildren;
         for (var i = 0, imax = nodes.length; i < imax; ++i) {
             var node = nodes[i];
             if (this.isFiltered(node, -1, filter)) {
                 return true;
             }
             var children = toChildren(node);
-            if (children != null &&
-                0 < children.length &&
-                this.hasFiltered(parent, children, filter)) {
+            if (hasChildren(node, children) && this.hasFiltered(parent, children, filter)) {
                 return true;
             }
         }
         return false;
     };
     DTableDataTreeFilter.prototype.addAllToFiltered = function (parent, nodes, filtered, cursor) {
-        var toChildren = this._parent.accessor.toChildren;
+        var accessor = this._parent.accessor;
+        var toChildren = accessor.toChildren;
+        var hasChildren = accessor.hasChildren;
         for (var i = 0, imax = nodes.length; i < imax; ++i) {
             var node = nodes[i];
             filtered.push(cursor[0]);
             cursor[0] += 1;
             var children = toChildren(node);
-            if (children != null && 0 < children.length && parent.isOpened(node)) {
+            if (hasChildren(node, children) && parent.isOpened(node)) {
                 this.addAllToFiltered(parent, children, filtered, cursor);
             }
         }
     };
     DTableDataTreeFilter.prototype.newFilteredSub = function (parent, nodes, filter, filtered, cursor) {
         var result = false;
-        var toChildren = this._parent.accessor.toChildren;
+        var accessor = this._parent.accessor;
+        var toChildren = accessor.toChildren;
+        var hasChildren = accessor.hasChildren;
         for (var i = 0, imax = nodes.length; i < imax; ++i) {
             var node = nodes[i];
             var index = cursor[0];
             cursor[0] += 1;
             var isFiltered = this.isFiltered(node, index, filter);
             var children = toChildren(node);
-            if (children != null && 0 < children.length) {
+            if (hasChildren(node, children)) {
                 if (parent.isOpened(node)) {
                     if (isFiltered) {
                         filtered.push(index);
@@ -88026,11 +88030,21 @@ var toParent = function (node) {
 var toChildren$1 = function (node) {
     return node.children;
 };
+var hasChildren = function (node, children) {
+    return children != null && 0 < children.length;
+};
 var DTableDataTreeItemAccessor = /** @class */ (function () {
     function DTableDataTreeItemAccessor(options) {
-        var _a, _b;
-        this.toParent = (_a = options === null || options === void 0 ? void 0 : options.toParent) !== null && _a !== void 0 ? _a : toParent;
-        this.toChildren = (_b = options === null || options === void 0 ? void 0 : options.toChildren) !== null && _b !== void 0 ? _b : toChildren$1;
+        if (options != null) {
+            this.toParent = options.toParent || toParent;
+            this.toChildren = options.toChildren || toChildren$1;
+            this.hasChildren = options.hasChildren || hasChildren;
+        }
+        else {
+            this.toParent = toParent;
+            this.toChildren = toChildren$1;
+            this.hasChildren = hasChildren;
+        }
     }
     return DTableDataTreeItemAccessor;
 }());
@@ -88072,9 +88086,11 @@ var DTableDataTreeSelectionImpl = /** @class */ (function (_super) {
     });
     DTableDataTreeSelectionImpl.prototype.onNodeChange = function (nodes) {
         if (nodes != null) {
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             var oldRows = this._rows;
-            var newRows = this.newRows(nodes, toChildren, oldRows, new Set());
+            var newRows = this.newRows(nodes, toChildren, hasChildren, oldRows, new Set());
             if (oldRows.size !== newRows.size) {
                 this._rows = newRows;
                 this.onChange();
@@ -88088,15 +88104,15 @@ var DTableDataTreeSelectionImpl = /** @class */ (function (_super) {
             }
         }
     };
-    DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, rows, result) {
+    DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, hasChildren, rows, result) {
         for (var i = 0, imax = nodes.length; i < imax; ++i) {
             var node = nodes[i];
             if (rows.has(node)) {
                 result.add(node);
             }
             var children = toChildren(node);
-            if (children != null) {
-                this.newRows(children, toChildren, rows, result);
+            if (hasChildren(node, children)) {
+                this.newRows(children, toChildren, hasChildren, rows, result);
             }
         }
         return result;
@@ -88535,7 +88551,8 @@ var DTableDataTree = /** @class */ (function (_super) {
         var supplimentals = this._supplimentals;
         var flags = this._flags;
         if (nodes != null) {
-            var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, this._accessor.toChildren);
+            var accessor = this._accessor;
+            var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, accessor.toChildren, accessor.hasChildren);
             if (irows !== rows.length) {
                 rows.length = irows;
                 supplimentals.length = irows;
@@ -88549,7 +88566,7 @@ var DTableDataTree = /** @class */ (function (_super) {
     DTableDataTree.prototype.toSupplimental = function (ilevel, hasChildren, isOpened) {
         return (ilevel << 2) | (hasChildren ? 2 : 0) | (isOpened ? 1 : 0);
     };
-    DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren) {
+    DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren, hasChildren) {
         var nodesLength = nodes.length;
         var istart = reverse ? nodesLength - 1 : 0;
         var idelta = reverse ? -1 : +1;
@@ -88557,7 +88574,7 @@ var DTableDataTree = /** @class */ (function (_super) {
             var node = nodes[i];
             var children = toChildren(node);
             var isOpened = flags.has(node);
-            var supplimental = this.toSupplimental(ilevel, !!(children && 0 < children.length), isOpened);
+            var supplimental = this.toSupplimental(ilevel, hasChildren(node, children), isOpened);
             if (irows < rows.length) {
                 rows[irows] = node;
                 supplimentals[irows] = supplimental;
@@ -88568,7 +88585,7 @@ var DTableDataTree = /** @class */ (function (_super) {
             }
             irows += 1;
             if (isOpened && children) {
-                irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren);
+                irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren, hasChildren);
             }
         }
         return irows;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.294.0
+ Winter Cardinal UI v0.295.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -69661,43 +69661,47 @@
             }
         };
         DTableDataTreeFilter.prototype.hasFiltered = function (parent, nodes, filter) {
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 if (this.isFiltered(node, -1, filter)) {
                     return true;
                 }
                 var children = toChildren(node);
-                if (children != null &&
-                    0 < children.length &&
-                    this.hasFiltered(parent, children, filter)) {
+                if (hasChildren(node, children) && this.hasFiltered(parent, children, filter)) {
                     return true;
                 }
             }
             return false;
         };
         DTableDataTreeFilter.prototype.addAllToFiltered = function (parent, nodes, filtered, cursor) {
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 filtered.push(cursor[0]);
                 cursor[0] += 1;
                 var children = toChildren(node);
-                if (children != null && 0 < children.length && parent.isOpened(node)) {
+                if (hasChildren(node, children) && parent.isOpened(node)) {
                     this.addAllToFiltered(parent, children, filtered, cursor);
                 }
             }
         };
         DTableDataTreeFilter.prototype.newFilteredSub = function (parent, nodes, filter, filtered, cursor) {
             var result = false;
-            var toChildren = this._parent.accessor.toChildren;
+            var accessor = this._parent.accessor;
+            var toChildren = accessor.toChildren;
+            var hasChildren = accessor.hasChildren;
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 var index = cursor[0];
                 cursor[0] += 1;
                 var isFiltered = this.isFiltered(node, index, filter);
                 var children = toChildren(node);
-                if (children != null && 0 < children.length) {
+                if (hasChildren(node, children)) {
                     if (parent.isOpened(node)) {
                         if (isFiltered) {
                             filtered.push(index);
@@ -69805,11 +69809,21 @@
     var toChildren$1 = function (node) {
         return node.children;
     };
+    var hasChildren = function (node, children) {
+        return children != null && 0 < children.length;
+    };
     var DTableDataTreeItemAccessor = /** @class */ (function () {
         function DTableDataTreeItemAccessor(options) {
-            var _a, _b;
-            this.toParent = (_a = options === null || options === void 0 ? void 0 : options.toParent) !== null && _a !== void 0 ? _a : toParent;
-            this.toChildren = (_b = options === null || options === void 0 ? void 0 : options.toChildren) !== null && _b !== void 0 ? _b : toChildren$1;
+            if (options != null) {
+                this.toParent = options.toParent || toParent;
+                this.toChildren = options.toChildren || toChildren$1;
+                this.hasChildren = options.hasChildren || hasChildren;
+            }
+            else {
+                this.toParent = toParent;
+                this.toChildren = toChildren$1;
+                this.hasChildren = hasChildren;
+            }
         }
         return DTableDataTreeItemAccessor;
     }());
@@ -69851,9 +69865,11 @@
         });
         DTableDataTreeSelectionImpl.prototype.onNodeChange = function (nodes) {
             if (nodes != null) {
-                var toChildren = this._parent.accessor.toChildren;
+                var accessor = this._parent.accessor;
+                var toChildren = accessor.toChildren;
+                var hasChildren = accessor.hasChildren;
                 var oldRows = this._rows;
-                var newRows = this.newRows(nodes, toChildren, oldRows, new Set());
+                var newRows = this.newRows(nodes, toChildren, hasChildren, oldRows, new Set());
                 if (oldRows.size !== newRows.size) {
                     this._rows = newRows;
                     this.onChange();
@@ -69867,15 +69883,15 @@
                 }
             }
         };
-        DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, rows, result) {
+        DTableDataTreeSelectionImpl.prototype.newRows = function (nodes, toChildren, hasChildren, rows, result) {
             for (var i = 0, imax = nodes.length; i < imax; ++i) {
                 var node = nodes[i];
                 if (rows.has(node)) {
                     result.add(node);
                 }
                 var children = toChildren(node);
-                if (children != null) {
-                    this.newRows(children, toChildren, rows, result);
+                if (hasChildren(node, children)) {
+                    this.newRows(children, toChildren, hasChildren, rows, result);
                 }
             }
             return result;
@@ -70314,7 +70330,8 @@
             var supplimentals = this._supplimentals;
             var flags = this._flags;
             if (nodes != null) {
-                var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, this._accessor.toChildren);
+                var accessor = this._accessor;
+                var irows = this.newRows(nodes, 0, 0, rows, supplimentals, flags, this._reverse, accessor.toChildren, accessor.hasChildren);
                 if (irows !== rows.length) {
                     rows.length = irows;
                     supplimentals.length = irows;
@@ -70328,7 +70345,7 @@
         DTableDataTree.prototype.toSupplimental = function (ilevel, hasChildren, isOpened) {
             return (ilevel << 2) | (hasChildren ? 2 : 0) | (isOpened ? 1 : 0);
         };
-        DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren) {
+        DTableDataTree.prototype.newRows = function (nodes, irows, ilevel, rows, supplimentals, flags, reverse, toChildren, hasChildren) {
             var nodesLength = nodes.length;
             var istart = reverse ? nodesLength - 1 : 0;
             var idelta = reverse ? -1 : +1;
@@ -70336,7 +70353,7 @@
                 var node = nodes[i];
                 var children = toChildren(node);
                 var isOpened = flags.has(node);
-                var supplimental = this.toSupplimental(ilevel, !!(children && 0 < children.length), isOpened);
+                var supplimental = this.toSupplimental(ilevel, hasChildren(node, children), isOpened);
                 if (irows < rows.length) {
                     rows[irows] = node;
                     supplimentals[irows] = supplimental;
@@ -70347,7 +70364,7 @@
                 }
                 irows += 1;
                 if (isOpened && children) {
-                    irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren);
+                    irows = this.newRows(children, irows, ilevel + 1, rows, supplimentals, flags, reverse, toChildren, hasChildren);
                 }
             }
             return irows;