Html Better Support for Indent

oleibman · oleibman · commit 8c70086f0e61 · 2025-09-20T15:26:49.000-07:00
diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
@@ -1095,8 +1095,11 @@ private function applyInlineStyle(Worksheet &$sheet, int $row, string $column, a
                     break;
 
                 case 'text-indent':
+                    $indentDimension = new CssDimension($styleValueString);
+                    $indent = $indentDimension
+                        ->toUnit(CssDimension::UOM_PIXELS);
                     $cellStyle->getAlignment()->setIndent(
-                        (int) str_replace(['px'], '', $styleValueString)
+                        (int) ($indent / Alignment::INDENT_UNITS_TO_PIXELS)
                     );
 
                     break;
diff --git a/src/PhpSpreadsheet/Style/Alignment.php b/src/PhpSpreadsheet/Style/Alignment.php
@@ -92,6 +92,8 @@ class Alignment extends Supervisor
     const TEXTROTATION_STACK_EXCEL = 255;
     const TEXTROTATION_STACK_PHPSPREADSHEET = -165; // 90 - 255
 
+    public const INDENT_UNITS_TO_PIXELS = 9;
+
     /**
      * Horizontal alignment.
      */
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
@@ -1115,7 +1115,12 @@ private function createCSSStyleAlignment(Alignment $alignment): array
         if ($textAlign) {
             $css['text-align'] = $textAlign;
             if (in_array($textAlign, ['left', 'right'])) {
-                $css['padding-' . $textAlign] = (string) ((int) $alignment->getIndent() * 9) . 'px';
+                $css['padding-' . $textAlign] = (string) ($alignment->getIndent() * Alignment::INDENT_UNITS_TO_PIXELS) . 'px';
+            }
+        } else {
+            $indent = $alignment->getIndent();
+            if ($indent !== 0) {
+                $css['text-indent'] = (string) ($alignment->getIndent() * Alignment::INDENT_UNITS_TO_PIXELS) . 'px';
             }
         }
         $rotation = $alignment->getTextRotation();
@@ -1522,7 +1527,6 @@ private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, stri
     /** @param string|string[] $cssClass */
     private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cell, array|string &$cssClass): string
     {
-        $cellData = '&nbsp;';
         if ($cell instanceof Cell) {
             $cellData = '';
             // Don't know what this does, and no test cases.
@@ -1571,13 +1575,21 @@ private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cel
                 }
             }
         } else {
+            $cellData = "$cell";
             // Use default borders for empty cell
             if (is_string($cssClass)) {
                 $cssClass .= ' style0';
             }
         }
+        /*
+         * Browsers may remove an entirely empty row.
+         * An interesting option is to leave an empty cell empty using css.
+         * td:empty::after{content: "\00a0";}
+         * This works well in modern browsers.
+         * Alas, none of our Pdf writers can handle it.
+         */
 
-        return $cellData;
+        return (trim($cellData) === '') ? '&nbsp;' : $cellData;
     }
 
     private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
@@ -199,7 +199,7 @@ public function testCanApplyAlignment(): void
                         <td valign="center">Center valign</td>
                         <td style="text-align: center;">Center align</td>
                         <td style="vertical-align: center;">Center valign</td>
-                        <td style="text-indent: 10px;">Text indent</td>
+                        <td style="text-indent: 9px;">Text indent</td>
                         <td style="word-wrap: break-word;">Wraptext</td>
                     </tr>
                 </table>';
@@ -220,7 +220,7 @@ public function testCanApplyAlignment(): void
         self::assertEquals(Alignment::VERTICAL_CENTER, $style->getAlignment()->getVertical());
 
         $style = $firstSheet->getCell('E1')->getStyle();
-        self::assertEquals(10, $style->getAlignment()->getIndent());
+        self::assertEquals(1, $style->getAlignment()->getIndent());
 
         $style = $firstSheet->getCell('F1')->getStyle();
         self::assertTrue($style->getAlignment()->getWrapText());
