Merge pull request #52 from kgirzadas/fix/fields-order

fix: preserve fields order when flattening in FieldParser

Author: tdwesten

src/Helpers/FieldParser.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Support\Collection;
 use Tdwesten\StatamicBuilder\Fieldset;
-use Tdwesten\StatamicBuilder\FieldTypes\Field;
 
 class FieldParser
 {
@@ -15,15 +14,15 @@ public static function parseMixedFieldsToFlatCollection($items): Collection
     {
         $items = collect($items);
 
-        $fieldsets = $items->filter(function ($field) {
-            return $field instanceof Fieldset;
-        })->flatten();
+        $items
+            ->map(function ($item) {
+                if ($item instanceof Fieldset) {
+                    return $item;
+                }
 
-        $fields = $items->filter(function ($field) {
-            return $field instanceof Field;
-        });
-
-        $items = collect($fieldsets)->merge($fields);
+                return [$item];
+            })
+            ->flatten();
 
         return $items;
     }

tests/Unit/FieldParserTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tdwesten\StatamicBuilder\FieldTypes\Text;
+use Tdwesten\StatamicBuilder\Helpers\FieldParser;
+use Tests\Helpers\TestFieldset;
+
+test('it preserves field order when flattening mixed fields', function () {
+    $fieldset = new TestFieldset('test_fieldset');
+    $standaloneField1 = new Text('standalone_field_1');
+    $standaloneField2 = new Text('standalone_field_2');
+
+    $mixedFields = [
+        $standaloneField1,
+        $fieldset,
+        $standaloneField2,
+    ];
+
+    $fields = FieldParser::parseMixedFieldsToFlatCollection($mixedFields);
+
+    expect($fields[0]->toArray()['handle'])->toBe('standalone_field_1');
+    expect($fields[1]->toArray()['import'])->toBe('test_fieldset');
+    expect($fields[2]->toArray()['handle'])->toBe('standalone_field_2');
+});