1.0.20

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.0.20 (2021-07-29)
+
+* Fixed sheet names duplicates (Page, Page (1), Page (2)...) 
+
+## 1.0.19 (2021-07-28)
+
+* Fixed sheet names duplicates 
+
 ## 1.0.18 (2021-07-28)
 
 * Fixed email regex

src/SimpleXLSXGen.php

@@ -115,9 +115,26 @@ class SimpleXLSXGen {
 	}
 
 	public function addSheet( array $rows, $name = null ) {
-		$this->curSheet++;
 
-		$this->sheets[$this->curSheet] = ['name' => $name ?: 'Sheet'.($this->curSheet+1), 'hyperlinks' => []];
+		$this->curSheet++;
+		if ( $name === null ) { // autogenerated sheet names
+			$name = 'Sheet'.($this->curSheet+1);
+		} else {
+			$names = [];
+			foreach( $this->sheets as $sh ) {
+				$names[ strtoupper( $sh['name']) ] = 1;
+			}
+			for( $i = 0; $i < 100; $i++ ) {
+				$new_name = ($i === 0) ? $name : $name .' ('.$i.')';
+				$NEW_NAME = strtoupper( $new_name );
+				if ( !isset( $names[ $NEW_NAME ]) ) {
+					$name = $new_name;
+					break;
+				}
+			}
+		}
+
+		$this->sheets[$this->curSheet] = ['name' => $name, 'hyperlinks' => []];
 
 		if ( is_array( $rows ) && isset( $rows[0] ) && is_array($rows[0]) ) {
 			$this->sheets[$this->curSheet]['rows'] = $rows;