@syncfusion/ej2-pdf-export 19.4.42 → 19.4.52

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

@@ -27528,6 +27528,7 @@ class PdfGridRow {
         this.isRowMergeComplete = true;
         this.repeatFlag = false;
         this.rowFontSplit = false;
+        this.isHeaderRow = false;
         this.pdfGrid = grid;
     }
     //Properties
@@ -27708,10 +27709,10 @@ class PdfGridRow {
             this.rowMergeComplete = false;
             if (cell.rowSpan > 1) {
                 let cellIn = i;
-                let rowin = this.grid.rows.rowCollection.indexOf(this);
+                let rowin = this.isHeaderRow ? this.grid.headers.indexOf(this) : this.grid.rows.rowCollection.indexOf(this);
                 for (let j = 0; j < cell.rowSpan; j++) {
                     if ((j + 1) < cell.rowSpan) {
-                        this.grid.rows.getRow(rowin + j + 1).cells.getCell(cellIn).hasRowSpan = true;
+                        (this.isHeaderRow ? this.grid.headers.getHeader(rowin + j + 1) : this.grid.rows.getRow(rowin + j + 1)).cells.getCell(cellIn).hasRowSpan = true;
                     }
                 }
                 if (maxHeight < cell.height) {
@@ -27840,6 +27841,7 @@ class PdfGridHeaderCollection {
             let row;
             for (let i = 0; i < arg; i++) {
                 row = new PdfGridRow(this.grid);
+                row.isHeaderRow = true;
                 for (let j = 0; j < this.grid.columns.count; j++) {
                     row.cells.add(new PdfGridCell());
                 }
@@ -28129,6 +28131,20 @@ class PdfGrid extends PdfLayoutElement {
      * @private
      */
     layout(param) {
+        let width = param.bounds.width;
+        let height = param.bounds.height;
+        let hasChanged = false;
+        if (typeof param.bounds.width === 'undefined' || param.bounds.width === 0) {
+            width = param.page.getClientSize().width - param.bounds.x;
+            hasChanged = true;
+        }
+        if (typeof param.bounds.height === 'undefined' || param.bounds.height === 0) {
+            height = param.page.getClientSize().height - param.bounds.y;
+            hasChanged = true;
+        }
+        if (hasChanged) {
+            param.bounds = new RectangleF(param.bounds.x, param.bounds.y, width, height);
+        }
         if (this.rows.count !== 0) {
             let currentRow = this.rows.getRow(0).cells.getCell(0).style;
             if (currentRow.borders != null && ((currentRow.borders.left != null && currentRow.borders.left.width !== 1) ||
@@ -28723,7 +28739,12 @@ class PdfGridLayouter extends ElementLayouter {
         }
         if (!this.Grid.style.allowHorizontalOverflow) {
             this.columnRanges = [];
-            this.Grid.measureColumnsWidth(this.currentBounds);
+            if (typeof this.Grid.isChildGrid !== 'undefined' && typeof this.Grid.isChildGrid) {
+                this.Grid.measureColumnsWidth(this.currentBounds);
+            }
+            else {
+                this.Grid.measureColumnsWidth(new RectangleF(this.currentBounds.x, this.currentBounds.y, this.currentBounds.x + this.currentBounds.width, this.currentBounds.height));
+            }
             this.columnRanges.push([0, this.Grid.columns.count - 1]);
         }
         else {
@@ -29109,7 +29130,7 @@ class PdfGridLayouter extends ElementLayouter {
                             }
                             row.grid.splitChildRowIndex = -1;
                             row.grid.isGridSplit = false;
-                            rowResult.isFinish = true;
+                            rowResult.isFinish = this.checkIsFisished(row);
                             //row.NestedGridLayoutResult.bounds.height = row.rowBreakHeightValue;
                             //this.currentBounds.y = rowResult.bounds.y;
                             for (let i = 0; i < row.cells.count; i++) {
@@ -29168,9 +29189,10 @@ class PdfGridLayouter extends ElementLayouter {
                          {
                              this.currentBounds.y = format == null ? 0 : format.paginateBounds.y;
                              
-                         }
-                         if (this.raiseBeforePageLayout(this.currentPage, this.currentBounds, this.currentRowIndex))
-                             break;*/
+                         }*/
+                    if (this.raiseBeforePageLayout(this.currentPage, this.currentBounds, this.currentRowIndex).returnValue) {
+                        break;
+                    }
                     if ((param.format !== null) && !param.format.usePaginateBounds && param.bounds !== null &&
                         param.bounds.height > 0 && !this.Grid.isChildGrid) {
                         this.currentBounds.height = param.bounds.height;
@@ -29180,6 +29202,11 @@ class PdfGridLayouter extends ElementLayouter {
                     }
                     else {
                         this.currentBounds.y = format == null ? 0 : format.paginateBounds.y;
+                        if (format != null && (format.paginateBounds.x !== 0 || format.paginateBounds.y !== 0 || format.paginateBounds.height !== 0 || format.paginateBounds.width !== 0)) {
+                            this.currentBounds.x = format.paginateBounds.x;
+                            this.currentBounds.width = format.paginateBounds.width;
+                            this.currentBounds.height = format.paginateBounds.height;
+                        }
                     }
                     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) {
@@ -29328,6 +29355,15 @@ class PdfGridLayouter extends ElementLayouter {
         this.raisePageLayouted(result);
         return result;
     }
+    checkIsFisished(row) {
+        let result = true;
+        for (let i = 0; i < row.cells.count; i++) {
+            if (!row.cells.getCell(i).FinishedDrawingCell) {
+                result = false;
+            }
+        }
+        return result;
+    }
     /* tslint:enable */
     /**
      * Gets the `next page`.
@@ -29409,7 +29445,7 @@ class PdfGridLayouter extends ElementLayouter {
         for (let i = 0; i < layoutedPages.size(); i++) {
             for (let j = i, count = (layoutedPages.size() / this.columnRanges.length); j < layoutedPages.size(); j += count) {
                 let page = pages[j];
-                if (document.pages.indexOf(page) === -1) {
+                if (typeof page !== 'undefined' && document.pages.indexOf(page) === -1) {
                     document.pages.add(page);
                 }
             }
@@ -29471,7 +29507,7 @@ class PdfGridLayouter extends ElementLayouter {
             //                                                  new SizeF(args.Bounds.width + args.Bounds.x ,
             //                                                                 args.Bounds.height)));
             // }
-            cancel = args.cancel;
+            cancel = (typeof args.cancel === 'undefined' ? false : args.cancel);
             currentBounds = args.bounds;
             currentRow = args.startRowIndex;
         }
@@ -29528,7 +29564,7 @@ class PdfGridLayouter extends ElementLayouter {
                 // }                
             }
             let calculatedHeight = row.rowBreakHeight > 0.0 ? row.rowBreakHeight : row.height;
-            if (this.Grid.isChildGrid && this.Grid.ParentCell != null) {
+            if (typeof this.Grid.isChildGrid !== 'undefined' && this.Grid.isChildGrid && typeof this.Grid.ParentCell !== 'undefined' && this.Grid.ParentCell != null) {
                 //Split row only if row height exceeds page height and AllowRowBreakAcrossPages is true.
                 // if (calculatedHeight + this.Grid.ParentCell.row.grid.style.cellPadding.bottom +
                 //             this.Grid.ParentCell.row.grid.style.cellPadding.top > this.currentPageBounds.height) {
@@ -29558,7 +29594,7 @@ class PdfGridLayouter extends ElementLayouter {
                     + calculatedHeight > this.currentBounds.height || this.currentBounds.y +
                     this.Grid.ParentCell.row.grid.style.cellPadding.bottom + rowHeightWithSpan > this.currentPageBounds.height) {
                     //If a row is repeated and still cannot fit in page, proceed draw.
-                    if (this.Grid.ParentCell.row.grid.LayoutFormat.break === PdfLayoutBreakType.FitPage) {
+                    if (typeof this.Grid.ParentCell.row.grid.LayoutFormat !== 'undefined' && this.Grid.ParentCell.row.grid.LayoutFormat.break === PdfLayoutBreakType.FitPage) {
                         PdfGridLayouter.repeatRowIndex = this.Grid.rows.rowCollection.indexOf(row);
                         this.Grid.splitChildRowIndex = this.Grid.rows.rowCollection.indexOf(row);
                     }
@@ -29628,7 +29664,7 @@ class PdfGridLayouter extends ElementLayouter {
                     // If a row is repeated and still cannot fit in page, proceed draw.
                     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) {
+                        if (this.Grid.LayoutFormat !== null && this.Grid.LayoutFormat.paginateBounds.height > 0) {
                             isFit = this.isFitToCell((this.currentBounds.height + this.startLocation.y) - this.currentBounds.y, this.Grid, row);
                         }
                         else
@@ -29786,7 +29822,18 @@ class PdfGridLayouter extends ElementLayouter {
                     isFit = false;
                     break;
                 }
-                else if (currentHeight > height || (typeof this.slr.remainder !== 'undefined' && this.slr.remainder !== null)) {
+                if (gridRow.cells.getCell(i).style != null && gridRow.cells.getCell(i).style.borders != null && gridRow.cells.getCell(i).style.borders.top != null && gridRow.cells.getCell(i).style.borders.bottom != null)
+                    height += (gridRow.cells.getCell(i).style.borders.top.width + gridRow.cells.getCell(i).style.borders.bottom.width) * 2;
+                if (this.slr.lineCount > 1 && gridRow.cells.getCell(i).stringFormat != null && gridRow.cells.getCell(i).stringFormat.lineSpacing != 0)
+                    height += (this.slr.lineCount - 1) * (gridRow.cells.getCell(i).style.stringFormat.lineSpacing);
+                if (gridRow.cells.getCell(i).style.cellPadding == null) {
+                    height += (grid.style.cellPadding.top + grid.style.cellPadding.bottom);
+                }
+                else {
+                    height += (grid.style.cellPadding.top + grid.style.cellPadding.bottom);
+                }
+                height += grid.style.cellSpacing;
+                if (currentHeight > height || (typeof this.slr.remainder !== 'undefined' && this.slr.remainder !== null)) {
                     isFit = true;
                     break;
                 }
@@ -29850,9 +29897,7 @@ class PdfGridLayouter extends ElementLayouter {
                 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) {
-                        row.rowBreakHeight = calculateHeight - stringResult.actualSize.height;
-                    }
+                    row.rowBreakHeight = calculateHeight - stringResult.actualSize.height;
                 }
             }
             result.isFinish = (!result.isFinish) ? result.isFinish : row.cells.getCell(i).FinishedDrawingCell;