@@ -302,14 +302,14 @@ public function testTextIndentUseRowspan(): void
                   </tr>
                   <tr>
                     <td>2</td>
-                    <td style="text-indent:10px">Text Indent</td>
+                    <td style="text-indent:9px">Text Indent</td>
                   </tr>
                 </table>';
         $filename = HtmlHelper::createHtml($html);
         $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
         $style = $firstSheet->getCell('C2')->getStyle();
-        self::assertEquals(10, $style->getAlignment()->getIndent());
+        self::assertEquals(1, $style->getAlignment()->getIndent());
         $spreadsheet->disconnectWorksheets();
     }
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4248Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4248Test.php
@@ -93,7 +93,7 @@ public function testHtml(): void
         $data = str_replace(["\r", "\n"], '', $writer->generateHtmlAll());
         $expected = '          <tr class="row17">' // Cell D18
             . '            <td class="column0 style0">&nbsp;</td>'
-            . '            <td class="column1 style28 null"></td>'
+            . '            <td class="column1 style28 null">&nbsp;</td>'
             . '            <td class="column2 style35 s">Eligible </td>'
             . '            <td class="column3 style70 s">Non</td>';
         self::assertStringContainsString($expected, $data, 'Cell D18 style');
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php
@@ -57,7 +57,7 @@ public function testColourScaleHtmlOutput(): void
             ['G3', 'background-color:#EC926F;">7<', 'cell G3'],
             ['H3', 'background-color:#E67C73;">8<', 'cell H3'],
             ['A4', 'background-color:#57BB8A;">1<', 'cell A4'],
-            ['I4', 'null"><', 'empty cell I4'],
+            ['I4', 'null">&nbsp;<', 'empty cell I4'],
             ['J4', 'background-color:#E67C73;">10<', 'cell J4'],
         ];
         foreach ($expectedMatches as $expected) {
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
@@ -151,6 +151,7 @@ public function testFormatValueWithMask(mixed $expectedResult, mixed $val, strin
 
         $writer = new Html($spreadsheet);
         $html = $writer->generateHTMLAll();
+        $html = str_replace('>&nbsp;<', '><', $html); // clear empty cells
         $dom = new DOMDocument();
         $dom->loadHTML($html);
         $body = $dom->getElementsByTagName('body')->item(0);
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/ReadOrderTest.php b/tests/PhpSpreadsheetTests/Writer/Html/ReadOrderTest.php
@@ -25,6 +25,10 @@ public function testInline(): void
             ->getAlignment()->setReadOrder(Alignment::READORDER_LTR);
         $sheet->getStyle('A2')->getFont()->setName('Arial');
         $sheet->getStyle('A3')->getFont()->setName('Times New Roman');
+        $sheet->setCellValue('A5', 'hello');
+        $sheet->getStyle('A5')->getFont()->setName('Tahoma');
+        $sheet->getStyle('A5')
+            ->getAlignment()->setIndent(2);
         $writer = new HtmlWriter($spreadsheet);
         $writer->setUseInlineCss(true);
         $html = $writer->generateHtmlAll();
@@ -40,6 +44,14 @@ public function testInline(): void
             '<td class="gridlines" style="vertical-align:bottom; color:#000000; font-family:\'Times New Roman\';',
             $html
         );
+        self::assertStringContainsString(
+            '>&nbsp;</td>',
+            $html
+        );
+        self::assertStringContainsString(
+            '<td class="gridlines" style="vertical-align:bottom; text-indent:18px; color:#000000; font-family:\'Tahoma\';',
+            $html
+        );
         $spreadsheet->disconnectWorksheets();
 
         $reader = new HtmlReader();
@@ -57,6 +69,10 @@ public function testInline(): void
             Alignment::READORDER_CONTEXT,
             $sheet0->getStyle('A3')->getAlignment()->getReadOrder()
         );
+        self::assertSame(
+            2,
+            $sheet0->getStyle('A5')->getAlignment()->getIndent()
+        );
         $spreadsheet2->disconnectWorksheets();
     }
 
