@theseam/ui-common 0.2.14 → 0.2.17

package/bundles/theseam-ui-common-datatable.umd.js

@@ -2492,11 +2492,6 @@
             this._datatable = _datatable;
             this._columnsAlterationsManager = _columnsAlterationsManager;
             this._filterControl = new forms.FormControl();
-            this._alphabeticalColumnCompareFn = function (a, b) {
-                var aProp = getColumnProp(a);
-                var bProp = getColumnProp(b);
-                return aProp === bProp ? 0 : aProp > bProp ? 1 : -1;
-            };
             this._columns$ = rxjs.combineLatest([
                 (_a = this._datatable.columns$) !== null && _a !== void 0 ? _a : rxjs.of([]),
                 utils.observeControlValue(this._filterControl)
@@ -2504,8 +2499,7 @@
                 var _c = __read(_b, 2), columns = _c[0], filter = _c[1];
                 var _filter = (filter || '').trim().toLowerCase();
                 return columns
-                    .filter(function (c) { return _this._canToggleColumn(c, _filter); })
-                    .sort(_this._alphabeticalColumnCompareFn);
+                    .filter(function (c) { return _this._canToggleColumn(c, _filter); });
             }));
         }
         DatatableColumnPreferencesComponent.prototype._canToggleColumn = function (column, filter, omitInternalColumns) {
@@ -2627,7 +2621,8 @@
                 this._toastr.error(msg, 'Data Export');
             }
             var export$ = rxjs.combineLatest([
-                this._datatable.rows$, this._datatable.columns$
+                this._datatable.rows$,
+                this._datatable.columns$.pipe(operators.map(function (cols) { return cols.filter(function (c) { return !isInternalColumn(c); }); }))
             ]).pipe(operators.take(1), operators.map(function (_a) {
                 var _b = __read(_a, 2), rows = _b[0], columns = _b[1];
                 if (exporter.skipDataMapping) {