fix infer for cascadefrom

atk4 · Feb 12, 2024 · 7ab439e · 7ab439e
1 parent 7cef7c3
commit 7ab439e
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Form/AbstractLayout.php b/src/Form/AbstractLayout.php
@@ -49,9 +49,20 @@ public function addControl(string $name, $control = [], array $fieldSeed = []):
         if (is_a($controlClass, Control\Checkbox::class, true)) {
             $fieldSeed['type'] = 'boolean';
         } elseif (is_a($controlClass, Control\Dropdown::class, true) || is_a($controlClass, Control\Lookup::class, true)) {
-            $dropdownModel = $control instanceof Control ? $control->model : ($control['model'] ?? null);
-            if ($dropdownModel !== null) {
-                $fieldSeed['type'] = $dropdownModel->getField($dropdownModel->idField)->type;
+            if (is_a($controlClass, Control\DropdownCascade::class, true)) {
+                $cascadeFromControl = $control instanceof Control ? $control->cascadeFrom : ($control['cascadeFrom'] ?? null);
+                if ($cascadeFromControl !== null) {
+                    if (!$cascadeFromControl instanceof Control) {
+                        $cascadeFromControl = $this->form->getControl($cascadeFromControl);
+                    }
+
+                    $fieldSeed['type'] = $cascadeFromControl->entityField->getField()->type;
+                }
+            } else {
+                $dropdownModel = $control instanceof Control ? $control->model : ($control['model'] ?? null);
+                if ($dropdownModel !== null) {
+                    $fieldSeed['type'] = $dropdownModel->getField($dropdownModel->idField)->type;
+                }
             }
         } elseif (is_a($controlClass, Control\Calendar::class, true)) {
             $calendarType = $control instanceof Control\Calendar ? $control->type : ($control['type'] ?? null);