Merge pull request #3940 from oleibman/issue3923

Unallocated Cells Affected by Column/Row Insert/Delete

Author: oleibman

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Added
 
 - Default Style Alignment Property (workaround for bug in non-Excel spreadsheet apps) [Issue #3918](https://github.com/PHPOffice/PhpSpreadsheet/issues/3918) [PR #3924](https://github.com/PHPOffice/PhpSpreadsheet/pull/3924)
+- Additional Support for Date/Time Styles [PR #3939](https://github.com/PHPOffice/PhpSpreadsheet/pull/3939)
 
 ### Changed
 
@@ -33,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Incorrect SUMPRODUCT Calculation [Issue #3909](https://github.com/PHPOffice/PhpSpreadsheet/issues/3909) [PR #3916](https://github.com/PHPOffice/PhpSpreadsheet/pull/3916)
 - Formula Misidentifying Text as Cell After Insertion/Deletion [Issue #3907](https://github.com/PHPOffice/PhpSpreadsheet/issues/3907) [PR #3915](https://github.com/PHPOffice/PhpSpreadsheet/pull/3915)
 - Unexpected Absolute Address in Xlsx Rels [Issue #3730](https://github.com/PHPOffice/PhpSpreadsheet/issues/3730) [PR #3923](https://github.com/PHPOffice/PhpSpreadsheet/pull/3923)
+- Unallocated Cells Affected by Column/Row Insert/Delete [Issue #3933](https://github.com/PHPOffice/PhpSpreadsheet/issues/3933) [PR #3940](https://github.com/PHPOffice/PhpSpreadsheet/pull/3940)
 
 ## 2.0.0 - 2024-01-04
 

src/PhpSpreadsheet/ReferenceHelper.php

@@ -383,7 +383,7 @@ public function insertNewBefore(
         }
 
         // Get coordinate of $beforeCellAddress
-        [$beforeColumn, $beforeRow] = Coordinate::indexesFromString($beforeCellAddress);
+        [$beforeColumn, $beforeRow, $beforeColumnString] = Coordinate::indexesFromString($beforeCellAddress);
 
         // Clear cells if we are removing columns or rows
         $highestColumn = $worksheet->getHighestColumn();
@@ -401,17 +401,19 @@ public function insertNewBefore(
             $this->clearRowStrips($highestColumn, $beforeColumn, $beforeRow, $numberOfRows, $worksheet);
         }
 
-        // Find missing coordinates. This is important when inserting column before the last column
-        $cellCollection = $worksheet->getCellCollection();
-        $missingCoordinates = array_filter(
-            array_map(fn ($row): string => "{$highestDataColumn}{$row}", range(1, $highestDataRow)),
-            fn ($coordinate): bool => $cellCollection->has($coordinate) === false
-        );
-
-        // Create missing cells with null values
-        if (!empty($missingCoordinates)) {
-            foreach ($missingCoordinates as $coordinate) {
-                $worksheet->createNewCell($coordinate);
+        // Find missing coordinates. This is important when inserting or deleting column before the last column
+        $startRow = $startCol = 1;
+        $startColString = 'A';
+        if ($numberOfRows === 0) {
+            $startCol = $beforeColumn;
+            $startColString = $beforeColumnString;
+        } elseif ($numberOfColumns === 0) {
+            $startRow = $beforeRow;
+        }
+        $highColumn = Coordinate::columnIndexFromString($highestDataColumn);
+        for ($row = $startRow; $row <= $highestDataRow; ++$row) {
+            for ($col = $startCol, $colString = $startColString; $col <= $highColumn; ++$col, ++$colString) {
+                $worksheet->getCell("$colString$row"); // create cell if it doesn't exist
             }
         }
 

tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php

@@ -252,6 +252,27 @@ public static function removeColumnProvider(): array
                 ],
                 'A',
             ],
+            'Data includes nulls' => [
+                [
+                    ['A1', 'B1', 'C1', 'D1', 'E1'],
+                    [null, 'B2', 'C2', 'D2', 'E2'],
+                    ['A3', null, 'C3', 'D3', 'E3'],
+                    ['A4', 'B4', null, 'D4', 'E4'],
+                    ['A5', 'B5', 'C5', null, 'E5'],
+                    ['A6', 'B6', 'C6', 'D6', null],
+                ],
+                'B',
+                2,
+                [
+                    ['A1', 'D1', 'E1'],
+                    [null, 'D2', 'E2'],
+                    ['A3', 'D3', 'E3'],
+                    ['A4', 'D4', 'E4'],
+                    ['A5', null, 'E5'],
+                    ['A6', 'D6', null],
+                ],
+                'C',
+            ],
         ];
     }
 
@@ -384,6 +405,25 @@ public static function removeRowsProvider(): array
                 ],
                 4,
             ],
+            'Data includes nulls' => [
+                [
+                    ['A1', 'B1', 'C1', 'D1', 'E1'],
+                    [null, 'B2', 'C2', 'D2', 'E2'],
+                    ['A3', null, 'C3', 'D3', 'E3'],
+                    ['A4', 'B4', null, 'D4', 'E4'],
+                    ['A5', 'B5', 'C5', null, 'E5'],
+                    ['A6', 'B6', 'C6', 'D6', null],
+                ],
+                1,
+                2,
+                [
+                    ['A3', null, 'C3', 'D3', 'E3'],
+                    ['A4', 'B4', null, 'D4', 'E4'],
+                    ['A5', 'B5', 'C5', null, 'E5'],
+                    ['A6', 'B6', 'C6', 'D6', null],
+                ],
+                4,
+            ],
         ];
     }