Skip to content

Prevent collapsing when clicking the decoration icon #585

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
bendera wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent collapsing when clicking the decoration icon #585

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
2 changes: 1 addition & 1 deletion dev/vscode-collapsible/actions-stop-propagation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1>Component demo</h1>
aria-role="button"
id="btn-refresh"
title="Refresh"
slot="actions"
slot="decorations"
></vscode-icon>
<p>Lorem ipsum</p>
<p>Lorem ipsum</p>
Expand Down
17 changes: 17 additions & 0 deletions src/vscode-collapsible/vscode-collapsible.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,21 @@ describe('vscode-collapsible', () => {

expect(el.open).to.be.true;
});

it('prevents collapse on decoration icon click', async () => {
const el = await fixture<VscodeCollapsible>(html`
<vscode-collapsible always-show-header-actions open
><vscode-icon
name="file"
slot="decorations"
id="action-icon"
></vscode-icon>
</vscode-collapsible>
`);

const actionIcon = $('#action-icon');
await clickOnElement(actionIcon);

expect(el.open).to.be.true;
});
});
8 changes: 5 additions & 3 deletions src/vscode-collapsible/vscode-collapsible.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class VscodeCollapsible extends VscElement {
}
}

private _onActionClick(event: PointerEvent) {
private _onHeaderSlotClick(event: PointerEvent) {
event.stopPropagation();
}

Expand Down Expand Up @@ -127,9 +127,11 @@ export class VscodeCollapsible extends VscElement {
<h3 class="title">${heading}${descriptionMarkup}</h3>
<div class="header-slots">
<div class=${classMap(actionsClasses)}>
<slot name="actions" @click=${this._onActionClick}></slot>
<slot name="actions" @click=${this._onHeaderSlotClick}></slot>
</div>
<div class="decorations">
<slot name="decorations" @click=${this._onHeaderSlotClick}></slot>
</div>
<div class="decorations"><slot name="decorations"></slot></div>
</div>
</div>
<div class="collapsible-body" part="body">
Expand Down