From e064d2b0742420d29af8582bc174fe08b340465f Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Fri, 20 Sep 2024 13:04:48 -0400
Subject: [PATCH] fixes #2151

---
 docs/pages/resources/changelog.md         | 3 ++-
 src/components/button/button.component.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md
index 6a7e7ea8..2d2c1d9b 100644
--- a/docs/pages/resources/changelog.md
+++ b/docs/pages/resources/changelog.md
@@ -14,7 +14,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 
 ## Next
 
-- Scroll buttons for `<sl-tab-group>` auto hide when they are not clickable. The `fixed-scroll-controls` attribute can be included to prevent this behavior. [#2128]
+- Added the `fixed-scroll-controls` attribute to `<sl-tab-group>` [#2128]
 - Added support for using `<sl-dropdown>` in `<sl-breadcrumb-item>` default slot [#2015]
 - Added the `countdown` attribute to `<sl-alert>` to show a visual indicator before the toast disappears [#1899]
 - Fixed a bug with morphing and DOM diffing that would cause elements with reflected initial attributes to not reset. [#2177]
@@ -22,6 +22,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 - Fixed a bug that made pagination work incorrectly in `<sl-carousel>` [#2155]
 - Fixed a bug in `<sl-tab-group>` that caused the active tab indicator to be the wrong size when the tab's content changes [#2164]
 - Fixed a bug in `<sl-select>` that caused the prefix icon to have incorrect spacing [#2167]
+- Fixed a bug in `<sl-button>` that prevented link buttons from being disabled [#2151]
 
 ## 2.16.0
 
diff --git a/src/components/button/button.component.ts b/src/components/button/button.component.ts
index 54ecbb03..f0bd228f 100644
--- a/src/components/button/button.component.ts
+++ b/src/components/button/button.component.ts
@@ -293,7 +293,7 @@ export default class SlButton extends ShoelaceElement implements ShoelaceFormCon
         title=${this.title /* An empty title prevents browser validation tooltips from appearing on hover */}
         name=${ifDefined(isLink ? undefined : this.name)}
         value=${ifDefined(isLink ? undefined : this.value)}
-        href=${ifDefined(isLink ? this.href : undefined)}
+        href=${ifDefined(isLink && !this.disabled ? this.href : undefined)}
         target=${ifDefined(isLink ? this.target : undefined)}
         download=${ifDefined(isLink ? this.download : undefined)}
         rel=${ifDefined(isLink ? this.rel : undefined)}