Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 64 additions & 0 deletions dev/vscode-collapsible/actions-stop-propagation.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>VSCode Elements</title>
<link
rel="stylesheet"
href="/node_modules/@vscode/codicons/dist/codicon.css"
id="vscode-codicon-stylesheet"
>
<script
type="module"
src="/node_modules/@vscode-elements/webview-playground/dist/index.js"
></script>
<script type="module" src="/dist/main.js"></script>
<script>
const logEvents = (selector, eventType) => {
document.querySelector(selector).addEventListener(eventType, (ev) => {
console.log(ev);
});
};
</script>
</head>

<body>
<h1>Component demo</h1>
<main>
<vscode-demo>
<vscode-collapsible
always-show-header-actions
heading="Test"
style="display: block; width: 500px"
>
<vscode-icon
name="file-add"
action-icon
aria-role="button"
id="btn-file-add"
title="New File"
slot="actions"
></vscode-icon>
<vscode-icon
name="refresh"
action-icon
aria-role="button"
id="btn-refresh"
title="Refresh"
slot="actions"
></vscode-icon>
<p>Lorem ipsum</p>
<p>Lorem ipsum</p>
<p>Lorem ipsum</p>
<p>Lorem ipsum</p>
<p>Lorem ipsum</p>
</vscode-collapsible>
</vscode-demo>
<script>
logEvents('#btn-file-add', 'click');
logEvents('#btn-refresh', 'click');
</script>
</main>
</body>
</html>
16 changes: 16 additions & 0 deletions src/vscode-collapsible/vscode-collapsible.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/* eslint-disable @typescript-eslint/no-unused-expressions */
import {$, clickOnElement} from '../includes/test-helpers.js';
import {VscodeCollapsible} from './index.js';
import '../vscode-icon/index.js';
import {expect, fixture, html} from '@open-wc/testing';

describe('vscode-collapsible', () => {
Expand Down Expand Up @@ -104,4 +107,17 @@ describe('vscode-collapsible', () => {

expect(detail).to.deep.equal({open: true});
});

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

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

expect(el.open).to.be.true;
});
});
6 changes: 5 additions & 1 deletion src/vscode-collapsible/vscode-collapsible.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ export class VscodeCollapsible extends VscElement {
}
}

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

override render(): TemplateResult {
const classes = {collapsible: true, open: this.open};
const actionsClasses = {
Expand Down Expand Up @@ -123,7 +127,7 @@ export class VscodeCollapsible extends VscElement {
<h3 class="title">${heading}${descriptionMarkup}</h3>
<div class="header-slots">
<div class=${classMap(actionsClasses)}>
<slot name="actions"></slot>
<slot name="actions" @click=${this._onActionClick}></slot>
</div>
<div class="decorations"><slot name="decorations"></slot></div>
</div>
Expand Down