Merge pull request #10 from evosys21/feature/multicell-pagebrake

Implement Multicell Disable PageBrake and MinHeight

dev/test-multicell-disable-pagebreak.php

@@ -0,0 +1,22 @@
+<?php
+
+use EvoSys21\PdfLib\Dev\DevFactory;
+
+require_once __DIR__ . '/autoload.php';
+
+$factory = new DevFactory();
+
+$multicell = $factory->multicell();
+$pdf = $multicell->getPdfObject();
+
+$txt = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
+
+$pdf->AutoPageBreak = false;
+$multicell->disablePageBreak();
+
+for ($i = 0; $i < 25; $i++) {
+    $multicell->multiCell(100, 5, $txt);
+}
+
+// output the pdf
+$pdf->Output();

dev/test-multicell-min-height.php

@@ -0,0 +1,17 @@
+<?php
+
+use EvoSys21\PdfLib\Dev\DevFactory;
+
+require_once __DIR__ . '/autoload.php';
+
+$factory = new DevFactory();
+
+$multicell = $factory->multicell();
+$pdf = $multicell->getPdfObject();
+
+$txt = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
+
+$multicell->multiCell(100, 5, $txt, 1, 'J', 1, 3, 3, 3, 3, 50);
+
+// output the pdf
+$pdf->Output();

src/Multicell.php

@@ -759,7 +759,8 @@ public function multiCell(
         float $paddingLeft = 0,
         float $paddingTop = 0,
         float $paddingRight = 0,
-        float $paddingBottom = 0
+        float $paddingBottom = 0,
+	    float $minHeight = 0
     ) {
         $this->multicellData = new MulticellData($this->pdf);
         $this->multicellData->width = $width;
@@ -784,25 +785,36 @@ public function multiCell(
         $lines = $this->stringToLines($this->multicellData);
         $iCounter = 9999; //avoid infinite loop for any reasons
 
+        $linesCount = count($lines);
+        $cellHeight = $height * $linesCount + $paddingTop + $paddingBottom;
+
+        if ($cellHeight < $minHeight) {
+            $diff = $minHeight - $cellHeight;
+            $paddingBottom += $diff;
+            $this->multicellData->paddingBottom = $paddingBottom;
+        }
+
         $doBreak = false;
 
         do {
             $iLeftHeight = $this->pdf->h - $this->pdf->bMargin - $this->pdf->GetY() - $paddingTop - $paddingBottom;
             $addPage = false;
 
             //Number of rows that have space on this page:
-            $iRows = floor($iLeftHeight / $height);
+            $rows = floor($iLeftHeight / $height);
             // Added check for 'AcceptPageBreak'
-            if (count($lines) > $iRows && $this->pdf->AcceptPageBreak()) {
-                $printLines = array_slice($lines, 0, $iRows);
-                $lines = array_slice($lines, $iRows);
+            if (count($lines) > $rows && $this->pdf->AcceptPageBreak() && !$this->options->disablePageBreak) {
+                $printLines = array_slice($lines, 0, $rows);
+                $lines = array_slice($lines, $rows);
                 $addPage = true;
             } else {
                 $printLines = &$lines;
                 $doBreak = true;
             }
 
-            $this->multiCellSec($this->multicellData, $printLines);
+            if (!is_null($this->multicellData)) {
+                $this->multiCellSec($this->multicellData, $printLines);
+            }
 
             if ($addPage) {
                 $this->beforeAddPage();
@@ -1443,4 +1455,11 @@ public function resetSpacers(): self
         $this->options->spacers = [];
         return $this;
     }
+
+    public function disablePageBreak(bool $disablePageBreak = true): self
+    {
+        $this->options->disablePageBreak = $disablePageBreak;
+        return $this;
+    }
+
 }

src/MulticellOptions.php

@@ -14,6 +14,8 @@ class MulticellOptions
 {
     public $styles = [];
     public $spacers = [];
+
+    public bool $disablePageBreak = false;
     protected $stylesBackup = null;
 
     /**

src/Table/Cell/Multicell.php

@@ -226,7 +226,7 @@ public function split($rowHeight, $maxHeight): array
 
     public function getText(): string
     {
-        return $this->TEXT;
+        return $this->TEXT ?? '';
     }
 
 

tests/Feature/ExamplesTest.php

@@ -5,6 +5,9 @@
 use EvoSys21\PdfLib\Tests\BaseExamplesTestCase;
 
 /**
+  * @covers \EvoSys21\PdfLib\Multicell
+ * @covers \EvoSys21\PdfLib\MulticellOptions
+ * @covers \EvoSys21\PdfLib\Table
  */
 class ExamplesTest extends BaseExamplesTestCase
 {

tests/Feature/ProviderTrait.php

@@ -36,6 +36,8 @@ public function getDevSources(): array
             'test-multicell-shrinking.php',
             'test-multicell-shrinking2.php',
             'test-multicell-style.php',
+            'test-multicell-disable-pagebreak.php',
+            'test-multicell-min-height.php',
         ];
 
         $contexts = [