thead & tfoot spacing bugfix

YetiForceCompany · May 6, 2019 · ebddb28 · ebddb28
1 parent 9400e97
commit ebddb28
Show file tree

Hide file tree

Showing 11 changed files with 219 additions and 233 deletions.
diff --git a/examples/ColSpan.pdf b/examples/ColSpan.pdf
diff --git a/examples/Image.pdf b/examples/Image.pdf
diff --git a/examples/Invoice.html b/examples/Invoice.html
diff --git a/examples/Invoice.pdf b/examples/Invoice.pdf
diff --git a/examples/InvoiceTable.pdf b/examples/InvoiceTable.pdf
diff --git a/examples/RowSpan.html b/examples/RowSpan.html
@@ -1,4 +1,4 @@
-<!--<table style="font-size:12px;line-height:1.2;border-collapse:separate;width:100%">
+<table style="font-size:12px;line-height:1.2;border-collapse:separate;width:100%">
   <tr style="background-color:lightgray;border:1px solid black;">
     <th>header</th>
     <th>header</th>
@@ -179,7 +179,6 @@
     </td>
   </tr>
 </table>
--->
 
 <table style="font-size:12px;line-height:1.2;border:1px solid blue;border-collapse:separate;width:100%">
   <tr>
@@ -192,7 +191,6 @@
   </tr>
 </table>
 
-<!--
 <table style="font-size:12px;line-height:1.2;border:1px solid blue;border-collapse:separate;width:100%">
   <tr>
     <td rowspan="2" style="border:1px solid red">row span 3</td>
@@ -262,4 +260,3 @@
     <td style="border:1px solid red">3</td>
   </tr>
 </table>
--->
diff --git a/examples/RowSpan.pdf b/examples/RowSpan.pdf
diff --git a/examples/TableClassNames.pdf b/examples/TableClassNames.pdf
diff --git a/lib/Html/Parser.php b/lib/Html/Parser.php
@@ -241,7 +241,6 @@ public function parse()
 				$page->getBox()->spanAllRows();
 			}
 			$page->getBox()->getStyle()->fixDomTree();
-			//$page->getBox()->getStyle()->fixRowSpansSpacing();
 			$this->document->fixPageNumbers();
 			foreach ($this->document->getPages($groupIndex) as $page) {
 				$this->document->setCurrentPage($page);

diff --git a/lib/Layout/TableBox.php b/lib/Layout/TableBox.php
@@ -1349,7 +1349,9 @@ public function measureHeight(bool $afterPageDividing = false)
 					$cell->getDimensions()->setHeight($height);
 				}
 			}
-			$rowGroupHeight = Math::add($rowGroupHeight, $row->getStyle()->getRules('border-spacing'));
+			if ($row->getStyle()->getRules('border-collapse') === 'separate') {
+				$rowGroupHeight = Math::add($rowGroupHeight, $row->getStyle()->getRules('border-spacing'));
+			}
 			$rowGroup->getDimensions()->setHeight($rowGroupHeight);
 			$tableHeight = Math::add($tableHeight, $rowGroupHeight);
 		}

diff --git a/lib/Style/Style.php b/lib/Style/Style.php
@@ -166,7 +166,7 @@ class Style extends \YetiForcePDF\Base
 		'height' => 'auto',
 		'overflow' => 'visible',
 		'vertical-align' => 'baseline',
-		'line-height' => '1.2em',
+		'line-height' => '1.4em',
 		'background-color' => 'transparent',
 		'color' => '#000000',
 		'word-wrap' => 'normal',
@@ -561,7 +561,8 @@ class Style extends \YetiForcePDF\Base
 			'font-weight' => 'bold',
 			'text-align' => 'center',
 			'padding' => '1px',
-			'background-color' => '#ddd'
+			'background-color' => '#ddd',
+			'line-height' => '1.6em'
 		],
 		'thead' => [
 			'display' => 'table-header-group',
@@ -1584,41 +1585,6 @@ public function fixTables(bool $removeBottomBorders)
 		return $this;
 	}
 
-	/**
-	 * Add border spacing to last column that was spanned.
-	 *
-	 * @return self
-	 */
-	public function fixRowSpansSpacing()
-	{
-		$box = $this->getBox();
-		if (!$box instanceof TableBox) {
-			$boxes = $box->getBoxesByType('TableBox');
-		}
-		foreach ($boxes as $box) {
-			$rowGroups = $box->getChildren(true, true);
-			$rowGroupsCount = count($rowGroups);
-			foreach ($rowGroups as $rowGroupIndex => $rowGroup) {
-				$columnHeightChanged = false;
-				$rows = $rowGroup->getChildren(true, true);
-				$rowsCount = count($rows);
-				foreach ($rows as $rowIndex => $row) {
-					$columns = $row->getChildren(true, true);
-					foreach ($columns as $columnIndex => $column) {
-						$columnStyle = $column->getStyle();
-						if ($columnStyle->getRules('border-collapse') === 'separate' && $rowIndex + $column->getRowSpan() === $rowsCount && $rowGroupIndex + 1 === $rowGroupsCount) {
-							$spacing = $columnStyle->getRules('border-spacing');
-							$columnStyle->setRule('padding-bottom', $spacing);
-							$column->measureHeight();
-							$rowGroup->measureHeight();
-						}
-					}
-				}
-			}
-		}
-		return $this;
-	}
-
 	/**
 	 * Fix dom tree - after dom tree is parsed we must clean up or add some rules.
 	 *