From 03bbd4d5025231129d545068248f7edf337c5f58 Mon Sep 17 00:00:00 2001
From: francoism90 <francoism90@users.noreply.github.com>
Date: Sat, 27 Apr 2024 23:14:59 +0200
Subject: [PATCH] Merge navigation

---
 resources/views/navigation/tabs.blade.php |  4 +--
 src/Actions/Support/ActionGroup.php       | 21 +++++++++++
 src/Navigation/Components/Tabs.php        |  4 +--
 src/Navigation/Support/Navigation.php     | 43 -----------------------
 src/Navigation/Support/NavigationItem.php | 10 ------
 5 files changed, 25 insertions(+), 57 deletions(-)
 delete mode 100644 src/Navigation/Support/Navigation.php
 delete mode 100644 src/Navigation/Support/NavigationItem.php

diff --git a/resources/views/navigation/tabs.blade.php b/resources/views/navigation/tabs.blade.php
index b9f983f6..a905e098 100644
--- a/resources/views/navigation/tabs.blade.php
+++ b/resources/views/navigation/tabs.blade.php
@@ -1,5 +1,5 @@
 @php
-    $current = $navigation->current();
+    $current = $actions->current();
 @endphp
 
 <div {{ $attributes
@@ -12,7 +12,7 @@
     ->withoutClass()
 }}>
     <nav class="{{ $attributes->classFor('layer') }}">
-        @foreach ($navigation->items as $action)
+        @foreach ($actions->items as $action)
             <x-wireuse::actions-link
                 :$action
                 class="{{ $attributes->classFor('item') }}"
diff --git a/src/Actions/Support/ActionGroup.php b/src/Actions/Support/ActionGroup.php
index 49a10c8b..7554045e 100644
--- a/src/Actions/Support/ActionGroup.php
+++ b/src/Actions/Support/ActionGroup.php
@@ -95,6 +95,27 @@ public function filter(Closure $callback): array
         return $this->filterItems($this->items, $callback);
     }
 
+    public function current(): ?Action
+    {
+        $items = $this->filter(function (Action $item) {
+            $active = $this->active ?: $item->getActive();
+
+            if (is_bool($active)) {
+                return $active;
+            }
+
+            if (is_string($active) && $item->getName() === $active) {
+                return $item;
+            }
+
+            return $item->isRoute() || $item->isFullUrl();
+        });
+
+        return collect($items)
+            ->sortByDesc(fn (Action $item) => count($item->getContainers()))
+            ->first();
+    }
+
     protected function filterItems(array $items, Closure $callback): array
     {
         $filtered = [];
diff --git a/src/Navigation/Components/Tabs.php b/src/Navigation/Components/Tabs.php
index cca11ff7..2706116a 100644
--- a/src/Navigation/Components/Tabs.php
+++ b/src/Navigation/Components/Tabs.php
@@ -3,14 +3,14 @@
 namespace Foxws\WireUse\Navigation\Components;
 
 use Closure;
-use Foxws\WireUse\Navigation\Support\Navigation;
+use Foxws\WireUse\Actions\Support\ActionGroup;
 use Foxws\WireUse\Views\Support\Component;
 use Illuminate\View\View;
 
 class Tabs extends Component
 {
     public function __construct(
-        public Navigation $navigation,
+        public ActionGroup $actions,
     ) {
     }
 
diff --git a/src/Navigation/Support/Navigation.php b/src/Navigation/Support/Navigation.php
deleted file mode 100644
index f71dd941..00000000
--- a/src/Navigation/Support/Navigation.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Foxws\WireUse\Navigation\Support;
-
-use Closure;
-use Foxws\WireUse\Actions\Support\ActionGroup;
-
-class Navigation extends ActionGroup
-{
-    public function add(string $name, ?Closure $callback = null): self
-    {
-        $item = new NavigationItem($this, $name);
-
-        if ($callback instanceof Closure) {
-            $callback($item);
-        }
-
-        $this->items[] = $item;
-
-        return $this;
-    }
-
-    public function current(): ?NavigationItem
-    {
-        $items = $this->filter(function (NavigationItem $item) {
-            $active = $this->active ?: $item->getActive();
-
-            if (is_bool($active)) {
-                return $active;
-            }
-
-            if (is_string($active) && $item->getName() === $active) {
-                return $item;
-            }
-
-            return $item->isRoute() || $item->isFullUrl();
-        });
-
-        return collect($items)
-            ->sortByDesc(fn (NavigationItem $item) => count($item->getContainers()))
-            ->first();
-    }
-}
diff --git a/src/Navigation/Support/NavigationItem.php b/src/Navigation/Support/NavigationItem.php
deleted file mode 100644
index f17ff99b..00000000
--- a/src/Navigation/Support/NavigationItem.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace Foxws\WireUse\Navigation\Support;
-
-use Foxws\WireUse\Actions\Support\Action;
-
-class NavigationItem extends Action
-{
-    //
-}