Add drawingPassThroughEnabled to sheet

Author: rpg600

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -1484,6 +1484,15 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                         // Store drawing XML for pass-through if enabled
                                         if ($this->enableDrawingPassThrough) {
                                             $unparsedDrawings[$drawingRelId] = $xmlDrawing->asXML();
+                                            // Mark that pass-through is enabled for this sheet
+                                            $sheetCodeName = $docSheet->getCodeName();
+                                            if (!isset($unparsedLoadedData['sheets']) || !is_array($unparsedLoadedData['sheets'])) {
+                                                $unparsedLoadedData['sheets'] = [];
+                                            }
+                                            if (!isset($unparsedLoadedData['sheets'][$sheetCodeName]) || !is_array($unparsedLoadedData['sheets'][$sheetCodeName])) {
+                                                $unparsedLoadedData['sheets'][$sheetCodeName] = [];
+                                            }
+                                            $unparsedLoadedData['sheets'][$sheetCodeName]['drawingPassThroughEnabled'] = true;
                                         }
 
                                         if ($xmlDrawingChildren->oneCellAnchor) {
@@ -1714,6 +1723,11 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                                 }
                                             }
                                         }
+                                        // Legacy behavior: preserve empty drawings when pass-through is disabled
+                                        if (empty($relsDrawing) && $xmlDrawing->count() == 0) {
+                                            // Save Drawing without rels and children as unparsed
+                                            $unparsedDrawings[$drawingRelId] = $xmlDrawing->asXML();
+                                        }
                                     }
 
                                     // store original rId of drawing files

src/PhpSpreadsheet/Writer/Xlsx/Drawing.php

@@ -603,6 +603,8 @@ private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition,
      *
      * Returns the original drawing XML stored during load (when Reader pass-through was enabled).
      * This preserves unsupported drawing elements (shapes, textboxes) that PhpSpreadsheet cannot parse.
+     *
+     * @return ?string The pass-through XML, or null if not available or should not be used
      */
     private function getPassThroughDrawingXml(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet): ?string
     {
@@ -612,11 +614,20 @@ private function getPassThroughDrawingXml(\PhpOffice\PhpSpreadsheet\Worksheet\Wo
         }
 
         $codeName = $worksheet->getCodeName();
-        if (!isset($unparsedLoadedData['sheets'][$codeName]) || !is_array($unparsedLoadedData['sheets'][$codeName])) {
+        if (!isset($unparsedLoadedData['sheets'][$codeName])) {
             return null;
         }
 
         $sheetData = $unparsedLoadedData['sheets'][$codeName];
+        if (!is_array($sheetData)) {
+            return null;
+        }
+
+        // Only use pass-through XML if the Reader flag was explicitly enabled
+        if (($sheetData['drawingPassThroughEnabled'] ?? false) !== true) {
+            return null;
+        }
+
         if (!isset($sheetData['Drawings']) || !is_array($sheetData['Drawings'])) {
             return null;
         }

tests/PhpSpreadsheetTests/Writer/Xlsx/DrawingPassThroughTest.php

@@ -385,4 +385,59 @@ public function testDrawingPassThroughGetterSetter(): void
         $reader->setEnableDrawingPassThrough(false);
         self::assertFalse($reader->getEnableDrawingPassThrough());
     }
+
+    /**
+     * Test that the drawingPassThroughEnabled flag is correctly set in unparsedLoadedData.
+     * This verifies the Reader sets the flag and the Writer's getPassThroughDrawingXml checks it.
+     */
+    public function testDrawingPassThroughEnabledFlagIsSetCorrectly(): void
+    {
+        // Test 1: Load WITHOUT pass-through (default)
+        $reader = new XlsxReader();
+        self::assertFalse($reader->getEnableDrawingPassThrough(), 'Pass-through should be disabled by default');
+        $spreadsheet = $reader->load(self::TEMPLATE);
+
+        $sheet = $spreadsheet->getActiveSheet();
+        $unparsedData = $spreadsheet->getUnparsedLoadedData();
+        $codeName = $sheet->getCodeName();
+
+        // Verify that drawingPassThroughEnabled flag is NOT set when pass-through is disabled
+        self::assertArrayHasKey('sheets', $unparsedData);
+        self::assertIsArray($unparsedData['sheets']);
+
+        // The sheet may exist in unparsedData (legacy empty drawings), but the flag should be absent or false
+        if (isset($unparsedData['sheets'][$codeName])) {
+            $sheetData = $unparsedData['sheets'][$codeName];
+            self::assertIsArray($sheetData);
+            $flag = $sheetData['drawingPassThroughEnabled'] ?? false;
+            self::assertFalse($flag, 'drawingPassThroughEnabled should be false/absent when pass-through is disabled');
+        }
+
+        $spreadsheet->disconnectWorksheets();
+
+        // Test 2: Load WITH pass-through enabled
+        $reader2 = new XlsxReader();
+        $reader2->setEnableDrawingPassThrough(true);
+        self::assertTrue($reader2->getEnableDrawingPassThrough(), 'Pass-through should be enabled');
+        $spreadsheet2 = $reader2->load(self::TEMPLATE);
+
+        $sheet2 = $spreadsheet2->getActiveSheet();
+        $unparsedData2 = $spreadsheet2->getUnparsedLoadedData();
+        $codeName2 = $sheet2->getCodeName();
+
+        // Verify that drawingPassThroughEnabled flag IS set when pass-through is enabled
+        self::assertArrayHasKey('sheets', $unparsedData2);
+        self::assertIsArray($unparsedData2['sheets']);
+        self::assertArrayHasKey($codeName2, $unparsedData2['sheets']);
+        self::assertIsArray($unparsedData2['sheets'][$codeName2]);
+        self::assertArrayHasKey('drawingPassThroughEnabled', $unparsedData2['sheets'][$codeName2], 'drawingPassThroughEnabled flag should exist');
+        self::assertTrue($unparsedData2['sheets'][$codeName2]['drawingPassThroughEnabled'], 'drawingPassThroughEnabled should be true when pass-through is enabled');
+
+        // Verify that the drawing XML is also stored
+        self::assertArrayHasKey('Drawings', $unparsedData2['sheets'][$codeName2]);
+        self::assertIsArray($unparsedData2['sheets'][$codeName2]['Drawings']);
+        self::assertNotEmpty($unparsedData2['sheets'][$codeName2]['Drawings'], 'Drawing XML should be stored when pass-through is enabled');
+
+        $spreadsheet2->disconnectWorksheets();
+    }
 }