From 59e4f949bfc89bb1a4ba665870346bfea5a26d86 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Mon, 15 Sep 2025 13:43:44 +0100
Subject: [PATCH] fix: State casting issues

---
 packages/forms/src/Components/CheckboxList.php     | 2 +-
 packages/forms/src/Components/ModalTableSelect.php | 4 ++--
 packages/forms/src/Components/Radio.php            | 2 +-
 packages/forms/src/Components/Select.php           | 2 +-
 packages/forms/src/Components/TableSelect.php      | 2 +-
 packages/forms/src/Components/ToggleButtons.php    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/forms/src/Components/CheckboxList.php b/packages/forms/src/Components/CheckboxList.php
index 7fdacd3e6c..5dd9494bd5 100644
--- a/packages/forms/src/Components/CheckboxList.php
+++ b/packages/forms/src/Components/CheckboxList.php
@@ -329,7 +329,7 @@ class CheckboxList extends Field implements Contracts\CanDisableOptions, Contrac
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts() || filled($this->getEnum())) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         return [app(StringArrayStateCast::class)];
diff --git a/packages/forms/src/Components/ModalTableSelect.php b/packages/forms/src/Components/ModalTableSelect.php
index 075eaa86f0..d3f42fac67 100644
--- a/packages/forms/src/Components/ModalTableSelect.php
+++ b/packages/forms/src/Components/ModalTableSelect.php
@@ -132,7 +132,7 @@ class ModalTableSelect extends Field
             ->hiddenLabel()
             ->tableConfiguration($this->getTableConfiguration())
             ->relationshipName($this->getRelationshipName())
-            ->multiple()
+            ->multiple($this->isMultiple())
             ->maxItems($this->getMaxItems())
             ->tableArguments($this->getTableArguments());
 
@@ -675,7 +675,7 @@ class ModalTableSelect extends Field
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts()) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         if ($this->isMultiple()) {
diff --git a/packages/forms/src/Components/Radio.php b/packages/forms/src/Components/Radio.php
index 842464e3ed..349a8b46a7 100644
--- a/packages/forms/src/Components/Radio.php
+++ b/packages/forms/src/Components/Radio.php
@@ -65,7 +65,7 @@ class Radio extends Field implements Contracts\CanDisableOptions
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts() || filled($this->getEnum())) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         return [app(StringStateCast::class, ['isNullable' => true])];
diff --git a/packages/forms/src/Components/Select.php b/packages/forms/src/Components/Select.php
index 5d38b5c032..e071b26f13 100644
--- a/packages/forms/src/Components/Select.php
+++ b/packages/forms/src/Components/Select.php
@@ -1408,7 +1408,7 @@ class Select extends Field implements Contracts\CanDisableOptions, Contracts\Has
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts() || filled($this->getEnum())) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         if ($this->isMultiple()) {
diff --git a/packages/forms/src/Components/TableSelect.php b/packages/forms/src/Components/TableSelect.php
index 8531a4261e..d252d75942 100644
--- a/packages/forms/src/Components/TableSelect.php
+++ b/packages/forms/src/Components/TableSelect.php
@@ -313,7 +313,7 @@ class TableSelect extends Field
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts()) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         if ($this->isMultiple()) {
diff --git a/packages/forms/src/Components/ToggleButtons.php b/packages/forms/src/Components/ToggleButtons.php
index 7d01ef92fb..44a0e9b086 100644
--- a/packages/forms/src/Components/ToggleButtons.php
+++ b/packages/forms/src/Components/ToggleButtons.php
@@ -132,7 +132,7 @@ class ToggleButtons extends Field implements Contracts\CanDisableOptions
     public function getDefaultStateCasts(): array
     {
         if ($this->hasCustomStateCasts() || filled($this->getEnum())) {
-            return [];
+            return parent::getDefaultStateCasts();
         }
 
         if ($this->isMultiple()) {