Skip to content

chore: Revert "fix(button): handles modifier keys correctly (#5543)" #5602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −23
Open

chore: Revert "fix(button): handles modifier keys correctly (#5543)" #5602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .changeset/witty-streets-mix.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions packages/button/src/ButtonBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,6 @@ export class ButtonBase extends ObserveSlotText(LikeAnchor(Focusable), '', [
private shouldProxyClick(event?: MouseEvent): boolean {
let handled = false;

// If this is a link (has href), let the browser handle it naturally
if (this.href && this.href.length > 0) {
return false; // Don't interfere with browser's link handling
}

// Don't proxy clicks with modifier keys (Command/Meta, Ctrl, Shift, Alt)
if (
event &&
Expand Down
14 changes: 5 additions & 9 deletions packages/button/test/button.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ describe('Button', () => {
expect(el.hasAttribute('static-color')).to.be.false;
});
});
it('handles modifier key clicks correctly for buttons with href', async () => {
it('handles modifier key clicks correctly', async () => {
const el = await fixture<Button>(html`
<sp-button href="#test">Button with href</sp-button>
`);
Expand All @@ -839,7 +839,7 @@ describe('Button', () => {
) as HTMLAnchorElement;
expect(anchorElement).to.not.be.undefined;

// Set up spies to track events
// Set up spies instead of counters
const buttonClickSpy = spy();
const anchorClickSpy = spy();

Expand All @@ -852,7 +852,7 @@ describe('Button', () => {
// Track button clicks with spy
el.addEventListener('click', buttonClickSpy);

// Test normal click - should NOT proxy to anchor when href is present
// Test normal click - should proxy to anchor
const normalClick = new MouseEvent('click', {
bubbles: true,
cancelable: true,
Expand All @@ -864,14 +864,10 @@ describe('Button', () => {
el.dispatchEvent(normalClick);
await elementUpdated(el);

expect(
buttonClickSpy.called,
'Normal click should be received by the button'
).to.be.true;
expect(
anchorClickSpy.called,
'Normal click should NOT be proxied to the anchor when href is present'
).to.be.false;
'Normal click should be proxied to the anchor'
).to.be.true;

buttonClickSpy.resetHistory();
anchorClickSpy.resetHistory();
Expand Down
Loading