@firestitch/list 12.13.2 → 12.14.0

package/app/components/body/row/row.component.d.ts

@@ -44,7 +44,7 @@ export declare class FsRowComponent implements OnInit, DoCheck, OnDestroy {
     private _destroy$;
     constructor(el: ElementRef, _cdRef: ChangeDetectorRef, _differs: KeyValueDiffers, _renderer: Renderer2, _draggableList: FsListDraggableListDirective);
     get isGroupRow(): boolean;
-    get isChildRow(): boolean;
+    get isGroupChildRow(): boolean;
     get isGroupFooterRow(): boolean;
     get isDragDisabled(): boolean;
     get isMultipleSelection(): boolean;

package/app/enums/row-type.enum.d.ts

@@ -1,6 +1,6 @@
 export declare enum RowType {
-    Simple = 0,
-    Group = 1,
-    GroupFooter = 2,
-    Child = 3
+    Simple = "simple",
+    Group = "group",
+    GroupFooter = "groupFooter",
+    GroupChild = "groupChild"
 }

package/app/interfaces/listconfig.interface.d.ts

@@ -63,7 +63,7 @@ export interface FsListGroupConfig {
     initialExpand?: boolean;
     groupBy?: (row: any) => any;
     compareBy?: (row: any) => any;
-    footer?: (row: any, group?: any) => boolean;
+    footer?: (group?: any) => boolean;
     actions?: (FsListRowActionGroup | FsListRowAction)[];
 }
 export interface FsListLoadMoreConfig {
@@ -253,5 +253,6 @@ export declare type FsListAfterContentInitFn = (query: Record<string, any>, data
 export interface FsListRowClassOptions {
     index: number;
     groupIndex?: number;
+    type?: RowType;
 }
 export declare type FsListAfterInitFn = (listComponent: any) => void;

package/app/models/row.d.ts

@@ -17,7 +17,7 @@ export declare class Row {
     get data(): any;
     get type(): RowType;
     get isGroup(): boolean;
-    get isChild(): boolean;
+    get isGroupChild(): boolean;
     get isGroupFooter(): boolean;
     get parent(): GroupRow;
     get children(): (ChildRow | GroupFooterRow)[];

package/bundles/firestitch-list.umd.js

@@ -1115,10 +1115,10 @@
 
     exports.RowType = void 0;
     (function (RowType) {
-        RowType[RowType["Simple"] = 0] = "Simple";
-        RowType[RowType["Group"] = 1] = "Group";
-        RowType[RowType["GroupFooter"] = 2] = "GroupFooter";
-        RowType[RowType["Child"] = 3] = "Child";
+        RowType["Simple"] = "simple";
+        RowType["Group"] = "group";
+        RowType["GroupFooter"] = "groupFooter";
+        RowType["GroupChild"] = "groupChild";
     })(exports.RowType || (exports.RowType = {}));
 
     var BaseRow = /** @class */ (function () {
@@ -1223,7 +1223,7 @@
         function ChildRow(data, parent) {
             if (data === void 0) { data = {}; }
             if (parent === void 0) { parent = null; }
-            var _this = _super.call(this, data, exports.RowType.Child) || this;
+            var _this = _super.call(this, data, exports.RowType.GroupChild) || this;
             _this.visible = true;
             _this._parent = parent;
             if (_this.parent) {
@@ -1316,7 +1316,7 @@
                         this._row = new GroupRow(data, initialExpand);
                     }
                     break;
-                case exports.RowType.Child:
+                case exports.RowType.GroupChild:
                     {
                         this._row = new ChildRow(data, parent);
                     }
@@ -1371,7 +1371,7 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(Row.prototype, "isChild", {
+        Object.defineProperty(Row.prototype, "isGroupChild", {
             get: function () {
                 return this._row instanceof ChildRow;
             },
@@ -1739,7 +1739,7 @@
             this.visibleRows = this._rowsStack
                 .filter(function (row, index) {
                 row.index = index;
-                return (!row.isChild && !row.isGroupFooter) || row.visible;
+                return (!row.isGroupChild && !row.isGroupFooter) || row.visible;
             });
         };
         DataController.prototype.updateRow = function (targetRow, trackBy) {
@@ -1804,13 +1804,9 @@
                 }
             });
             groupRows.forEach(function (groupRow) {
-                var footerIndex = groupRow.children
-                    .findIndex(function (row) {
-                    return _this._footerRowFn(row.data, Object.assign(Object.assign({}, groupRow.data), { children: groupRow.childrenData }));
-                });
-                if (footerIndex !== -1) {
-                    var footerRow = groupRow.children.slice(footerIndex, footerIndex + 1)[0];
-                    groupRow.children.push(new GroupFooterRow(footerRow.data, groupRow));
+                var hasFooter = _this._footerRowFn(groupRow);
+                if (hasFooter) {
+                    groupRow.children.push(new GroupFooterRow(groupRow, groupRow));
                 }
             });
             return Array.from(this._store.values())
@@ -2344,7 +2340,7 @@
          * Go to last page
          */
         PaginationController.prototype.goLast = function () {
-            if (this.page < this.pages) {
+            if (this.page !== this.pages) {
                 this.page = this.pages;
                 this.updateOffset();
                 this._pageChanged$.next({
@@ -4125,6 +4121,12 @@
             if (this.afterFetchFn) {
                 this.afterFetchFn(query, this.dataController.visibleRowsData);
             }
+            // case when have removed all results from last page
+            if (this.dataController.visibleRows.length === 0
+                && this.paging.page > 1
+                && this.paging.page > this.paging.pages) {
+                this.paging.goLast();
+            }
             this.fetchComplete$.next();
             this.loading$.next(false);
         };
@@ -4962,7 +4964,7 @@
                 if (this.row.isGroup) {
                     this.cellContext.groupIndex = this.row.index;
                 }
-                else if (this.row.isChild || this.row.isGroupFooter) {
+                else if (this.row.isGroupChild || this.row.isGroupFooter) {
                     this.cellContext.groupIndex = this.row.index;
                     this.cellContext.groupRow = this.row.parent.data;
                     this.cellContext.group = this.row.parent.data;
@@ -5276,7 +5278,7 @@
             // Can not drag before first group and after last group
             var swapWithBoundaryGroupElement = (elemIndex === 0 || elemIndex === this._rows.length - 1)
                 && targetRow.isGroup
-                && this.draggableItem.isChild;
+                && this.draggableItem.isGroupChild;
             if (!swapWithBoundaryGroupElement) {
                 if (elemIndex !== null) {
                     if (targetRow.readyToSwap) {
@@ -5710,9 +5712,9 @@
             enumerable: false,
             configurable: true
         });
-        Object.defineProperty(FsRowComponent.prototype, "isChildRow", {
+        Object.defineProperty(FsRowComponent.prototype, "isGroupChildRow", {
             get: function () {
-                return this.row.isChild;
+                return this.row.isGroupChild;
             },
             enumerable: false,
             configurable: true
@@ -5751,7 +5753,7 @@
                 if ((_a = this.row) === null || _a === void 0 ? void 0 : _a.isGroup) {
                     cls += ' fs-list-row-group';
                 }
-                else if ((_b = this.row) === null || _b === void 0 ? void 0 : _b.isChild) {
+                else if ((_b = this.row) === null || _b === void 0 ? void 0 : _b.isGroupChild) {
                     cls += ' fs-list-row-group-child';
                 }
                 else if ((_c = this.row) === null || _c === void 0 ? void 0 : _c.isGroupFooter) {
@@ -5760,12 +5762,13 @@
                 if (this.rowClass) {
                     var options = {
                         index: this.rowIndex,
+                        type: this.row.type,
                     };
                     if (this.row.isGroup) {
                         options.groupIndex = this.row.index;
                     }
-                    else if (this.row.isChild) {
-                        options.groupIndex = this.row.index;
+                    else if (this.row.isGroupChild || this.row.isGroupFooter) {
+                        options.groupIndex = this.row.parent.index;
                     }
                     var resultClass = this.rowClass(this.row.data, options);
                     if (typeof resultClass === 'string') {
@@ -6061,8 +6064,6 @@
             var _a, _b;
             var currentEl = this.row;
             var targetEl = this._draggableList.draggableItem;
-            var currentElGroup = (currentEl.isChild && currentEl.parent) || currentEl;
-            var targetElGroup = (targetEl.isChild && targetEl.parent) || targetEl;
             this.row.readyToSwap = this._reorderController.moveDropCallback({
                 row1: currentEl === null || currentEl === void 0 ? void 0 : currentEl.data,
                 row2: targetEl === null || targetEl === void 0 ? void 0 : targetEl.data,