Merge branch 'master' into atsign

Author: oleibman

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## TBD - 3.0.0
+## 2024-08-07 - 2.2.2
 
 ### Dynamic Arrays
 
@@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - RATE Function Floating Point Number of Periods. [PR #4107](https://github.com/PHPOffice/PhpSpreadsheet/pull/4107)
 - Parameter Name Change Xlsx Writer Workbook. [Issue #4108](https://github.com/PHPOffice/PhpSpreadsheet/issues/4108) [PR #4111](https://github.com/PHPOffice/PhpSpreadsheet/pull/4111)
 - New Algorithm for TRUNC, ROUNDUP, ROUNDDOWN. [Issue #4113](https://github.com/PHPOffice/PhpSpreadsheet/issues/4113) [PR #4115](https://github.com/PHPOffice/PhpSpreadsheet/pull/4115)
+- Worksheet applyStylesFromArray Retain Active Cell (Excel 16 was having a problem with some files). [Issue #4128](https://github.com/PHPOffice/PhpSpreadsheet/issues/4128) [PR #4132](https://github.com/PHPOffice/PhpSpreadsheet/pull/4132)
 
 ## 2024-07-29 - 2.2.1
 

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -3724,7 +3724,9 @@ public function applyStylesFromArray(string $coordinate, array $styleArray): boo
         }
         $activeSheetIndex = $spreadsheet->getActiveSheetIndex();
         $originalSelected = $this->selectedCells;
+        $originalActive = $this->activeCell;
         $this->getStyle($coordinate)->applyFromArray($styleArray);
+        $this->activeCell = $originalActive;
         $this->selectedCells = $originalSelected;
         if ($activeSheetIndex >= 0) {
             $spreadsheet->setActiveSheetIndex($activeSheetIndex);

tests/PhpSpreadsheetTests/Worksheet/Issue4128Test.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class Issue4128Test extends TestCase
+{
+    public function testIssue4128(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame('A1', $sheet->getActiveCell());
+        self::assertSame('A1', $sheet->getSelectedCells());
+        $sheet->setCellValue('D1', 'MyDate');
+        self::assertSame('A1', $sheet->getActiveCell());
+        self::assertSame('A1', $sheet->getSelectedCells());
+        $spreadsheet->disconnectWorksheets();
+    }
+}