@syncfusion/ej2-pdf-export 19.2.56 → 19.3.53

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.2.56
+*  version : 19.3.53
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-pdf-export@*",
-  "_id": "@syncfusion/ej2-pdf-export@19.2.55",
+  "_id": "@syncfusion/ej2-pdf-export@19.2.56",
   "_inBundle": false,
-  "_integrity": "sha512-T0iNeu5YZ4SuNLJ8468GWQci1gLRkfFmbLOeeYnu3S7/vphlyCl/kVF+h5qdlMuIaAL2FzCZupnIHB8Du2EMwA==",
+  "_integrity": "sha512-Lni0gsdRZgos5Djn+qYBhbmIVmw02XlnkXe+DGScnb4jiTNyyE5VaET8fzfJiuF01MXA26rI7TTXd+71sCWYEw==",
   "_location": "/@syncfusion/ej2-pdf-export",
   "_phantomChildren": {},
   "_requested": {
@@ -28,8 +28,8 @@
     "/@syncfusion/ej2-pivotview",
     "/@syncfusion/ej2-treemap"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-pdf-export/-/ej2-pdf-export-19.2.55.tgz",
-  "_shasum": "9dd85bebb8b72486f74052296a258c34cbe9a45c",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-pdf-export/-/ej2-pdf-export-19.2.56.tgz",
+  "_shasum": "5d13f0f69f560b817b21f669f45a7c241a510c09",
   "_spec": "@syncfusion/ej2-pdf-export@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -40,7 +40,7 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-compression": "~19.2.55"
+    "@syncfusion/ej2-compression": "~19.3.53"
   },
   "deprecated": false,
   "description": "Essential Javascript 2 PDF Library",
@@ -56,6 +56,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "19.2.56",
+  "version": "19.3.53",
   "sideEffects": false
 }

package/src/implementation/structured-elements/grid/layout/grid-layouter.d.ts

@@ -212,6 +212,9 @@ export declare class PdfGridLayouter extends ElementLayouter {
      * @private
      */
     private rowBreakPageHeightCellIndex;
+    private slr;
+    private remainderText;
+    private isPaginate;
     /**
      * Initialize a new instance for `PdfGrid` class.
      * @private
@@ -331,6 +334,7 @@ export declare class PdfGridLayouter extends ElementLayouter {
      */
     private raisePageLayouted;
     private drawRow;
+    private isFitToCell;
     /**
      * `Draws row`
      * @private

package/src/implementation/structured-elements/grid/layout/grid-layouter.js

@@ -19,6 +19,8 @@ import { PdfLayoutType, PdfLayoutBreakType } from './../../../graphics/figures/e
 import { PdfLayoutResult, PdfLayoutFormat, ElementLayouter } from './../../../graphics/figures/base/element-layouter';
 import { PdfHorizontalOverflowType } from '../styles/style';
 import { TemporaryDictionary } from './../../../collections/object-object-pair/dictionary';
+import { PdfStringLayouter } from './../../../graphics/fonts/string-layouter';
+import { PdfDocument } from './../../../document/pdf-document';
 /**
  * Class `lay outing the text`.
  *
@@ -90,6 +92,9 @@ var PdfGridLayouter = /** @class */ (function (_super) {
          * @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
@@ -519,6 +524,10 @@ var PdfGridLayouter = /** @class */ (function (_super) {
                             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) {
@@ -686,7 +695,13 @@ var PdfGridLayouter = /** @class */ (function (_super) {
                         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;
                     }
@@ -1134,10 +1149,28 @@ var PdfGridLayouter = /** @class */ (function (_super) {
                     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);
+                    var 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_1.isFinish = true;
                             this.drawRowWithBreak(result_1, row, calculatedHeight);
@@ -1147,10 +1180,10 @@ var PdfGridLayouter = /** @class */ (function (_super) {
                                 result_1.isFinish = false;
                             }
                         }
-                        // else {
-                        //     result.isFinish = false;
-                        //     this.drawRow(row, result, calculatedHeight);
-                        // }
+                        else {
+                            result_1.isFinish = false;
+                            this.drawRow(row, result_1, calculatedHeight);
+                        }
                     }
                     else {
                         result_1.isFinish = false;
@@ -1246,6 +1279,44 @@ var PdfGridLayouter = /** @class */ (function (_super) {
             result.bounds = new RectangleF(new PointF(result.bounds.x, result.bounds.y), new SizeF(location_4.x, location_4.y));
         }
     };
+    PdfGridLayouter.prototype.isFitToCell = function (currentHeight, grid, gridRow) {
+        var isFit = false;
+        var layouter = new PdfStringLayouter();
+        for (var i = 0; i < gridRow.cells.count; i++) {
+            var cell = gridRow.cells.getCell(i);
+            if (typeof cell.value !== 'undefined' && cell.value !== null && typeof cell.value === 'string') {
+                var 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;
+                var 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);
+                var 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;
+    };
     PdfGridLayouter.prototype.drawRowWithBreak = function (result, row, calculateHeight) {
         var location = new PointF(this.currentBounds.x, this.currentBounds.y);
         if (row.grid.isChildGrid && row.grid.allowRowBreakAcrossPages && this.startLocation.x !== this.currentBounds.x) {
@@ -1299,7 +1370,7 @@ var PdfGridLayouter = /** @class */ (function (_super) {
             }
             //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) {