Merge pull request #1135 from hydephp/fix-breadcrumbs-component-markup

emmadesilva · web-flow · commit 35bdad83422b · 2023-02-27T19:16:49.000+01:00
Fix breadcrumbs component markup
diff --git a/packages/framework/resources/views/components/breadcrumbs.blade.php b/packages/framework/resources/views/components/breadcrumbs.blade.php
@@ -5,14 +5,11 @@
                 <li>
                     @if (! $loop->last)
                         <a href="{{ $path }}" class="hover:underline">{{ $title }}</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     @else
                         <a href="{{ $path }}" aria-current="page">{{ $title }}</a>
                     @endif
                 </li>
-
-                @if (! $loop->last)
-                    <span class="px-1" aria-hidden="true">&gt;</span>
-                @endif
             @endforeach
         </ol>
     </nav>
diff --git a/packages/framework/tests/Unit/BreadcrumbsComponentViewTest.php b/packages/framework/tests/Unit/BreadcrumbsComponentViewTest.php
@@ -28,8 +28,8 @@ public function testRenderedBladeView()
                 <ol class="flex">
                     <li>
                         <a href="index.html" class="hover:underline">Home</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="foo.html" aria-current="page">Foo</a>
                     </li>
@@ -54,12 +54,12 @@ public function testRenderedBladeViewOnNestedPage()
                 <ol class="flex">
                     <li>
                         <a href="../index.html" class="hover:underline">Home</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../foo/index.html" class="hover:underline">Foo</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../foo/bar.html" aria-current="page">Bar</a>
                     </li>
@@ -77,16 +77,16 @@ public function testRenderedBladeViewOnDeeplyNestedPage()
                 <ol class="flex">
                     <li>
                         <a href="../../index.html" class="hover:underline">Home</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../../foo/index.html" class="hover:underline">Foo</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../../foo/bar/index.html" class="hover:underline">Bar</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../../foo/bar/baz.html" aria-current="page">Baz</a>
                     </li>
@@ -104,8 +104,8 @@ public function testRenderedBladeViewOnNestedIndexPage()
                 <ol class="flex">
                     <li>
                         <a href="../index.html" class="hover:underline">Home</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href="../foo/index.html" aria-current="page">Foo</a>
                     </li>
@@ -125,8 +125,8 @@ public function testRenderedBladeViewWithAttributes()
                 <ol class="flex">
                     <li>
                         <a href="index.html" class="hover:underline">Home</a>
+                        <span class="px-1" aria-hidden="true">&gt;</span>
                     </li>
-                    <span class="px-1" aria-hidden="true">&gt;</span>
                     <li>
                         <a href=".html" aria-current="page"></a>
                     </li>
