ngx-deebodata 0.2.9 → 0.3.0

package/fesm2022/ngx-deebodata.mjs

@@ -375,6 +375,7 @@ class DataTableService {
     mapperWorkerId = 1;
     dTblHeight = 500;
     defltRHgt = "50px";
+    defltRHgtNum = 50;
     isSorting = signal(false, ...(ngDevMode ? [{ debugName: "isSorting" }] : /* istanbul ignore next */ []));
     isFiltering = signal(false, ...(ngDevMode ? [{ debugName: "isFiltering" }] : /* istanbul ignore next */ []));
     showCharts = signal(false, ...(ngDevMode ? [{ debugName: "showCharts" }] : /* istanbul ignore next */ []));
@@ -2393,7 +2394,7 @@ class RowGroupPanel {
                 this.panelData = this.dataTableService.currFilData.filter(d => d[this.dataTableService.currGroup] === this.groupValue);
                 this.count = this.panelData.length;
                 let n = 0;
-                const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+                const defNum = this.dataTableService.defltRHgtNum;
                 const init = Math.max(this.dataTableService.dTblHeight / defNum);
                 const addCell = (text, prop, row, visible) => {
                     if (prop && row) {
@@ -2489,8 +2490,7 @@ class RowGroupPanel {
     }
     setLastRowIndex() {
         const realMax = this.panelData.length - 1;
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
-        const wannabeMax = (this.rows.length - 1) + Math.floor(this.aboveHgt / defNum);
+        const wannabeMax = (this.rows.length - 1) + Math.floor(this.aboveHgt / this.dataTableService.defltRHgtNum);
         this.lastElRowIndex = Math.min(wannabeMax, realMax);
         return this.lastElRowIndex;
     }
@@ -2555,7 +2555,7 @@ class RowGroupPanel {
         const top = event.target.scrollTop;
         const left = event.target.scrollLeft;
         /*horiz scroll*/
-        requestAnimationFrame(() => { this.execHorizScroll(left); });
+        this.execHorizScroll(left);
         /*horiz scroll*/
         /*vert scroll*/
         if (top === this.verticalRest) {
@@ -2563,7 +2563,7 @@ class RowGroupPanel {
             return this.setRowNumPlacement();
         }
         this.isScrolling = true;
-        requestAnimationFrame(() => { this.execVertScroll(top); });
+        this.execVertScroll(top);
         /*vert scroll*/
     }
     execHorizScroll(left, reverse) {
@@ -2701,13 +2701,10 @@ class RowGroupPanel {
             return;
         const rTop = (bbds?.top - this.verticalRest);
         const gap = this.tblBot - rTop;
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+        const defNum = this.dataTableService.defltRHgtNum;
         if (gap > 0) {
             let h = 0;
             let z = this.lastElRowIndex + 1;
-            const last = document.querySelector("#panelDataGrid" + this.elifyGrouping + " #dataTableRow" + this.lastElRowIndex);
-            if (last && this.dataTableService.elIsBelowFold(last, this.tblBot))
-                return;
             let bhToSub = 0;
             let ahToAdd = 0;
             const rowsInGap = Math.ceil(gap / defNum);
@@ -2745,10 +2742,10 @@ class RowGroupPanel {
                 }
                 h += 1;
             }
-            if (rowsToAdd.length)
-                this.rows = [...this.rows, ...rowsToAdd];
             if (bhToSub)
                 this.belowHgt -= bhToSub;
+            if (rowsToAdd.length)
+                this.rows = [...this.rows, ...rowsToAdd];
             if (this.showRowNumbers)
                 this.rowNums = [...this.rowNums, ...numsToAdd];
             if (ahToAdd)
@@ -2761,7 +2758,7 @@ class RowGroupPanel {
         const lastVisInd = this.columns.indexOf(this.dataTableService.visibleCols[(vlen - 1)]) + 1;
         const ael = this.aboveArea?.nativeElement;
         const abds = ael?.getBoundingClientRect();
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+        const defNum = this.dataTableService.defltRHgtNum;
         const rbot = abds?.bottom || 0;
         const gap = rbot - this.tblTop;
         if (gap > 0) {
@@ -2772,6 +2769,7 @@ class RowGroupPanel {
                 return;
             let bhToAdd = 0;
             let ahToSub = 0;
+            let mRows = [...this.rows];
             const rowsInGap = Math.ceil(gap / defNum);
             const min = Math.max(0, (z - rowsInGap));
             for (z; z >= min; z--) {
@@ -2796,7 +2794,7 @@ class RowGroupPanel {
                                     cells.push(cell);
                             }
                             nRow.cells = [...cells];
-                            this.rows = [nRow, ...this.rows];
+                            mRows = [nRow, ...mRows];
                             if (this.showRowNumbers)
                                 this.rowNums = [(z + 1), ...this.rowNums];
                             ahToSub += defNum;
@@ -2805,9 +2803,9 @@ class RowGroupPanel {
                 }
                 h += 1;
             }
-            if (ahToSub) {
+            if (ahToSub)
                 this.aboveHgt -= ahToSub;
-            }
+            this.rows = [...mRows];
             if (bhToAdd)
                 this.belowHgt += bhToAdd;
         }
@@ -2818,13 +2816,12 @@ class RowGroupPanel {
         const changes = justids.length;
         if (changes > 0) {
             const justindx = els.map((e, i) => i);
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
             this.rows = this.rows.filter(r => !justids.includes(r.id));
             if (this.showRowNumbers)
                 this.rowNums = this.rowNums.filter((c, i) => !justindx.includes(i));
             const item = this.dataTableService.mainData[(this.rows[0]?.index || -1)];
             if (item)
-                this.aboveHgt = this.dataTableService.findObjIndxInData(item, this.panelData) * defNum;
+                this.aboveHgt = this.dataTableService.findObjIndxInData(item, this.panelData) * this.dataTableService.defltRHgtNum;
         }
     }
     clearBelowFoldRows() {
@@ -2832,7 +2829,6 @@ class RowGroupPanel {
         const justids = els.map(e => e.id);
         let changes = justids.length;
         if (changes > 0) {
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
             this.rows = this.rows.filter(r => !justids.includes(r.id));
             if (this.showRowNumbers) {
                 for (let p = (changes - 1); p >= 0; p--)
@@ -2841,7 +2837,7 @@ class RowGroupPanel {
             const rlen = this.rows.length;
             const item = this.dataTableService.mainData[(this.rows[(rlen - 1)]?.index || -1)];
             if (item)
-                this.belowHgt = ((this.panelData.length - 1) - this.dataTableService.findObjIndxInData(item, this.panelData)) * defNum;
+                this.belowHgt = ((this.panelData.length - 1) - this.dataTableService.findObjIndxInData(item, this.panelData)) * this.dataTableService.defltRHgtNum;
             this.setLastRowIndex();
         }
     }
@@ -4873,8 +4869,10 @@ class NgxDeebodata {
         this.handleValidation();
     }
     execSetters() {
-        if (this.defRowHgt && /\d+px/g.test(this.defRowHgt))
+        if (this.defRowHgt && /\d+px/g.test(this.defRowHgt)) {
             this.dataTableService.defltRHgt = this.defRowHgt;
+            this.dataTableService.defltRHgtNum = parseInt(this.defRowHgt.replace(/[ ]?(px|vh|\%)/g, ""));
+        }
         if (this.defGridHgt)
             this.dataTableService.dTblHeight = this.defGridHgt;
         if (this.myColumnSymbols)
@@ -5423,8 +5421,7 @@ class NgxDeebodata {
     }
     setLastRowIndex() {
         const realMax = this.dataTableService.currFilData.length - 1;
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
-        const wannabeMax = (this.rows.length - 1) + Math.floor(this.aboveHgt() / defNum);
+        const wannabeMax = (this.rows.length - 1) + Math.floor(this.aboveHgt() / this.dataTableService.defltRHgtNum);
         this.lastElRowIndex = Math.min(wannabeMax, realMax);
         return this.lastElRowIndex;
     }
@@ -5436,7 +5433,7 @@ class NgxDeebodata {
             const len = data.length;
             const colLen = cols.length;
             this.maxCols = this.setMaxCols();
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+            const defNum = this.dataTableService.defltRHgtNum;
             const init = Math.max(this.dataTableService.dTblHeight / defNum);
             this.dataTableService.useColWid = Math.ceil((this.dataTableBody.nativeElement.getBoundingClientRect().width - 16) / Math.min(colLen, this.maxCols)) + "px";
             for (i; i < colLen; i++) {
@@ -5907,13 +5904,10 @@ class NgxDeebodata {
         const bbds = bel.getBoundingClientRect();
         const rTop = (bbds.top - this.verticalRest);
         const gap = this.dataTableService.tblBot - rTop;
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+        const defNum = this.dataTableService.defltRHgtNum;
         if (gap > 0) {
             let h = 0;
             let z = this.lastElRowIndex + 1;
-            // const last = document.getElementById("dataTableRow" + this.lastElRowIndex)
-            // if(last && this.dataTableService.elIsBelowFold(last, this.dataTableService.tblBot))
-            //     return;
             let bhToSub = 0;
             let ahToAdd = 0;
             const rowsInGap = Math.ceil(gap / defNum);
@@ -5966,7 +5960,7 @@ class NgxDeebodata {
         const lastVisInd = actvCols.indexOf(this.dataTableService.visibleCols[(vlen - 1)]) + 1;
         const ael = this.aboveArea.nativeElement;
         const abds = ael.getBoundingClientRect();
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+        const defNum = this.dataTableService.defltRHgtNum;
         const rbot = abds.bottom;
         const gap = rbot - (this.dataTableService.tblTop);
         if (gap > 0) {
@@ -6014,9 +6008,9 @@ class NgxDeebodata {
             if (ahToSub)
                 this.aboveHgt.set(Math.max(0, (this.aboveHgt() - ahToSub)));
             this.rows = [...mRows];
-            this.dtChecks = [...mChks];
             if (bhToAdd)
                 this.belowHgt.set(this.belowHgt() + bhToAdd);
+            this.dtChecks = [...mChks];
         }
     }
     clearAboveFoldRows() {
@@ -6025,12 +6019,11 @@ class NgxDeebodata {
         const justindx = els.map(e => e.index);
         const changes = justids.length;
         if (changes > 0) {
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
             this.rows = this.rows.filter(r => justids.indexOf(r.id) < 0);
             this.dtChecks = this.dtChecks.filter(c => justindx.indexOf(c) < 0);
             const item = this.dataTableService.mainData[(this.rows[0]?.index || -1)];
             if (item)
-                this.aboveHgt.set(Math.max(0, this.dataTableService.findObjIndxInData(item, this.dataTableService.currFilData) * defNum));
+                this.aboveHgt.set(Math.max(0, this.dataTableService.findObjIndxInData(item, this.dataTableService.currFilData) * this.dataTableService.defltRHgtNum));
         }
     }
     clearBelowFoldRows() {
@@ -6039,13 +6032,12 @@ class NgxDeebodata {
         const justindx = els.map(e => e.index);
         let changes = justids.length;
         if (changes > 0) {
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
             this.rows = this.rows.filter(r => justids.indexOf(r.id) < 0);
             this.dtChecks = this.dtChecks.filter(c => justindx.indexOf(c) < 0);
             const rlen = this.rows.length;
             const item = this.dataTableService.mainData[(this.rows[(rlen - 1)]?.index || -1)];
             if (item)
-                this.belowHgt.set(Math.max(0, ((this.dataTableService.currFilData.length - 1) - this.dataTableService.findObjIndxInData(item, this.dataTableService.currFilData)) * defNum));
+                this.belowHgt.set(Math.max(0, ((this.dataTableService.currFilData.length - 1) - this.dataTableService.findObjIndxInData(item, this.dataTableService.currFilData)) * this.dataTableService.defltRHgtNum));
             this.setLastRowIndex();
         }
     }
@@ -6053,8 +6045,7 @@ class NgxDeebodata {
         if (this.dataTableBody) {
             const ind = row - 1;
             const tbl = this.dataTableBody.nativeElement;
-            const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
-            tbl.scrollTop = ind * defNum;
+            tbl.scrollTop = ind * this.dataTableService.defltRHgtNum;
             setTimeout(() => { this.setRowSelChecksPlacement(true); });
         }
     }
@@ -6629,7 +6620,7 @@ class NgxDeebodata {
         }
         this.lastElRowIndex = 0;
         let n = 0;
-        const defNum = parseInt(this.dataTableService.defltRHgt.replace(/[ ]?px/g, ""));
+        const defNum = this.dataTableService.defltRHgtNum;
         const init = Math.max(this.dataTableService.dTblHeight / defNum);
         const len = this.dataTableService.currFilData.length;
         if (!len) { //always just add 1