@@ -73,6 +89,10 @@ public function testNotInline(): void
             ->getAlignment()->setReadOrder(Alignment::READORDER_LTR);
         $sheet->getStyle('A2')->getFont()->setName('Arial');
         $sheet->getStyle('A3')->getFont()->setName('Times New Roman');
+        $sheet->setCellValue('A5', 'hello');
+        $sheet->getStyle('A5')->getFont()->setName('Tahoma');
+        $sheet->getStyle('A5')
+            ->getAlignment()->setIndent(2);
         $writer = new HtmlWriter($spreadsheet);
         $html = $writer->generateHtmlAll();
         self::assertStringContainsString(
@@ -87,6 +107,14 @@ public function testNotInline(): void
             'td.style3, th.style3 { vertical-align:bottom; border-bottom',
             $html
         );
+        self::assertStringContainsString(
+            '>&nbsp;</td>',
+            $html
+        );
+        self::assertStringContainsString(
+            'td.style4, th.style4 { vertical-align:bottom; text-indent:18px;',
+            $html
+        );
         $spreadsheet->disconnectWorksheets();
         // PhpSpreadsheet does not read non-inline styles
     }

Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,12 @@ private function createCSSStyleAlignment(Alignment $alignment): array`
`1115`	`1115`	`if ($textAlign) {`
`1116`	`1116`	`$css['text-align'] = $textAlign;`
`1117`	`1117`	`if (in_array($textAlign, ['left', 'right'])) {`
`1118`		`- $css['padding-' . $textAlign] = (string) ((int) $alignment->getIndent() * 9) . 'px';`
	`1118`	`+ $css['padding-' . $textAlign] = (string) ($alignment->getIndent() * Alignment::INDENT_UNITS_TO_PIXELS) . 'px';`
	`1119`	`+ }`
	`1120`	`+ } else {`
	`1121`	`+ $indent = $alignment->getIndent();`
	`1122`	`+ if ($indent !== 0) {`
	`1123`	`+ $css['text-indent'] = (string) ($alignment->getIndent() * Alignment::INDENT_UNITS_TO_PIXELS) . 'px';`
`1119`	`1124`	`}`
`1120`	`1125`	`}`
`1121`	`1126`	`$rotation = $alignment->getTextRotation();`
`@@ -1522,7 +1527,6 @@ private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, stri`
`1522`	`1527`	`/** @param string\|string[] $cssClass */`
`1523`	`1528`	`private function generateRowCellData(Worksheet $worksheet, null\|Cell\|string $cell, array\|string &$cssClass): string`
`1524`	`1529`	`{`
`1525`		`- $cellData = ' ';`
`1526`	`1530`	`if ($cell instanceof Cell) {`
`1527`	`1531`	`$cellData = '';`
`1528`	`1532`	`// Don't know what this does, and no test cases.`
`@@ -1571,13 +1575,21 @@ private function generateRowCellData(Worksheet $worksheet, null\|Cell\|string $cel`
`1571`	`1575`	`}`
`1572`	`1576`	`}`
`1573`	`1577`	`} else {`
	`1578`	`+ $cellData = "$cell";`
`1574`	`1579`	`// Use default borders for empty cell`
`1575`	`1580`	`if (is_string($cssClass)) {`
`1576`	`1581`	`$cssClass .= ' style0';`
`1577`	`1582`	`}`
`1578`	`1583`	`}`
	`1584`	`+ /*`
	`1585`	`+ * Browsers may remove an entirely empty row.`
	`1586`	`+ * An interesting option is to leave an empty cell empty using css.`
	`1587`	`+ * td:empty::after{content: "\00a0";}`
	`1588`	`+ * This works well in modern browsers.`
	`1589`	`+ * Alas, none of our Pdf writers can handle it.`
	`1590`	`+ */`
`1579`	`1591`
`1580`		`- return $cellData;`
	`1592`	`+ return (trim($cellData) === '') ? ' ' : $cellData;`
`1581`	`1593`	`}`
`1582`	`1594`
`1583`	`1595`	`private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string`