Merge pull request #219 from rderks88/master

eminiarts · May 25, 2022 · cf5341c · cf5341c
2 parents bbb3676 + 9365c4c
commit cf5341c
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/Traits/HasTabs.php b/src/Traits/HasTabs.php
@@ -97,7 +97,21 @@ protected function panelsWithDefaultLabel(Collection $panels, FieldCollection $f
                     : $panels;
             })
             ->tap(function ($panels) use ($label): void {
-                $panels->where('component', 'tabs')->isEmpty() ? $panels->where('component', 'tabs')->first() : $panels->first()->withToolbar();
+
+                /**
+                 * There can be no panels
+                 * Preventing ->component or ->withToolbar() on null error
+                 */
+                if(!$panels->first()){
+                    return;
+                }
+
+                /**
+                 * Default to ->withToolbar() if the first panel is not a Tabs
+                 * Otherwise, we show the tabs component with the settings configured within it
+                 * This check is necessary in case you ARE using Tabs component, but only for relation as a 2nd or 3rd instance
+                 */
+                $panels->first()->component !== 'tabs' ? $panels->first()->withToolbar() : $panels->where('component', 'tabs')->first();
             });
     }
 }