Skip to content

Commit f600a51

Browse files
authored
feat: decoupled aria-expanded state #227 (#228)
1 parent 5e480eb commit f600a51

14 files changed

Lines changed: 184 additions & 71 deletions

File tree

docs/core/makeup-expander/index.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,15 @@ <h2>Auto Collapse On</h2>
157157
<p>A checkbox: <input type="checkbox" aria-label="Dummy checkbox" /></p>
158158
</div>
159159
</span>
160+
161+
<h2>UseAriaExpanded=false</h2>
162+
163+
<span class="expander expander--tooltip flyout">
164+
<button class="expander__host">Btn</button>
165+
<div class="expander__content flyout__content">
166+
<p>A link: <a id="foo" href="http://www.ebay.com">www.ebay.com</a></p>
167+
</div>
168+
</span>
160169
</main>
161170
<script src="index.min.js"></script>
162171
</body>

docs/core/makeup-expander/index.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const hoverExpanderEls = document.querySelectorAll(".expander--hover-only");
1010
const hoverAndFocusExpanderEls = document.querySelectorAll(".expander--focus-and-hover");
1111
const stealthExpanderEls = document.querySelectorAll(".expander--stealth-only");
1212
const clickAndSpacebarExpanderEls = document.querySelectorAll(".expander--click-and-spacebar");
13+
const tooltipEls = document.querySelectorAll(".expander--tooltip");
1314
const expanderWidgets = [];
1415

1516
expanderWidgets.push(new Expander(clickExpanderEls[0], { expandOnClick: true }));
@@ -49,11 +50,24 @@ clickAndSpacebarExpanderEls.forEach(function (el) {
4950
);
5051
});
5152

52-
expanderWidgets.forEach(function (item) {
53-
item.el.addEventListener("expander-expand", function (e) {
54-
console.log(e);
55-
});
56-
item.el.addEventListener("expander-collapse", function (e) {
57-
console.log(e);
53+
tooltipEls.forEach(function (el) {
54+
expanderWidgets.push(
55+
new Expander(el, {
56+
ariaControls: false,
57+
autoCollapse: true,
58+
expandOnFocus: true,
59+
expandOnHover: true,
60+
useAriaExpanded: false,
61+
expandedClass: "expander__host-container--expanded",
62+
}),
63+
);
64+
65+
expanderWidgets.forEach(function (item) {
66+
item.el.addEventListener("expander-expand", function (e) {
67+
console.log(e);
68+
});
69+
item.el.addEventListener("expander-collapse", function (e) {
70+
console.log(e);
71+
});
5872
});
5973
});

docs/core/makeup-expander/index.min.js

Lines changed: 35 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/core/makeup-expander/index.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-combobox/index.min.js

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-combobox/index.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-listbox-button/index.min.js

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-listbox-button/index.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-menu-button/index.min.js

Lines changed: 18 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/ui/makeup-menu-button/index.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)