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;
         }