From 478af1ed7214e32b74f058c96fe90d8325676f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gu=CC=88nther=20Debrauwer?= <gunther@nextapps.be>
Date: Thu, 25 Jan 2024 13:50:33 +0100
Subject: [PATCH] Ensure isSelected works if item value is false or 0

---
 packages/ui/src/combobox.js                   |   2 +-
 packages/ui/src/listbox.js                    |   2 +-
 .../integration/plugins/ui/combobox.spec.js   | 141 ++++++++++++++++++
 .../integration/plugins/ui/listbox.spec.js    | 134 +++++++++++++++++
 4 files changed, 277 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/combobox.js b/packages/ui/src/combobox.js
index 708ac1a4a..636bd448e 100644
--- a/packages/ui/src/combobox.js
+++ b/packages/ui/src/combobox.js
@@ -222,7 +222,7 @@ function handleRoot(el, Alpine) {
                     let item = this.__context.getItemByEl(el)
 
                     if (! item) return false
-                    if (! item.value) return false
+                    if (item.value === null || item.value === undefined) return false
 
                     return this.__hasSelected(item.value)
                 },
diff --git a/packages/ui/src/listbox.js b/packages/ui/src/listbox.js
index 97e0eb048..82f6ae0d1 100644
--- a/packages/ui/src/listbox.js
+++ b/packages/ui/src/listbox.js
@@ -199,7 +199,7 @@ function handleRoot(el, Alpine) {
                     let item = this.__context.getItemByEl(el)
 
                     if (! item) return false
-                    if (! item.value) return false
+                    if (item.value === null || item.value === undefined) return false
 
                     return this.__hasSelected(item.value)
                 },
diff --git a/tests/cypress/integration/plugins/ui/combobox.spec.js b/tests/cypress/integration/plugins/ui/combobox.spec.js
index 17a08a485..aa8137397 100644
--- a/tests/cypress/integration/plugins/ui/combobox.spec.js
+++ b/tests/cypress/integration/plugins/ui/combobox.spec.js
@@ -1666,3 +1666,144 @@ test('works with morph',
         get('button').should(haveText('Select Framework (updated)'))
     },
 )
