Allow color palette index values in number format masks

PHPOffice · Apr 5, 2023 · 04afee1 · 04afee1
1 parent 5da2f6e
commit 04afee1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php b/src/PhpSpreadsheet/Style/NumberFormat/Formatter.php
@@ -67,7 +67,8 @@ private static function splitFormatForSectionSelection(array $sections, $value):
         //   3 sections:  [POSITIVE/TEXT] [NEGATIVE] [ZERO]
         //   4 sections:  [POSITIVE] [NEGATIVE] [ZERO] [TEXT]
         $sectionCount = count($sections);
-        $color_regex = '/\\[(' . implode('|', Color::NAMED_COLORS) . ')\\]/mui';
+        // Colour could be a named colour, or a numeric entry in the colour-index palette
+        $color_regex = '/\\[(' . implode('|', Color::NAMED_COLORS) . '|color \\d+)\\]/mui';
         $cond_regex = '/\\[(>|>=|<|<=|=|<>)([+-]?\\d+([.]\\d+)?)\\]/';
         $colors = ['', '', '', '', ''];
         $conditionOperations = ['', '', '', '', ''];

diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php
@@ -448,6 +448,17 @@
         -2,
         '[Green]"Positive";[Red]"Negative";[Blue]"Zero"',
     ],
+    // Colour palette index
+    [
+        '+710',
+        710,
+        '[color 10]+#,##0;[color 12]-#,##0',
+    ],
+    [
+        '-710',
+        -710,
+        '[color 10]+#,##0;[color 12]-#,##0',
+    ],
     // Value break points
     [
         '<=3500 red',