@syncfusion/ej2-pdf-export 19.2.56 → 19.3.53

package/dist/es6/ej2-pdf-export.es2015.js

@@ -28579,6 +28579,9 @@ class PdfGridLayouter extends ElementLayouter {
          * @private
          */
         this.breakRow = true;
+        this.slr = null;
+        this.remainderText = null;
+        this.isPaginate = false;
         /**
          * Checks whether the x co-ordinate is need to set as client size or not.
          * @hidden
@@ -29001,6 +29004,10 @@ class PdfGridLayouter extends ElementLayouter {
                             this.currentBounds.x += this.startLocation.x;
                             this.currentBounds.y += this.startLocation.y;
                         }
+                        if (this.isPaginate) {
+                            this.startLocation.y = this.currentBounds.y;
+                            this.isPaginate = false;
+                        }
                         if (this.Grid.isChildGrid && row.grid.ParentCell != null) {
                             if (this.Grid.ParentCell.row.grid.style.cellPadding != null) {
                                 if (row.rowBreakHeight + this.Grid.ParentCell.row.grid.style.cellPadding.top < this.currentBounds.height) {
@@ -29167,7 +29174,13 @@ class PdfGridLayouter extends ElementLayouter {
                         param.bounds.height > 0 && !this.Grid.isChildGrid) {
                         this.currentBounds.height = param.bounds.height;
                     }
-                    if ((param.format !== null) && !param.format.usePaginateBounds && param.bounds !== null &&
+                    if (typeof param.format !== 'undefined' && param.format != null && typeof param.format.usePaginateBounds !== 'undefined' && !param.format.usePaginateBounds && !(param.format.paginateBounds.x === 0 && param.format.paginateBounds.y === 0 && param.format.paginateBounds.width === 0 && param.format.paginateBounds.height === 0) && param.format.paginateBounds.y === 0) {
+                        this.currentBounds.y = PdfBorders.default.top.width / 2;
+                    }
+                    else {
+                        this.currentBounds.y = format == null ? 0 : format.paginateBounds.y;
+                    }
+                    if (typeof param.format !== 'undefined' && (param.format !== null) && typeof param.format.usePaginateBounds !== 'undefined' && !param.format.usePaginateBounds && param.bounds !== null &&
                         param.bounds.y > 0 && !this.Grid.isChildGrid) {
                         this.currentBounds.y = param.bounds.y;
                     }
@@ -29612,10 +29625,28 @@ class PdfGridLayouter extends ElementLayouter {
                     this.currentBounds.y + calculatedHeight > (this.currentBounds.height + this.startLocation.y) ||
                     this.currentBounds.y + rowHeightWithSpan > this.currentPageBounds.height) {
                     // If a row is repeated and still cannot fit in page, proceed draw.
-                    if (this.Grid.LayoutFormat.break === PdfLayoutBreakType.FitPage) {
-                        PdfGridLayouter.repeatRowIndex = this.Grid.rows.rowCollection.indexOf(row);
+                    let isFit = false;
+                    if ((this.Grid.allowRowBreakAcrossPages && !this.Grid.repeatHeader && !row.isRowHeightSet && !row.rowMergeComplete)) {
+                        if (this.Grid.LayoutFormat !== null && this.Grid.LayoutFormat.paginateBounds.height > 0 && typeof this.Grid.ParentCell !== 'undefined' && this.Grid.ParentCell !== null && (this.currentBounds.y + this.Grid.ParentCell.row.grid.style.cellPadding.bottom + calculatedHeight) > this.currentBounds.height) {
+                            isFit = this.isFitToCell((this.currentBounds.height + this.startLocation.y) - this.currentBounds.y, this.Grid, row);
+                        }
+                        else
+                            isFit = this.isFitToCell(this.currentPageBounds.height - this.currentBounds.y, this.Grid, row);
+                        if (isFit) {
+                            this.isPaginate = true;
+                        }
                     }
-                    if (PdfGridLayouter.repeatRowIndex > -1 && PdfGridLayouter.repeatRowIndex === row.rowIndex) {
+                    else if (this.Grid.allowRowBreakAcrossPages && this.Grid.LayoutFormat != null && this.Grid.LayoutFormat.layout == PdfLayoutType.Paginate && this.Grid.LayoutFormat.break != PdfLayoutBreakType.FitElement && row.isRowHeightSet && this.currentBounds.y + height > this.currentPageBounds.height) {
+                        isFit = this.isFitToCell(this.currentPageBounds.height - this.currentBounds.y, this.Grid, row);
+                        if (!isFit)
+                            isFit = !(this.slr !== null && this.slr.actualSize.height == 0 && this.slr.remainder != null && this.slr.remainder.length > 0 && this.remainderText == this.slr.remainder);
+                        if (isFit && this.slr != null && this.slr.lineCount > 1) {
+                            //It may text cutoff issue
+                            isFit = false;
+                        }
+                        this.remainderText = null;
+                    }
+                    if (PdfGridLayouter.repeatRowIndex > -1 && PdfGridLayouter.repeatRowIndex === row.rowIndex || isFit) {
                         if (this.Grid.allowRowBreakAcrossPages) {
                             result.isFinish = true;
                             this.drawRowWithBreak(result, row, calculatedHeight);
@@ -29625,10 +29656,10 @@ class PdfGridLayouter extends ElementLayouter {
                                 result.isFinish = false;
                             }
                         }
-                        // else {
-                        //     result.isFinish = false;
-                        //     this.drawRow(row, result, calculatedHeight);
-                        // }
+                        else {
+                            result.isFinish = false;
+                            this.drawRow(row, result, calculatedHeight);
+                        }
                     }
                     else {
                         result.isFinish = false;
@@ -29724,6 +29755,44 @@ class PdfGridLayouter extends ElementLayouter {
             result.bounds = new RectangleF(new PointF(result.bounds.x, result.bounds.y), new SizeF(location.x, location.y));
         }
     }
+    isFitToCell(currentHeight, grid, gridRow) {
+        let isFit = false;
+        let layouter = new PdfStringLayouter();
+        for (let i = 0; i < gridRow.cells.count; i++) {
+            let cell = gridRow.cells.getCell(i);
+            if (typeof cell.value !== 'undefined' && cell.value !== null && typeof cell.value === 'string') {
+                let font = null;
+                if (typeof cell.style.font !== 'undefined' && cell.style.font != null) {
+                    font = cell.style.font;
+                }
+                else if (typeof cell.row.style.font !== 'undefined' && cell.row.style.font != null) {
+                    font = cell.row.style.font;
+                }
+                else if (typeof cell.row.grid.style.font !== 'undefined' && cell.row.grid.style.font != null) {
+                    font = cell.row.grid.style.font;
+                }
+                else {
+                    font = PdfDocument.defaultFont;
+                }
+                this.remainderText = gridRow.cells.getCell(i).value;
+                let width = gridRow.cells.getCell(i).width;
+                if (grid.columns.getColumn(i).isCustomWidth && gridRow.cells.getCell(i).width > grid.columns.getColumn(i).width) {
+                    width = grid.columns.getColumn(i).width;
+                }
+                this.slr = layouter.layout(gridRow.cells.getCell(i).value, font, gridRow.cells.getCell(i).stringFormat, new SizeF(width, currentHeight), false, this.currentPageBounds);
+                let height = this.slr.actualSize.height;
+                if (height == 0) {
+                    isFit = false;
+                    break;
+                }
+                else if (currentHeight > height || (typeof this.slr.remainder !== 'undefined' && this.slr.remainder !== null)) {
+                    isFit = true;
+                    break;
+                }
+            }
+        }
+        return isFit;
+    }
     drawRowWithBreak(result, row, calculateHeight) {
         let location = new PointF(this.currentBounds.x, this.currentBounds.y);
         if (row.grid.isChildGrid && row.grid.allowRowBreakAcrossPages && this.startLocation.x !== this.currentBounds.x) {
@@ -29777,7 +29846,7 @@ class PdfGridLayouter extends ElementLayouter {
             }
             //If still row is to be drawn, set cell finished drawing cell as false and update the text to be drawn.
             if (row.rowBreakHeight > 0.0) {
-                if (stringResult != null) {
+                if (stringResult != null && typeof stringResult.remainder !== 'undefined') {
                     row.cells.getCell(i).FinishedDrawingCell = false;
                     row.cells.getCell(i).remainingString = stringResult.remainder == null ? ' ' : stringResult.remainder;
                     if (row.grid.isChildGrid) {