+
+test('boolean option values',
+    [html`
+    <div x-data="{ value: null }">
+        <div x-combobox x-model="value">
+            <input x-combobox:input />
+            <button x-combobox:button>Select boolean</button>
+
+            <ul x-combobox:options>
+                <li
+                    option="boolean-true"
+                    x-combobox:option
+                    :value="true"
+                    :class="{
+                        'selected': $comboboxOption.isSelected,
+                        'active': $comboboxOption.isActive,
+                    }">
+                    <span>Yes</span>
+                </li>
+                <li
+                    option="boolean-false"
+                    x-combobox:option
+                    :value="false"
+                    :class="{
+                        'selected': $comboboxOption.isSelected,
+                        'active': $comboboxOption.isActive,
+                    }">
+                    <span>No</span>
+                </li>
+            </ul>
+        </div>
+
+        Selected: <p x-text="value?.toString()"></p>
+    </div>
+    `],
+    ({ get }) => {
+        get('ul').should(notBeVisible())
+        get('p').should(haveText(''))
+        get('button')
+            .should(haveText('Select boolean'))
+            .click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-true"]').click()
+        get('ul').should(notBeVisible())
+        get('p').should(haveText('true'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(haveClasses(['selected']))
+        get('[option="boolean-false"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').click()
+        get('ul').should(notBeVisible())
+        get('p').should(haveText('false'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').should(haveClasses(['selected']))
+    },
+)
+
+test('integer option values',
+    [html`
+    <div x-data="{ value: null }">
+        <div x-combobox x-model="value">
+            <input x-combobox:input />
+            <button x-combobox:button>Select number</button>
+
+            <ul x-combobox:options>
+                <li
+                    option="0"
+                    x-combobox:option
+                    :value="0"
+                    :class="{
+                        'selected': $comboboxOption.isSelected,
+                        'active': $comboboxOption.isActive,
+                    }">
+                    <span>0</span>
+                </li>
+                <li
+                    option="1"
+                    x-combobox:option
+                    :value="1"
+                    :class="{
+                        'selected': $comboboxOption.isSelected,
+                        'active': $comboboxOption.isActive,
+                    }">
+                    <span>1</span>
+                </li>
+                <li
+                    option="2"
+                    x-combobox:option
+                    :value="2"
+                    :class="{
+                        'selected': $comboboxOption.isSelected,
+                        'active': $comboboxOption.isActive,
+                    }">
+                    <span>2</span>
+                </li>
+            </ul>
+        </div>
+
+        Selected: <p x-text="value?.toString()"></p>
+    </div>
+    `],
+    ({ get }) => {
+        get('ul').should(notBeVisible())
+        get('p').should(haveText(''))
+        get('button')
+            .should(haveText('Select number'))
+            .click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').click()
+        get('ul').should(notBeVisible())
+        get('p').should(haveText('1'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(haveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="0"]').click()
+        get('ul').should(notBeVisible())
+        get('p').should(haveText('0'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(haveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').click()
+        get('ul').should(notBeVisible())
+        get('p').should(haveText('2'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(haveClasses(['selected']))
+    },
+)
diff --git a/tests/cypress/integration/plugins/ui/listbox.spec.js b/tests/cypress/integration/plugins/ui/listbox.spec.js
index d9f8de452..6c2298918 100644
--- a/tests/cypress/integration/plugins/ui/listbox.spec.js
+++ b/tests/cypress/integration/plugins/ui/listbox.spec.js
@@ -957,4 +957,138 @@ test('works with morph',
     },
 )
 
+
+test('boolean option values',
+    [html`
+    <div x-data="{ value: null }" x-listbox x-model="value">
+        <label x-listbox:label>Value</label>
+
+        <button x-listbox:button x-text="value !== null ? value.toString() : 'Select boolean'"></button>
+
+        <ul x-listbox:options options>
+            <li
+                option="boolean-true"
+                x-listbox:option
+                :value="true"
+                :class="{
+                    'selected': $listboxOption.isSelected,
+                    'active': $listboxOption.isActive,
+                }">
+                <span>Yes</span>
+            </li>
+            <li
+                option="boolean-false"
+                x-listbox:option
+                :value="false"
+                :class="{
+                    'selected': $listboxOption.isSelected,
+                    'active': $listboxOption.isActive,
+                }">
+                <span>No</span>
+            </li>
+        </ul>
+    </div>
+    `],
+    ({ get }) => {
+        get('ul').should(notBeVisible())
+        get('button')
+            .should(haveText('Select boolean'))
+            .click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-true"]').click()
+        get('ul').should(notBeVisible())
+        get('button').should(haveText('true'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(haveClasses(['selected']))
+        get('[option="boolean-false"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').click()
+        get('ul').should(notBeVisible())
+        get('button').should(haveText('false'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="boolean-true"]').should(notHaveClasses(['selected']))
+        get('[option="boolean-false"]').should(haveClasses(['selected']))
+    },
+)
+
+test('integer option values',
+    [html`
+    <div x-data="{ value: null }" x-listbox x-model="value">
+        <label x-listbox:label>Value</label>
+
+        <button x-listbox:button x-text="value !== null ? value.toString() : 'Select number'"></button>
+
+        <ul x-listbox:options options>
+            <li
+                option="0"
+                x-listbox:option
+                :value="0"
+                :class="{
+                    'selected': $listboxOption.isSelected,
+                    'active': $listboxOption.isActive,
+                }">
+                <span>0</span>
+            </li>
+            <li
+                option="1"
+                x-listbox:option
+                :value="1"
+                :class="{
+                    'selected': $listboxOption.isSelected,
+                    'active': $listboxOption.isActive,
+                }">
+                <span>1</span>
+            </li>
+            <li
+                option="2"
+                x-listbox:option
+                :value="2"
+                :class="{
+                    'selected': $listboxOption.isSelected,
+                    'active': $listboxOption.isActive,
+                }">
+                <span>2</span>
+            </li>
+        </ul>
+    </div>
+    `],
+    ({ get }) => {
+        get('ul').should(notBeVisible())
+        get('button')
+            .should(haveText('Select number'))
+            .click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').click()
+        get('ul').should(notBeVisible())
+        get('button').should(haveText('1'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(haveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="0"]').click()
+        get('ul').should(notBeVisible())
+        get('button').should(haveText('0'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(haveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').click()
+        get('ul').should(notBeVisible())
+        get('button').should(haveText('2'))
+        get('button').click()
+        get('ul').should(beVisible())
+        get('[option="0"]').should(notHaveClasses(['selected']))
+        get('[option="1"]').should(notHaveClasses(['selected']))
+        get('[option="2"]').should(haveClasses(['selected']))
+    },
+)
+
 // test "by" attribute