@ballistix.digital/react-components 9.2.1 → 9.3.0

package/dist/index.js

@@ -2911,71 +2911,44 @@ var $22d7e244b9ff5d8c$export$4564041bcff0e281 = function() {
         });
     };
     var generate = function(table, exportData) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         var sheets = [];
         var columns = table.getAllColumns();
         var rows = exportData !== null && exportData !== void 0 ? exportData : (_b = (_a = table.getRowModel()) === null || _a === void 0 ? void 0 : _a.flatRows) === null || _b === void 0 ? void 0 : _b.map(function(row) {
             return row.original;
         });
         var order = table.getState().columnOrder;
-        var headerNames = (_d = (_c = columns === null || columns === void 0 ? void 0 : columns.sort(function(a, b) {
+        var sortedColumns = (0, $iA2ta$lodash.filter)($22d7e244b9ff5d8c$var$__spreadArray([], columns, true).sort(function(a, b) {
             var _a, _b;
             return (0, $iA2ta$lodash.indexOf)(order, (_a = a.id) !== null && _a !== void 0 ? _a : (0, $iA2ta$lodash.get)(a, 'accessorKey')) - (0, $iA2ta$lodash.indexOf)(order, (_b = b.id) !== null && _b !== void 0 ? _b : (0, $iA2ta$lodash.get)(b, 'accessorKey'));
-        })) === null || _c === void 0 ? void 0 : _c.filter(function(column) {
+        }), function(column) {
             var _a;
             return typeof ((_a = column === null || column === void 0 ? void 0 : column.columnDef) === null || _a === void 0 ? void 0 : _a.header) === 'string' && (column === null || column === void 0 ? void 0 : column.getIsVisible());
-        })) === null || _d === void 0 ? void 0 : _d.map(function(column) {
+        });
+        var columnIds = (0, $iA2ta$lodash.map)(sortedColumns, function(column) {
+            return column.id;
+        });
+        var headerRow = (0, $iA2ta$lodash.map)(sortedColumns, function(column) {
             var _a;
             return {
-                id: column === null || column === void 0 ? void 0 : column.id,
-                value: (_a = column === null || column === void 0 ? void 0 : column.columnDef) === null || _a === void 0 ? void 0 : _a.header
-            };
-        });
-        var headerRow = {};
-        headerNames.forEach(function(name) {
-            headerRow[name.id] = {
-                value: name.value,
+                value: (_a = column === null || column === void 0 ? void 0 : column.columnDef) === null || _a === void 0 ? void 0 : _a.header,
                 type: 'string'
             };
         });
-        var excelRows = rows.map(function(row) {
-            var result = {};
-            Object.keys(row)// sort keys according to the current table order
-            .sort(function(a, b) {
-                return (0, $iA2ta$lodash.indexOf)(order, a) - (0, $iA2ta$lodash.indexOf)(order, b);
-            })// Filter out items with non-string values.
-            .filter(function(key) {
+        var excelRows = (0, $iA2ta$lodash.map)(rows, function(row) {
+            return (0, $iA2ta$lodash.map)(columnIds, function(key) {
                 var _a;
-                var column = columns === null || columns === void 0 ? void 0 : columns.find(function(column) {
-                    return column.id === key;
-                });
-                if (!column) return false;
-                return typeof ((_a = column.columnDef) === null || _a === void 0 ? void 0 : _a.header) === 'string';
-            })// Filter out hidden columns.
-            .filter(function(key) {
-                var column = columns === null || columns === void 0 ? void 0 : columns.find(function(column) {
+                var column = (0, $iA2ta$lodash.find)(sortedColumns, function(column) {
                     return column.id === key;
                 });
-                if (!column) return false;
-                return column.getIsVisible();
-            }).forEach(function(key) {
-                var _a, _b;
-                var cell = (_b = (_a = columns === null || columns === void 0 ? void 0 : columns.find(function(column) {
-                    return column.id === key;
-                })) === null || _a === void 0 ? void 0 : _a.columnDef.meta) === null || _b === void 0 ? void 0 : _b.excel((0, $iA2ta$lodash.get)(row, key));
-                result[key] = cell;
+                return (_a = column === null || column === void 0 ? void 0 : column.columnDef.meta) === null || _a === void 0 ? void 0 : _a.excel((0, $iA2ta$lodash.get)(row, key));
             });
-            return result;
         });
         sheets.push({
             title: "Sheet 1",
             rows: $22d7e244b9ff5d8c$var$__spreadArray([
                 headerRow
-            ], excelRows, true).map(function(row) {
-                return Object.keys(row).map(function(key) {
-                    return row[key];
-                });
-            })
+            ], excelRows, true)
         });
         return sheets;
     };
@@ -5440,8 +5413,9 @@ var $4bd12ae33d8a86aa$var$TableColumnOptionsCustom = function(props) {
                     }),
                     table.getAllLeafColumns().map(function(column, index) {
                         var isAccessorColumn = !!(column === null || column === void 0 ? void 0 : column.accessorFn);
+                        var isGrouped = column.getIsGrouped();
                         return (0, $iA2ta$reactjsxruntime.jsxs)("div", {
-                            className: (0, $622cd2936b18c771$export$4370d69198e9314a)(styles.controls.dropdown.container, !isAccessorColumn && 'hidden'),
+                            className: (0, $622cd2936b18c771$export$4370d69198e9314a)(styles.controls.dropdown.container, (!isAccessorColumn || isGrouped) && 'hidden'),
                             children: [
                                 (0, $iA2ta$reactjsxruntime.jsx)("input", {
                                     className: styles.controls.dropdown.input,