From cd21545ff2e2807bd9199af5038c1732736cf3f0 Mon Sep 17 00:00:00 2001 From: Howard Miller Date: Fri, 25 Apr 2025 16:49:36 +0100 Subject: [PATCH 1/2] fix: change linkClasses in FwbNavbarLink to be computed rather than only evaluated on mount --- src/components/FwbNavbar/FwbNavbarLink.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/FwbNavbar/FwbNavbarLink.vue b/src/components/FwbNavbar/FwbNavbarLink.vue index ef04d9c6..70f4ecdc 100644 --- a/src/components/FwbNavbar/FwbNavbarLink.vue +++ b/src/components/FwbNavbar/FwbNavbarLink.vue @@ -37,10 +37,12 @@ const defaultClasses = 'block py-2 pr-4 pl-3 rounded md:p-0' const componentName = computed(() => { return props.component !== 'a' ? resolveComponent(props.component) : 'a' }) -const linkClasses = twMerge( - defaultClasses, - props.isActive ? currentPageClasses : defaultStateClasses, -) +const linkClasses = computed(() => { + return twMerge( + defaultClasses, + props.isActive ? currentPageClasses: defaultStateClasses, + ) +}) const handleClick = (event: Event) => { if (props.disabled) { return From 9de4614543bfd1dc1d18b54c7e27d1ba1f6d6eda Mon Sep 17 00:00:00 2001 From: Sqrcz Date: Wed, 30 Apr 2025 21:20:24 +0200 Subject: [PATCH 2/2] fix linter errors + return from arrow function simplified --- src/components/FwbNavbar/FwbNavbarLink.vue | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/FwbNavbar/FwbNavbarLink.vue b/src/components/FwbNavbar/FwbNavbarLink.vue index 70f4ecdc..fedab52d 100644 --- a/src/components/FwbNavbar/FwbNavbarLink.vue +++ b/src/components/FwbNavbar/FwbNavbarLink.vue @@ -37,12 +37,10 @@ const defaultClasses = 'block py-2 pr-4 pl-3 rounded md:p-0' const componentName = computed(() => { return props.component !== 'a' ? resolveComponent(props.component) : 'a' }) -const linkClasses = computed(() => { - return twMerge( - defaultClasses, - props.isActive ? currentPageClasses: defaultStateClasses, - ) -}) +const linkClasses = computed(() => twMerge( + defaultClasses, + props.isActive ? currentPageClasses : defaultStateClasses, +)) const handleClick = (event: Event) => { if (props.disabled) { return