We only need nav:breadcrumbs, not structure:breadcrumbs

statamic · Mar 26, 2020 · 1c10ec1 · 1c10ec1
1 parent 309f736
commit 1c10ec1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/src/Tags/Nav.php b/src/Tags/Nav.php
@@ -2,10 +2,48 @@
 
 namespace Statamic\Tags;
 
+use Statamic\Facades\Data;
+use Statamic\Facades\URL;
+
 class Nav extends Structure
 {
     public function index()
     {
         return $this->structure($this->get('handle', 'collection::pages'));
     }
+
+    public function breadcrumbs()
+    {
+        $url = URL::getCurrent();
+        $segments = explode('/', $url);
+        $segments[0] = '/';
+
+        if (! $this->params->bool('include_home', true)) {
+            array_shift($segments);
+        }
+
+        $crumbs = collect($segments)->map(function () use (&$segments) {
+            $uri = URL::tidy(join('/', $segments));
+            array_pop($segments);
+            return $uri;
+        })->mapWithKeys(function ($uri) {
+            return [$uri => Data::findByUri($uri)];
+        })->filter();
+
+        if (! $this->params->bool('reverse', false)) {
+            $crumbs = $crumbs->reverse();
+        }
+
+        if ($this->params->bool('trim', true)) {
+            $this->content = trim($this->content);
+        }
+
+        $output = $this->parseLoop($crumbs->values()->toAugmentedArray());
+
+        if ($backspaces = $this->params->int('backspace', 0)) {
+            $output = substr($output, 0, -$backspaces);
+        }
+
+        return $output;
+    }
 }
diff --git a/src/Tags/Structure.php b/src/Tags/Structure.php
@@ -2,7 +2,6 @@
 
 namespace Statamic\Tags;
 
-use Statamic\Facades\Data;
 use Statamic\Facades\URL;
 use Statamic\Facades\Site;
 use Statamic\Structures\TreeBuilder;
@@ -59,39 +58,4 @@ public function toArray($tree, $parent = null)
             ]);
         })->filter()->values()->all();
     }
-
-    public function breadcrumbs()
-    {
-        $url = URL::getCurrent();
-        $segments = explode('/', $url);
-        $segments[0] = '/';
-
-        if (! $this->params->bool('include_home', true)) {
-            array_shift($segments);
-        }
-
-        $crumbs = collect($segments)->map(function () use (&$segments) {
-            $uri = URL::tidy(join('/', $segments));
-            array_pop($segments);
-            return $uri;
-        })->mapWithKeys(function ($uri) {
-            return [$uri => Data::findByUri($uri)];
-        })->filter();
-
-        if (! $this->params->bool('reverse', false)) {
-            $crumbs = $crumbs->reverse();
-        }
-
-        if ($this->params->bool('trim', true)) {
-            $this->content = trim($this->content);
-        }
-
-        $output = $this->parseLoop($crumbs->values()->toAugmentedArray());
-
-        if ($backspaces = $this->params->int('backspace', 0)) {
-            $output = substr($output, 0, -$backspaces);
-        }
-
-        return $output;
-    }
 }