https://github.com/aVadim483/fast-excel-writer/issues/69

aVadim483 · Jul 23, 2024 · 71ceecc · 71ceecc
1 parent 0084040
commit 71ceecc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,10 @@
 ## v.5.6
-Excel::setActiveSheet($name): Excel -- Set active (default) sheet by case-insensitive name
-Sheet::isName($name): bool -- Case-insensitive name checking
-Sheet::setPrintArea($range): Sheet
-Sheet::setPrintTopRows($rows): Sheet
-Sheet::setPrintLeftColumns($cols): Sheet
-Sheet::setPrintGridlines($bool): Sheet
+* Excel::setActiveSheet($name): Excel -- Set active (default) sheet by case-insensitive name
+* Sheet::isName($name): bool -- Case-insensitive name checking
+* Sheet::setPrintArea($range): Sheet
+* Sheet::setPrintTopRows($rows): Sheet
+* Sheet::setPrintLeftColumns($cols): Sheet
+* Sheet::setPrintGridlines($bool): Sheet
 
 ## v.5.5
 

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-[![Latest Stable Version](http://poser.pugx.org/avadim/fast-excel-writer/v)](https://packagist.org/packages/avadim/fast-excel-writer) 
-[![Total Downloads](http://poser.pugx.org/avadim/fast-excel-writer/downloads)](https://packagist.org/packages/avadim/fast-excel-writer) 
+[![GitHub Release](https://img.shields.io/github/v/release/aVadim483/fast-excel-writer)](https://packagist.org/packages/avadim/fast-excel-writer) 
+[![Packagist Downloads](https://img.shields.io/packagist/dt/avadim/fast-excel-writer?color=%2300aa00)](https://packagist.org/packages/avadim/fast-excel-writer) 
 [![License](http://poser.pugx.org/avadim/fast-excel-writer/license)](https://packagist.org/packages/avadim/fast-excel-writer) 
 [![PHP Version Require](http://poser.pugx.org/avadim/fast-excel-writer/require/php)](https://packagist.org/packages/avadim/fast-excel-writer)
 

diff --git a/src/FastExcelWriter/Writer/Writer.php b/src/FastExcelWriter/Writer/Writer.php
@@ -1179,6 +1179,12 @@ public function writeSheetDataEnd(Sheet $sheet)
             $sheet->fileWriter->write('<sheetProtection' . self::tagAttributes($options) . '/>');
         }
 
+        if ($sheet->autoFilter) {
+            $minCell = $sheet->autoFilter;
+            $maxCell = Excel::cellAddress($sheet->rowCountWritten, $sheet->colCountWritten);
+            $sheet->fileWriter->write('<autoFilter ref="' . $minCell . ':' . $maxCell . '"/>');
+        }
+
         $mergedCells = $sheet->getMergedCells();
         if ($mergedCells) {
             $sheet->fileWriter->write('<mergeCells>');
@@ -1188,12 +1194,6 @@ public function writeSheetDataEnd(Sheet $sheet)
             $sheet->fileWriter->write('</mergeCells>');
         }
 
-        if ($sheet->autoFilter) {
-            $minCell = $sheet->autoFilter;
-            $maxCell = Excel::cellAddress($sheet->rowCountWritten, $sheet->colCountWritten);
-            $sheet->fileWriter->write('<autoFilter ref="' . $minCell . ':' . $maxCell . '"/>');
-        }
-
         $links = $sheet->getExternalLinks();
         if ($links) {
             $sheet->fileWriter->write('<hyperlinks>');