Improve fetching data of repeatable components (#10)

Bynder · Jul 13, 2023 · 926669c · 926669c
1 parent 6d3cea9
commit 926669c
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/DataTypes/Item.php b/src/DataTypes/Item.php
@@ -162,22 +162,24 @@ protected function getSubElements(array $elementData)
             if (empty($element)) {
                 continue;
             }
-            $class = ElementSimpleChoice::class;
-            if (isset($element['file_id'])) {
+            $class = null;
+            if (isset($element['id']) && isset($element['label'])) {
+                $class = ElementSimpleChoice::class;
+            } elseif (isset($element['file_id'])) {
                 $class = ElementSimpleFile::class;
-            }
-            if (!is_array($element)) {
+            } elseif (!is_array($element)) {
                 $class = ElementSimpleText::class;
                 $element = ['value' => $element];
-            }
-            if (is_array($element) && (isset($element[0]))) {
+            } elseif (is_array($element)) {
                 // This is an asset element that allows several files,
                 // or a mutlichoice element.
                 $elements[$key] = $this->getSubElements($element);
                 continue;
             }
             /** @var \GatherContent\DataTypes\ElementBase[] $elements */
-            $elements[$key] = new $class($element);
+            if ($class) {
+                $elements[$key] = new $class($element);
+            }
         }
 
         return $elements;