Merge pull request #1 from webfox/fix-optgroups

FIX optgroups

Author: SuryaWebfox

src/AttributeManager.php

@@ -44,6 +44,21 @@ public function getFieldActualName(View $view)
     return $name;
   }
 
+  public function getFieldOptions(View $view)
+  {
+    if (!$view->offsetExists('options')) return null;
+
+    $options = $view->offsetGet('options');
+
+    if ($options instanceof \Illuminate\Support\Collection) {
+      $options = $options->toArray();
+    }
+
+    return array_filter($options, function($value) {
+      return !empty($value);
+    });
+  }
+
   public function getExtraAttributes(View $view)
   {
 

src/FieldViewComposer.php

@@ -34,6 +34,7 @@ public function compose(View $view)
         $view->offsetSet('value', $this->attributeManager->getFieldValue($view));
         $view->offsetSet('type', $this->attributeManager->getFieldType($view));
         $view->offsetSet('actualName', $this->attributeManager->getFieldActualName($view));
+        $view->offsetSet('options', $this->attributeManager->getFieldOptions($view));
         $view->offsetSet('onlyTemplate', in_array($fieldType, ['checkbox']));
         $view->offsetSet('model', app(FormModelStack::class)->current());
     }

views/fields/select.blade.php

@@ -3,17 +3,15 @@
         <option></option>@endif
     @foreach($options as $optValue => $optText)
         @if(is_array($optText))
-            @foreach($optText as $optionValues)
-                <optgroup label="{{ $optValue }}">
-                    @foreach($optionValues as $optGroupOptValue => $optGroupOptText)
-                        @if(is_array($value) ? in_array($optGroupOptValue, $value) : $optGroupOptValue === $value)
-                            <option value="{{ $optGroupOptValue }}" selected>{{ $optGroupOptText }}</option>
-                        @else
-                            <option value="{{ $optGroupOptValue }}">{{ $optGroupOptText }}</option>
-                        @endif
-                    @endforeach
-                </optgroup>
-            @endforeach
+            <optgroup label="{{ $optValue }}">
+                @foreach($optText as $optGroupOptValue => $optGroupOptText)
+                    @if(is_array($value) ? in_array($optGroupOptValue, $value) : $optGroupOptValue === $value)
+                        <option value="{{ $optGroupOptValue }}" selected>{{ $optGroupOptText }}</option>
+                    @else
+                        <option value="{{ $optGroupOptValue }}">{{ $optGroupOptText }}</option>
+                    @endif
+                @endforeach
+            </optgroup>
         @else
             @if(is_array($value) ? in_array($optValue, $value) : $optValue === $value)
                 <option value="{{ $optValue }}" selected>{{ $optText }}</option>