@syncfusion/ej2-pdf-export 26.2.11 → 27.1.48

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

@@ -21187,10 +21187,8 @@ class PdfPaddings {
          */
         this.hasBottomPad = false;
         if (typeof left === 'undefined') {
-            //5.76 and 0 are taken from ms-word default table margins.
-            this.leftPad = this.rightPad = 5.76;
             //0.5 is set for top and bottom by default.
-            this.bottomPad = this.topPad = 0.5;
+            this.bottomPad = this.topPad = this.leftPad = this.rightPad = 0.5;
         }
         else {
             this.leftPad = left;
@@ -26732,10 +26730,6 @@ class PdfGridStyle extends PdfGridStyleBase {
      */
     constructor() {
         super();
-        /**
-         * @private
-         */
-        this._isDefaultPadding = false;
         this.gridBorderOverlapStyle = PdfBorderOverlapStyle.Overlap;
         this.bAllowHorizontalOverflow = false;
         this.gridHorizontalOverflowType = PdfHorizontalOverflowType.LastPage;
@@ -26781,7 +26775,6 @@ class PdfGridStyle extends PdfGridStyleBase {
     get cellPadding() {
         if (typeof this.gridCellPadding === 'undefined') {
             this.gridCellPadding = new PdfPaddings();
-            this._isDefaultPadding = true;
         }
         return this.gridCellPadding;
     }
@@ -26793,7 +26786,6 @@ class PdfGridStyle extends PdfGridStyleBase {
         else {
             this.gridCellPadding = value;
         }
-        this._isDefaultPadding = false;
     }
     /**
      * Gets or sets the `border overlap style` of the 'PdfGrid'.
@@ -27313,19 +27305,41 @@ class PdfGridCell {
         }
         else {
             if (this.style.cellPadding == null || typeof this.style.cellPadding === 'undefined') {
-                if (typeof this.gridRow.grid.style.cellPadding.left !== 'undefined' && this.gridRow.grid.style.cellPadding.hasLeftPad) {
-                    returnBounds.x += this.gridRow.grid.style.cellPadding.left + this.cellStyle.borders.left.width;
-                    returnBounds.width -= this.gridRow.grid.style.cellPadding.left;
-                }
-                if (typeof this.gridRow.grid.style.cellPadding.top !== 'undefined' && this.gridRow.grid.style.cellPadding.hasTopPad) {
-                    returnBounds.y += this.gridRow.grid.style.cellPadding.top + this.cellStyle.borders.top.width;
-                    returnBounds.height -= this.gridRow.grid.style.cellPadding.top;
-                }
-                if (typeof this.gridRow.grid.style.cellPadding.right !== 'undefined' && this.gridRow.grid.style.cellPadding.hasRightPad) {
-                    returnBounds.width -= this.gridRow.grid.style.cellPadding.right;
+                if (this.gridRow.grid.style.cellPadding !== null && typeof this.gridRow.grid.style.cellPadding !== 'undefined') {
+                    const hasLeftPad = this.gridRow.grid.style.cellPadding.hasLeftPad;
+                    const hasTopPad = this.gridRow.grid.style.cellPadding.hasTopPad;
+                    const hasRightPad = this.gridRow.grid.style.cellPadding.hasRightPad;
+                    const hasBottomPad = this.gridRow.grid.style.cellPadding.hasBottomPad;
+                    if (hasLeftPad || hasTopPad || hasRightPad || hasBottomPad) {
+                        if (typeof this.gridRow.grid.style.cellPadding.left !== 'undefined' && hasLeftPad) {
+                            returnBounds.x += this.gridRow.grid.style.cellPadding.left + this.cellStyle.borders.left.width;
+                            returnBounds.width -= this.gridRow.grid.style.cellPadding.left;
+                        }
+                        if (typeof this.gridRow.grid.style.cellPadding.top !== 'undefined' && hasTopPad) {
+                            returnBounds.y += this.gridRow.grid.style.cellPadding.top + this.cellStyle.borders.top.width;
+                            returnBounds.height -= this.gridRow.grid.style.cellPadding.top;
+                        }
+                        if (typeof this.gridRow.grid.style.cellPadding.right !== 'undefined' && hasRightPad) {
+                            returnBounds.width -= this.gridRow.grid.style.cellPadding.right;
+                        }
+                        if (typeof this.gridRow.grid.style.cellPadding.bottom !== 'undefined' && hasBottomPad) {
+                            returnBounds.height -= this.gridRow.grid.style.cellPadding.bottom;
+                        }
+                    }
+                    else {
+                        const format = this.getStringFormat();
+                        if (format.alignment === null || typeof format.alignment === 'undefined') {
+                            returnBounds.x += this.row.grid.style.cellPadding.left;
+                            returnBounds.y += this.row.grid.style.cellPadding.top;
+                        }
+                    }
                 }
-                if (typeof this.gridRow.grid.style.cellPadding.bottom !== 'undefined' && this.gridRow.grid.style.cellPadding.hasBottomPad) {
-                    returnBounds.height -= this.gridRow.grid.style.cellPadding.bottom;
+                else {
+                    const format = this.getStringFormat();
+                    if (format.alignment === null || typeof format.alignment === 'undefined') {
+                        returnBounds.x += this.row.grid.style.cellPadding.left;
+                        returnBounds.y += this.row.grid.style.cellPadding.top;
+                    }
                 }
             }
             else {
@@ -27549,12 +27563,13 @@ class PdfGridCell {
             }
         }
         else if (this.objectValue instanceof PdfImage || this.objectValue instanceof PdfBitmap) {
-            let imageBounds;
-            if (this.objectValue.width <= innerLayoutArea.width) {
-                imageBounds = new RectangleF(innerLayoutArea.x, innerLayoutArea.y, this.objectValue.width, innerLayoutArea.height);
+            const imageBounds = new RectangleF(innerLayoutArea.x, innerLayoutArea.y, innerLayoutArea.width, innerLayoutArea.height);
+            const image = this.objectValue;
+            if (image.width <= innerLayoutArea.width) {
+                imageBounds.width = image.width;
             }
-            else {
-                imageBounds = innerLayoutArea;
+            if (image.height <= innerLayoutArea.height) {
+                imageBounds.height = image.height;
             }
             graphics.drawImage(this.objectValue, imageBounds.x, imageBounds.y, imageBounds.width, imageBounds.height);
         }
@@ -30063,7 +30078,11 @@ class PdfGridLayouter extends ElementLayouter {
                                 let cell = row.cells.getCell(c);
                                 let cellWidth = 0;
                                 let totalwidth = 0;
+                                let childGridCell;
                                 if (cell.value instanceof PdfGrid) {
+                                    if (!childGridCell) {
+                                        childGridCell = cell;
+                                    }
                                     for (let i = 0; i < cell.value.columns.count; i++) {
                                         totalwidth += cell.value.columns.getColumn(i).columnWidth;
                                     }
@@ -30077,13 +30096,16 @@ class PdfGridLayouter extends ElementLayouter {
                                 }
                                 else
                                     cellWidth = Math.max(totalwidth, row.grid.columns.getColumn(c).width);
-                                if (!this.Grid.style._isDefaultPadding) {
-                                    let bottomPadding = this.Grid.style.cellPadding.top + this.Grid.style.cellPadding.bottom;
-                                    bottomPadding += cell.style.borders.top.width + cell.style.borders.bottom.width;
-                                    if ((height + bottomPadding) < pageGraphics.clientSize.height) {
-                                        height += bottomPadding;
-                                        this.currentBounds.y += bottomPadding;
-                                    }
+                                let bottomPadding;
+                                if (childGridCell && childGridCell.style && childGridCell.style.cellPadding) {
+                                    bottomPadding = childGridCell.style.cellPadding.bottom;
+                                }
+                                else {
+                                    bottomPadding = this.Grid.style.cellPadding.bottom;
+                                }
+                                if (typeof bottomPadding === 'number' && (height + bottomPadding) < pageGraphics.clientSize.height) {
+                                    height += bottomPadding;
+                                    this.currentBounds.y += bottomPadding;
                                 }
                                 cell.drawCellBorders(pageGraphics, new RectangleF(location, new SizeF(cellWidth, height)));
                                 const rowWidth = this.Grid.rows.getRow(this.Grid.rows.count - 1).width;