From 93cef20ee21ea8447cf1731c140b78a707b1fff6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 10 Jul 2024 18:37:22 +0200
Subject: [PATCH] Change merge order to preserve output format

May want to revert this later as it makes sense for user added data to be last, but this preserves the current attribute order for now
---
 .../views/components/navigation/navigation-link.blade.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-link.blade.php b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
index f5fc6d7de60..5d2725b22e2 100644
--- a/packages/framework/resources/views/components/navigation/navigation-link.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-link.blade.php
@@ -1,6 +1,6 @@
 <a href="{{ $item }}" {{ $attributes->except('item')->class([
     'navigation-link block my-2 md:my-0 md:inline-block py-1 text-gray-700 hover:text-gray-900 dark:text-gray-100',
     'navigation-link-active border-l-4 border-indigo-500 md:border-none font-medium -ml-6 pl-5 md:ml-0 md:pl-0 bg-gray-100 dark:bg-gray-800 md:bg-transparent dark:md:bg-transparent' => $item->isActive()
-])->merge([
+])->merge($item->getExtraAttributes())->merge([
     'aria-current' => $item->isActive() ? 'page' : false,
-])->merge($item->getExtraAttributes()) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file
+]) }}>{{ $item->getLabel() }}</a>
\ No newline at end of file