@longline/aqua-ui 1.0.248 → 1.0.249

package/controls/ListView/ListView.js

@@ -34,13 +34,36 @@ import { Column } from './Column';
 import { Table } from './elements/Table';
 import { sortItems } from './elements/sortItems';
 import { Ghost } from './elements/Ghost';
+function getChildrenOfTypeDeep(children, componentType) {
+    var result = [];
+    React.Children.forEach(children, function (child) {
+        if (!React.isValidElement(child))
+            return;
+        // Match component type (handle styled-components, memo, forwardRef)
+        var childType = child.type.type || child.type;
+        if (childType === componentType) {
+            result.push(child);
+        }
+        // Recurse into nested children
+        if (child.props && child.props.children) {
+            result.push.apply(result, getChildrenOfTypeDeep(child.props.children, componentType));
+        }
+    });
+    return result;
+}
+/**
+ * Find ListView's columns. This is done by looking through the ListView's
+ * children (at any depth) and retaining only the children of type
+ * ListView.Column. For each child, the props are returned.
+ */
+var getColumns = function (children) {
+    return getChildrenOfTypeDeep(children, ListView.Column).map(function (c) { return c.props; });
+};
 var ListViewBase = function (props) {
     var _a, _b;
     var children = props.children, otherProps = __rest(props, ["children"]);
     var _c = React.useState(false), columnsMode = _c[0], setColumnsMode = _c[1];
-    var originalColumns = React.Children.toArray(children).map(function (c) {
-        return c.props;
-    });
+    var originalColumns = getColumns(props.children);
     var _d = React.useState(originalColumns), columns = _d[0], setColumns = _d[1];
     // Find default sort column:
     var sortColumn = (_a = columns.find(function (c) { return c.defaultSort; })) !== null && _a !== void 0 ? _a : columns[0];
@@ -53,9 +76,7 @@ var ListViewBase = function (props) {
     }, [props.data, sort, reverse]);
     // If children change, then update columns state.
     React.useEffect(function () {
-        setColumns(React.Children.toArray(children).map(function (c) {
-            return c.props;
-        }));
+        setColumns(getColumns(props.children));
     }, [props.children]);
     // Change sort:
     var handleSort = function (column) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@longline/aqua-ui",
-  "version": "1.0.248",
+  "version": "1.0.249",
   "description": "AquaUI",
   "author": "Alexander van Oostenrijk / Longline Environment",
   "license": "Commercial",