From 89d9f54643adfec8af428848aed202fc5d2c78bc Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 07:56:23 -0500
Subject: [PATCH 01/14] add image/icon support for FormBuilder::select

---
 src/Html/FormBuilder.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index af5acdb0..9a0d4dc9 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -408,7 +408,7 @@ protected function setQuickTextAreaSize(array $options): array
     /**
      * Create a select box field with empty option support.
      */
-    public function select(string $name, array $list = [], string|array|null $selected = null, array $options = []): string
+    public function select(string $name, array $list = [], string|array|null $selected = null, array $options = [], bool $legacyOptGroup = true): string
     {
         if (array_key_exists('emptyOption', $options)) {
             $list = ['' => $options['emptyOption']] + $list;
@@ -431,7 +431,7 @@ public function select(string $name, array $list = [], string|array|null $select
         $html = [];
 
         foreach ($list as $value => $display) {
-            $html[] = $this->getSelectOption($display, $value, $selected);
+            $html[] = $this->getSelectOption($display, $value, $selected, $legacyOptGroup);
         }
 
         // Once we have all of this HTML, we can join this into a single element after
@@ -482,10 +482,14 @@ public function selectMonth(string $name, string|array|null $selected = null, ar
     /**
      * Get the select option for the given value.
      */
-    public function getSelectOption(string|array $display, string $value, string|array|null $selected = null): string
+    public function getSelectOption(string|array $display, string $value, string|array|null $selected = null, bool $legacyOptGroup = true): string
     {
         if (is_array($display)) {
-            return $this->optionGroup($display, $value, $selected);
+            if ($legacyOptGroup) {
+                return $this->optionGroup($display, $value, $selected);
+            } elseif ($items = array_get($display, 'items')) {
+                return $this->optionGroup($items, $value, $selected);
+            }
         }
 
         return $this->option($display, $value, $selected);
@@ -508,7 +512,7 @@ protected function optionGroup(array $list, string $label, string|array|null $se
     /**
      * Create a select element option.
      */
-    protected function option(string $display, string $value, string|array|null $selected = null): string
+    protected function option(string|array $display, string $value, string|array|null $selected = null): string
     {
         $selectedAttr = $this->getSelectedValue($value, $selected);
 
@@ -517,6 +521,15 @@ protected function option(string $display, string $value, string|array|null $sel
             'selected' => $selectedAttr
         ];
 
+        if (is_array($display)) {
+            $data = array_get($display, 1);
+            $display = array_get($display, 0);
+            if (strpos($data, '.')) {
+                $options['data-image'] = $data;
+            } else {
+                $options['data-icon'] = $data;
+            }
+        }
         return '<option' . $this->html->attributes($options) . '>' . e($display) . '</option>';
     }
 

From a49a2df65213e466a6def3842b3c5c2072b9a241 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 08:28:18 -0500
Subject: [PATCH 02/14] add default icon if missing

---
 src/Html/FormBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 9a0d4dc9..1aac84ad 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -522,7 +522,7 @@ protected function option(string|array $display, string $value, string|array|nul
         ];
 
         if (is_array($display)) {
-            $data = array_get($display, 1);
+            $data = array_get($display, 1, 'icon-snowflake');
             $display = array_get($display, 0);
             if (strpos($data, '.')) {
                 $options['data-image'] = $data;

From dcebe5b82470cf17dbb0d10b89c11b12fdd869c9 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 09:29:45 -0500
Subject: [PATCH 03/14] use smarter way to detect optGroup vs image/icon
 formats

---
 src/Html/FormBuilder.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 1aac84ad..4f142b2d 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -408,7 +408,7 @@ protected function setQuickTextAreaSize(array $options): array
     /**
      * Create a select box field with empty option support.
      */
-    public function select(string $name, array $list = [], string|array|null $selected = null, array $options = [], bool $legacyOptGroup = true): string
+    public function select(string $name, array $list = [], string|array|null $selected = null, array $options = []): string
     {
         if (array_key_exists('emptyOption', $options)) {
             $list = ['' => $options['emptyOption']] + $list;
@@ -431,7 +431,7 @@ public function select(string $name, array $list = [], string|array|null $select
         $html = [];
 
         foreach ($list as $value => $display) {
-            $html[] = $this->getSelectOption($display, $value, $selected, $legacyOptGroup);
+            $html[] = $this->getSelectOption($display, $value, $selected);
         }
 
         // Once we have all of this HTML, we can join this into a single element after
@@ -482,13 +482,12 @@ public function selectMonth(string $name, string|array|null $selected = null, ar
     /**
      * Get the select option for the given value.
      */
-    public function getSelectOption(string|array $display, string $value, string|array|null $selected = null, bool $legacyOptGroup = true): string
+    public function getSelectOption(string|array $display, string $value, string|array|null $selected = null): string
     {
         if (is_array($display)) {
-            if ($legacyOptGroup) {
+            $keys = array_keys($display);
+            if (count($keys) && gettype($keys[0]) === 'string') {
                 return $this->optionGroup($display, $value, $selected);
-            } elseif ($items = array_get($display, 'items')) {
-                return $this->optionGroup($items, $value, $selected);
             }
         }
 
@@ -522,7 +521,7 @@ protected function option(string|array $display, string $value, string|array|nul
         ];
 
         if (is_array($display)) {
-            $data = array_get($display, 1, 'icon-snowflake');
+            $data = array_get($display, 1, '');
             $display = array_get($display, 0);
             if (strpos($data, '.')) {
                 $options['data-image'] = $data;

From 32e0b1a47c48aef37a5d803c64e1618d34ab3ee7 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 09:32:44 -0500
Subject: [PATCH 04/14] apply coderabbit suggestion

---
 src/Html/FormBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 4f142b2d..3e632215 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -523,7 +523,7 @@ protected function option(string|array $display, string $value, string|array|nul
         if (is_array($display)) {
             $data = array_get($display, 1, '');
             $display = array_get($display, 0);
-            if (strpos($data, '.')) {
+            if (strpos($data, '.') !== false) {
                 $options['data-image'] = $data;
             } else {
                 $options['data-icon'] = $data;

From d3bd9f8cc9d0553e95b73a5235e8d0792c926854 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 09:46:34 -0500
Subject: [PATCH 05/14] use is_string() to improve readability

---
 src/Html/FormBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 3e632215..7ca5b748 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -486,7 +486,7 @@ public function getSelectOption(string|array $display, string $value, string|arr
     {
         if (is_array($display)) {
             $keys = array_keys($display);
-            if (count($keys) && gettype($keys[0]) === 'string') {
+            if (count($keys) && is_string($keys[0])) {
                 return $this->optionGroup($display, $value, $selected);
             }
         }

From 922c0b49a3fda89d6304e992242734e2bf6d896b Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 6 Dec 2025 09:20:18 -0600
Subject: [PATCH 06/14] Add tests for new select option formats

---
 src/Html/FormBuilder.php       |  34 +++++++
 tests/Html/FormBuilderTest.php | 166 +++++++++++++++++++++++++++++++++
 2 files changed, 200 insertions(+)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 3b8defc4..4b3ba8b5 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -407,6 +407,21 @@ protected function setQuickTextAreaSize(array $options): array
 
     /**
      * Create a select box field with empty option support.
+     *
+     * Supports several formats for the $list parameter:
+     * - Simple format: ['value' => 'Label']
+     * - With icon/image: ['value' => ['Label', 'icon-name']] or ['value' => ['Label', 'image.png']]
+     * - With optgroups: ['Group Name' => ['value' => 'Label', ...]]
+     * - Mixed format combining all of the above
+     *
+     * Icons are detected when the second array element doesn't contain a dot (.).
+     * Images are detected when the second array element contains a dot (.).
+     *
+     * @param string $name The name attribute for the select element
+     * @param array $list The options list (see above for supported formats)
+     * @param string|array|null $selected The selected value(s)
+     * @param array $options Additional HTML attributes for the select element
+     * @return string The generated HTML select element
      */
     public function select(string $name, array $list = [], string|array|null $selected = null, array $options = []): string
     {
@@ -482,6 +497,16 @@ public function selectMonth(string $name, string|array|null $selected = null, ar
 
     /**
      * Get the select option for the given value.
+     *
+     * Determines whether to create a single option or an optgroup based on the $display parameter:
+     * - If $display is an array with string keys, creates an optgroup
+     * - If $display is an array with numeric keys (e.g., ['Label', 'icon']), creates a single option with icon/image
+     * - If $display is a string, creates a simple option
+     *
+     * @param string|array $display The display value or array for optgroup/icon/image
+     * @param string $value The option value attribute
+     * @param string|array|null $selected The selected value(s)
+     * @return string The generated HTML option or optgroup element
      */
     public function getSelectOption(string|array $display, string $value, string|array|null $selected = null): string
     {
@@ -511,6 +536,15 @@ protected function optionGroup(array $list, string $label, string|array|null $se
 
     /**
      * Create a select element option.
+     *
+     * If $display is an array in the format ['Label', 'icon-or-image'], adds data attributes:
+     * - data-icon: added if the second element doesn't contain a dot (e.g., 'icon-refresh')
+     * - data-image: added if the second element contains a dot (e.g., 'image.png')
+     *
+     * @param string|array $display The display label or array with label and icon/image
+     * @param string $value The option value attribute
+     * @param string|array|null $selected The selected value(s)
+     * @return string The generated HTML option element
      */
     protected function option(string|array $display, string $value, string|array|null $selected = null): string
     {
diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index d5bcd740..b7a1dd95 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -340,4 +340,170 @@ public function testSelectWithEmptyOption()
         $this->assertStringContainsString('<option value="1">Option 1</option>', $result);
         $this->assertStringContainsString('<option value="2">Option 2</option>', $result);
     }
+
+    /**
+     * @testdox can create a select element with icon data attributes.
+     */
+    public function testSelectWithIcon()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                '1' => 'Regular Option',
+                '2' => ['Option With Icon', 'icon-refresh'],
+            ],
+            selected: null,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+        $this->assertStringContainsString('<option value="1">Regular Option</option>', $result);
+        $this->assertStringContainsString('<option value="2" data-icon="icon-refresh">Option With Icon</option>', $result);
+    }
+
+    /**
+     * @testdox can create a select element with image data attributes.
+     */
+    public function testSelectWithImage()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                '1' => 'Regular Option',
+                '2' => ['Option With Image', 'myImage.jpeg'],
+            ],
+            selected: null,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+        $this->assertStringContainsString('<option value="1">Regular Option</option>', $result);
+        $this->assertStringContainsString('<option value="2" data-image="myImage.jpeg">Option With Image</option>', $result);
+    }
+
+    /**
+     * @testdox can create a select element with optgroups.
+     */
+    public function testSelectWithOptgroups()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                'Group 1' => [
+                    'g1-opt1' => 'Group 1 Option 1',
+                    'g1-opt2' => 'Group 1 Option 2',
+                ],
+                'Group 2' => [
+                    'g2-opt1' => 'Group 2 Option 1',
+                    'g2-opt2' => 'Group 2 Option 2',
+                ],
+            ],
+            selected: null,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+        $this->assertStringContainsString('<optgroup label="Group 1">', $result);
+        $this->assertStringContainsString('<optgroup label="Group 2">', $result);
+        $this->assertStringContainsString('<option value="g1-opt1">Group 1 Option 1</option>', $result);
+        $this->assertStringContainsString('<option value="g1-opt2">Group 1 Option 2</option>', $result);
+        $this->assertStringContainsString('<option value="g2-opt1">Group 2 Option 1</option>', $result);
+        $this->assertStringContainsString('<option value="g2-opt2">Group 2 Option 2</option>', $result);
+        $this->assertStringContainsString('</optgroup>', $result);
+    }
+
+    /**
+     * @testdox can create a select element with optgroups containing icons and images.
+     */
+    public function testSelectWithOptgroupsAndIconsImages()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                'option1' => 'Regular option',
+                'option2' => ['Option With Image', 'myImage.jpeg'],
+                'Group1' => [
+                    'group1-opt1' => 'OptGroup Option1 regular option',
+                    'group1-opt2' => ['OptGroup Option2 with icon', 'icon-refresh'],
+                    'group1-opt3' => ['OptGroup Option3 with image', 'otherImage.png'],
+                ],
+                'Group2' => [
+                    'group2-opt1' => 'OptGroup2 Option1',
+                    'group2-opt2' => 'OptGroup2 Option2',
+                ],
+            ],
+            selected: null,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+
+        // Regular options
+        $this->assertStringContainsString('<option value="option1">Regular option</option>', $result);
+        $this->assertStringContainsString('<option value="option2" data-image="myImage.jpeg">Option With Image</option>', $result);
+
+        // Optgroups
+        $this->assertStringContainsString('<optgroup label="Group1">', $result);
+        $this->assertStringContainsString('<optgroup label="Group2">', $result);
+
+        // Options inside optgroups
+        $this->assertStringContainsString('<option value="group1-opt1">OptGroup Option1 regular option</option>', $result);
+        $this->assertStringContainsString('<option value="group1-opt2" data-icon="icon-refresh">OptGroup Option2 with icon</option>', $result);
+        $this->assertStringContainsString('<option value="group1-opt3" data-image="otherImage.png">OptGroup Option3 with image</option>', $result);
+        $this->assertStringContainsString('<option value="group2-opt1">OptGroup2 Option1</option>', $result);
+        $this->assertStringContainsString('<option value="group2-opt2">OptGroup2 Option2</option>', $result);
+    }
+
+    /**
+     * @testdox can create a select element with backward compatibility for simple string options.
+     */
+    public function testSelectBackwardCompatibility()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                '1' => 'Option 1',
+                '2' => 'Option 2',
+                '3' => 'Option 3',
+            ],
+            selected: '2',
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+        $this->assertStringContainsString('<option value="1">Option 1</option>', $result);
+        $this->assertStringContainsString('<option value="2" selected="selected">Option 2</option>', $result);
+        $this->assertStringContainsString('<option value="3">Option 3</option>', $result);
+        $this->assertStringNotContainsString('data-icon', $result);
+        $this->assertStringNotContainsString('data-image', $result);
+    }
+
+    /**
+     * @testdox properly escapes HTML in option labels and values.
+     */
+    public function testSelectHtmlEscaping()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                '<script>' => 'Normal Label',
+                'safe-value' => ['<b>Bold Label</b>', 'icon-test'],
+            ],
+            selected: null,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        // The value attribute is escaped by the HtmlBuilder, resulting in double encoding
+        $this->assertStringContainsString('value="&amp;lt;script&amp;gt;"', $result);
+        $this->assertStringContainsString('&lt;b&gt;Bold Label&lt;/b&gt;', $result);
+        // Ensure dangerous tags are not rendered as raw HTML
+        $this->assertStringNotContainsString('value="<script>"', $result);
+        $this->assertStringNotContainsString('<b>Bold Label</b>', $result);
+    }
 }

From 3cb9129c132e7224633100d0600e66869a11c950 Mon Sep 17 00:00:00 2001
From: Luke Towers <git@luketowers.ca>
Date: Sat, 6 Dec 2025 09:26:08 -0600
Subject: [PATCH 07/14] Remove unnecessary docblocks

---
 src/Html/FormBuilder.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 4b3ba8b5..dda0f0af 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -416,12 +416,6 @@ protected function setQuickTextAreaSize(array $options): array
      *
      * Icons are detected when the second array element doesn't contain a dot (.).
      * Images are detected when the second array element contains a dot (.).
-     *
-     * @param string $name The name attribute for the select element
-     * @param array $list The options list (see above for supported formats)
-     * @param string|array|null $selected The selected value(s)
-     * @param array $options Additional HTML attributes for the select element
-     * @return string The generated HTML select element
      */
     public function select(string $name, array $list = [], string|array|null $selected = null, array $options = []): string
     {
@@ -502,11 +496,6 @@ public function selectMonth(string $name, string|array|null $selected = null, ar
      * - If $display is an array with string keys, creates an optgroup
      * - If $display is an array with numeric keys (e.g., ['Label', 'icon']), creates a single option with icon/image
      * - If $display is a string, creates a simple option
-     *
-     * @param string|array $display The display value or array for optgroup/icon/image
-     * @param string $value The option value attribute
-     * @param string|array|null $selected The selected value(s)
-     * @return string The generated HTML option or optgroup element
      */
     public function getSelectOption(string|array $display, string $value, string|array|null $selected = null): string
     {
@@ -540,11 +529,6 @@ protected function optionGroup(array $list, string $label, string|array|null $se
      * If $display is an array in the format ['Label', 'icon-or-image'], adds data attributes:
      * - data-icon: added if the second element doesn't contain a dot (e.g., 'icon-refresh')
      * - data-image: added if the second element contains a dot (e.g., 'image.png')
-     *
-     * @param string|array $display The display label or array with label and icon/image
-     * @param string $value The option value attribute
-     * @param string|array|null $selected The selected value(s)
-     * @return string The generated HTML option element
      */
     protected function option(string|array $display, string $value, string|array|null $selected = null): string
     {

From 118c8bfe7337555adcc77cce68e37b17d19d2a01 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:15:08 -0500
Subject: [PATCH 08/14] change to account for optgroup items using integer keys

---
 src/Html/FormBuilder.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index dda0f0af..a4b02b8c 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -499,11 +499,8 @@ public function selectMonth(string $name, string|array|null $selected = null, ar
      */
     public function getSelectOption(string|array $display, string $value, string|array|null $selected = null): string
     {
-        if (is_array($display)) {
-            $keys = array_keys($display);
-            if (count($keys) && is_string($keys[0])) {
-                return $this->optionGroup($display, $value, $selected);
-            }
+        if (is_array($display) && array_keys($display) !== [0,1]) {
+            return $this->optionGroup($display, $value, $selected);
         }
 
         return $this->option($display, $value, $selected);

From 76a0b31dc34fd50cdd8f70795dd603818a1666e6 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:15:25 -0500
Subject: [PATCH 09/14] add more unit tests for edge cases

---
 tests/Html/FormBuilderTest.php | 64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index b7a1dd95..18638a3f 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -483,6 +483,70 @@ public function testSelectBackwardCompatibility()
         $this->assertStringNotContainsString('data-image', $result);
     }
 
+    /**
+     * @testdox can create a select element with backward compatibility for optgroup integer keys
+     */
+    public function testSelectBackwardCompatibilityOptgroupIdItemsKeys()
+    {
+        // this simulates grouped options base on a model with ids as keys
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                'Group1' => [
+                    1 => 'Option 1',
+                    2 => 'Option 2',
+                ],
+                'Group2' => [
+                    3 => 'Option 3',
+                    4 => 'Option 4',
+                ],
+            ],
+            selected: 2,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+
+        // Optgroups
+        $this->assertStringContainsString('<optgroup label="Group1">', $result);
+        $this->assertStringContainsString('<optgroup label="Group2">', $result);
+
+        // Options inside optgroups
+        $this->assertStringContainsString('<option value="1">Option 1</option>', $result);
+        $this->assertStringContainsString('<option value="2" selected="selected">Option 2</option>', $result);
+        $this->assertStringContainsString('<option value="3">Option 3</option>', $result);
+        $this->assertStringContainsString('<option value="4">Option 4</option>', $result);
+        $this->assertStringNotContainsString('data-icon', $result);
+        $this->assertStringNotContainsString('data-image', $result);
+    }
+
+    /**
+     * @testdox show case where backward compatibility is broken (expected)
+     */
+    public function testSelectBackwardCompatibilityBrokenOptGroup()
+    {
+        // optgroup syntax with two items with integer keys starting at zero are seen as a regular option with an icon
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                'Group1' => [
+                    0 => 'Option 1',
+                    1 => 'Option 2',
+                ],
+            ],
+            selected: 1,
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+
+        // Options inside optgroups
+        $this->assertStringContainsString('<option value="Group1" data-icon="Option 2">Option 1</option>', $result);
+        $this->assertStringContainsString('data-icon', $result);
+    }
+
     /**
      * @testdox properly escapes HTML in option labels and values.
      */

From afd40a059f3761e890f1183c76022035cd48cdae Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:23:15 -0500
Subject: [PATCH 10/14] remove selected attribute

---
 tests/Html/FormBuilderTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index 18638a3f..ee04ae22 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -535,7 +535,6 @@ public function testSelectBackwardCompatibilityBrokenOptGroup()
                     1 => 'Option 2',
                 ],
             ],
-            selected: 1,
             options: []
         );
 

From 1939c6db267d429c04e1228b057b7af7fb296230 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:31:14 -0500
Subject: [PATCH 11/14] add test case where an item with data-image is selected

---
 tests/Html/FormBuilderTest.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index ee04ae22..135c78c1 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -383,6 +383,27 @@ public function testSelectWithImage()
         $this->assertStringContainsString('<option value="2" data-image="myImage.jpeg">Option With Image</option>', $result);
     }
 
+    /**
+     * @testdox can create a select element with image data attributes.
+     */
+    public function testSelectWithSelectedImage()
+    {
+        $result = $this->formBuilder->select(
+            name: 'my-select',
+            list: [
+                '1' => 'Regular Option',
+                '2' => ['Option With Image', 'myImage.jpeg'],
+            ],
+            selected: '2',
+            options: []
+        );
+
+        $this->assertElementIs('select', $result);
+        $this->assertElementAttributeEquals('name', 'my-select', $result);
+        $this->assertStringContainsString('<option value="1">Regular Option</option>', $result);
+        $this->assertStringContainsString('<option value="2" selected="selected" data-image="myImage.jpeg">Option With Image</option>', $result);
+    }
+
     /**
      * @testdox can create a select element with optgroups.
      */

From bece123184a1030c99b5e3b46b1915d704ee3d03 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:41:27 -0500
Subject: [PATCH 12/14] remove double-encoding

---
 src/Html/FormBuilder.php       | 2 +-
 tests/Html/FormBuilderTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index a4b02b8c..4efd73e2 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -532,7 +532,7 @@ protected function option(string|array $display, string $value, string|array|nul
         $selectedAttr = $this->getSelectedValue($value, $selected);
 
         $options = [
-            'value' => e($value),
+            'value' => $value,
             'selected' => $selectedAttr
         ];
 
diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index 135c78c1..05b36846 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -584,7 +584,7 @@ public function testSelectHtmlEscaping()
 
         $this->assertElementIs('select', $result);
         // The value attribute is escaped by the HtmlBuilder, resulting in double encoding
-        $this->assertStringContainsString('value="&amp;lt;script&amp;gt;"', $result);
+        $this->assertStringContainsString('value="&lt;script&gt;"', $result);
         $this->assertStringContainsString('&lt;b&gt;Bold Label&lt;/b&gt;', $result);
         // Ensure dangerous tags are not rendered as raw HTML
         $this->assertStringNotContainsString('value="<script>"', $result);

From d0ccfa65bcadfbb985f795592ef3454bed65a7c7 Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 13:47:42 -0500
Subject: [PATCH 13/14] remove old comment about double-encoding

---
 tests/Html/FormBuilderTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Html/FormBuilderTest.php b/tests/Html/FormBuilderTest.php
index 05b36846..dc601fa1 100644
--- a/tests/Html/FormBuilderTest.php
+++ b/tests/Html/FormBuilderTest.php
@@ -583,9 +583,10 @@ public function testSelectHtmlEscaping()
         );
 
         $this->assertElementIs('select', $result);
-        // The value attribute is escaped by the HtmlBuilder, resulting in double encoding
+
         $this->assertStringContainsString('value="&lt;script&gt;"', $result);
         $this->assertStringContainsString('&lt;b&gt;Bold Label&lt;/b&gt;', $result);
+
         // Ensure dangerous tags are not rendered as raw HTML
         $this->assertStringNotContainsString('value="<script>"', $result);
         $this->assertStringNotContainsString('<b>Bold Label</b>', $result);

From f3b8e4db6a69fbf9da8412efbe3c15eccf4910cc Mon Sep 17 00:00:00 2001
From: Marc Jauvin <marc.jauvin@gmail.com>
Date: Sat, 6 Dec 2025 14:06:11 -0500
Subject: [PATCH 14/14] apply coderabbit suggestions

---
 src/Html/FormBuilder.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Html/FormBuilder.php b/src/Html/FormBuilder.php
index 4efd73e2..b0406cb4 100644
--- a/src/Html/FormBuilder.php
+++ b/src/Html/FormBuilder.php
@@ -537,13 +537,17 @@ protected function option(string|array $display, string $value, string|array|nul
         ];
 
         if (is_array($display)) {
-            $data = array_get($display, 1, '');
-            $display = array_get($display, 0);
-            if (strpos($data, '.') !== false) {
-                $options['data-image'] = $data;
-            } else {
-                $options['data-icon'] = $data;
+            $label = array_get($display, 0);
+            $data = array_get($display, 1);
+
+            if (is_string($data) && $data !== '') {
+                if (strpos($data, '.') !== false) {
+                    $options['data-image'] = $data;
+                } else {
+                    $options['data-icon'] = $data;
+                }
             }
+            $display = $label;
         }
         return '<option' . $this->html->attributes($options) . '>' . e($display) . '</option>';
     }