Skip to content

Support click from nested elements #54

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

Merged
koddsson merged 3 commits into from
Aug 23, 2021
Merged

Support click from nested elements #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb98e38
Prettier.
pablonete Aug 12, 2021
20a9a3a
Add spans to better reproduce production scenarios.
pablonete Aug 12, 2021
5b1a1d5
Change check so it works for other elements inside the label.
pablonete Aug 12, 2021
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
161 changes: 85 additions & 76 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,94 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>details-menu demo</title>
<style>
details-menu {
background: white;
border: 1px solid;
display: block;
padding: 4px;
width: 200px;
}
button, label[tabindex] {
font-family: inherit;
font-size: inherit;
display: block;
background: none;
border: 0;
width: 100%;
text-align: left;
padding: 0;
}
</style>
</head>
<body>
<h1>Base examples</h1>
<head>
<meta charset="utf-8" />
<title>details-menu demo</title>
<style>
details-menu {
background: white;
border: 1px solid;
display: block;
padding: 4px;
width: 200px;
}
button,
label[tabindex] {
font-family: inherit;
font-size: inherit;
display: block;
background: none;
border: 0;
width: 100%;
text-align: left;
padding: 0;
}
</style>
</head>
<body>
<h1>Base examples</h1>

<details>
<summary>Best robot: <span data-menu-button>Unknown</span></summary>
<details-menu>
<button type="button" role="menuitem" data-menu-button-text>Hubot</button>
<button type="button" role="menuitem" data-menu-button-text>Bender</button>
<button type="button" role="menuitem" data-menu-button-text>BB-8</button>
</details-menu>
</details>
<details>
<summary>Best robot: <span data-menu-button>Unknown</span></summary>
<details-menu>
<button type="button" role="menuitem" data-menu-button-text>Hubot</button>
<button type="button" role="menuitem" data-menu-button-text>Bender</button>
<button type="button" role="menuitem" data-menu-button-text>BB-8</button>
</details-menu>
</details>

<details>
<summary>Best robot: <span data-menu-button>Unknown</span></summary>
<details-menu>
<label tabindex="0" role="menuitemradio" data-menu-button-text><input type="radio" name="robot"> Hubot</label>
<label tabindex="0" role="menuitemradio" data-menu-button-text><input type="radio" name="robot"> Bender</label>
<label tabindex="0" role="menuitemradio" data-menu-button-text><input type="radio" name="robot"> BB-8</label>
</details-menu>
</details>
<details>
<summary>Best robot: <span data-menu-button>Unknown</span></summary>
<details-menu>
<label tabindex="0" role="menuitemradio" data-menu-button-text>
<span><input type="radio" name="robot" /> Hubot</span>
</label>
<label tabindex="0" role="menuitemradio" data-menu-button-text>
<span><input type="radio" name="robot" /> Bender</span>
</label>
<label tabindex="0" role="menuitemradio" data-menu-button-text>
<span><input type="radio" name="robot" /> BB-8</span>
</label>
</details-menu>
</details>

<details>
<summary>Favorite robots</summary>
<details-menu>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot"> Hubot</label>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot"> Bender</label>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot"> BB-8</label>
</details-menu>
</details>
<details>
<summary>Favorite robots</summary>
<details-menu>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot" /> Hubot</label>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot" /> Bender</label>
<label tabindex="0" role="menuitemcheckbox"><input type="checkbox" name="robot" /> BB-8</label>
</details-menu>
</details>

<details>
<summary data-menu-button>Favorite robots</summary>
<details-menu>
<button type="submit" name="robot" value="Hubot" role="menuitemradio" data-menu-button-text>Hubot</button>
<button type="submit" name="robot" value="Bender" role="menuitemradio" data-menu-button-text>Bender</button>
<button type="submit" name="robot" value="BB-8" role="menuitemradio" data-menu-button-text>BB-8</button>
</details-menu>
</details>
<details>
<summary data-menu-button>Favorite robots</summary>
<details-menu>
<button type="submit" name="robot" value="Hubot" role="menuitemradio" data-menu-button-text>Hubot</button>
<button type="submit" name="robot" value="Bender" role="menuitemradio" data-menu-button-text>Bender</button>
<button type="submit" name="robot" value="BB-8" role="menuitemradio" data-menu-button-text>BB-8</button>
</details-menu>
</details>

<h1>Autofocus example</h1>
<p><code>summary</code> may have <code>autofocus</code> so it's the initially focused element in the page.</p>
<p>Then any focusable element inside the popup can declare autofocus too, so it gets focus when the popup is opened.</p>
<h1>Autofocus example</h1>
<p><code>summary</code> may have <code>autofocus</code> so it's the initially focused element in the page.</p>
<p>
Then any focusable element inside the popup can declare autofocus too, so it gets focus when the popup is opened.
</p>

<details>
<summary data-menu-button autofocus>Autofocus picker</summary>
<details-menu>
<input type="text" autofocus />
<button type="submit" name="robot" value="Hubot" role="menuitemradio" data-menu-button-text>Hubot</button>
<button type="submit" name="robot" value="Bender" role="menuitemradio" data-menu-button-text>Bender</button>
<button type="submit" name="robot" value="BB-8" role="menuitemradio" data-menu-button-text>BB-8</button>
</details-menu>
</details>
<details>
<summary data-menu-button autofocus>Autofocus picker</summary>
<details-menu>
<input type="text" autofocus />
<button type="submit" name="robot" value="Hubot" role="menuitemradio" data-menu-button-text>Hubot</button>
<button type="submit" name="robot" value="Bender" role="menuitemradio" data-menu-button-text>Bender</button>
<button type="submit" name="robot" value="BB-8" role="menuitemradio" data-menu-button-text>BB-8</button>
</details-menu>
</details>

<script type="text/javascript">
document.addEventListener('details-menu-selected', e => console.log(e))
</script>
<!-- <script type="module" src="../dist/index.js"></script> -->
<script type="module" src="https://unpkg.com/@github/details-menu-element@latest?module"></script>
</body>
<script type="text/javascript">
document.addEventListener('details-menu-selected', e => console.log(e))
</script>
<!-- <script type="module" src="../dist/index.js"></script> -->
<script type="module" src="https://unpkg.com/@github/details-menu-element@latest?module"></script>
</body>
</html>
8 changes: 6 additions & 2 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,14 @@ function shouldCommit(details: Element, event: Event) {
const menuitem = target.closest('[role="menuitem"], [role="menuitemradio"]')
if (!menuitem) return

const input = menuitem.querySelector('input')

// Ignore double event caused by inputs nested in labels
if (menuitem.tagName === 'LABEL' && target !== menuitem) return
// Known issue: This will wrongly ignore a legit click event on an already checked input,
// but inputs are not expected to be visible in the menu items.
// I've found no way to discriminate the legit event from the echo one, and we don't want to trigger the selected event twice.
if (menuitem.tagName === 'LABEL' && target === input) return

const input = menuitem.querySelector('input')
// An input inside a label will be committed as a change event (we assume it's a radio input),
// unless the input is already checked, so we need to commit on click (to close the popup)
const onlyCommitOnChangeEvent = menuitem.tagName === 'LABEL' && input && !input.checked
Expand Down