Skip to content

fix: add documented events to menu-button #219 #232

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
ianmcburnie wants to merge 2 commits into
base: master
Choose a base branch
from
+105 −35
Open

fix: add documented events to menu-button #219 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c4e22
fix: add documented events to menu-button #219
ianmcburnie Feb 8, 2026
86ae61c
fix: applied copilot suggestions
ianmcburnie Feb 8, 2026
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
6 changes: 3 additions & 3 deletions docs/ui/makeup-menu-button/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ window.onload = function () {
menuItemButtonAriaLabelSelector,
});

widget.menu.el.addEventListener("makeup-menu-select", (e) => console.log(e.type, e.detail));
widget.menu.el.addEventListener("makeup-menu-change", (e) => console.log(e.type, e.detail));
widget.menu.el.addEventListener("makeup-menu-button-mutation", (e) => console.log(e.type, e.detail));
widget.el.addEventListener("makeup-menu-button-select", (e) => console.log(e.type, e.detail));
widget.el.addEventListener("makeup-menu-button-change", (e) => console.log(e.type, e.detail));
widget.el.addEventListener("makeup-menu-button-mutation", (e) => console.log(e.type, e.detail));
});
};
35 changes: 25 additions & 10 deletions docs/ui/makeup-menu-button/index.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/ui/makeup-menu-button/index.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

29 changes: 22 additions & 7 deletions packages/ui/makeup-menu-button/dist/cjs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class _default {
this._onButtonFirstClickListener = _onButtonFirstClick.bind(this);
this._onMenuKeyDownListener = _onMenuKeyDown.bind(this);
this._onMenuItemSelectListener = _onMenuItemSelect.bind(this);
this._onMenuItemChangeListener = _onMenuItemChange.bind(this);
this._onMutationListener = _onMutation.bind(this);
this.el.classList.add("menu-button--js");
if (!this._options.customElementMode) {
Expand Down Expand Up @@ -71,14 +72,22 @@ class _default {
});
this.menu.el.addEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.addEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}
}
_unobserveEvents() {
this._buttonEl.removeEventListener("click", this._onButtonFirstClickListener);
this.menu.el.removeEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.removeEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}

// TODO: Move this logic to Expander as an option callback that runs after collapse.
_collapseMenuAfterTimeout() {
setTimeout(() => {
this._expander.expanded = false;
this._buttonEl.focus();
}, 150);
}
destroy() {
this._destroyed = true;
Expand All @@ -87,6 +96,7 @@ class _default {
this._onButtonFirstClickListener = null;
this._onMenuKeyDownListener = null;
this._onMenuItemSelectListener = null;
this._onMenuItemChangeListener = null;
this._onMutationListener = null;
}
}
Expand All @@ -112,14 +122,19 @@ function _onMenuKeyDown(e) {
}
}
function _onMenuItemSelect(e) {
const widget = this;
this._collapseMenuAfterTimeout();
this.el.dispatchEvent(new CustomEvent("makeup-menu-button-select", {
detail: e.detail
}));
}
function _onMenuItemChange(e) {
const {
el
} = e.detail;
setTimeout(function () {
widget._expander.expanded = false;
widget._buttonEl.focus();
}, 150);
this._collapseMenuAfterTimeout();
this.el.dispatchEvent(new CustomEvent("makeup-menu-button-change", {
detail: e.detail
}));
if (el.getAttribute("role") !== "menuitemradio") {
return;
}
Expand Down
32 changes: 25 additions & 7 deletions packages/ui/makeup-menu-button/dist/mjs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class index_default {
this._onButtonFirstClickListener = _onButtonFirstClick.bind(this);
this._onMenuKeyDownListener = _onMenuKeyDown.bind(this);
this._onMenuItemSelectListener = _onMenuItemSelect.bind(this);
this._onMenuItemChangeListener = _onMenuItemChange.bind(this);
this._onMutationListener = _onMutation.bind(this);
this.el.classList.add("menu-button--js");
if (!this._options.customElementMode) {
Expand Down Expand Up @@ -62,14 +63,21 @@ class index_default {
this._buttonEl.addEventListener("click", this._onButtonFirstClickListener, { once: true });
this.menu.el.addEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.addEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}
}
_unobserveEvents() {
this._buttonEl.removeEventListener("click", this._onButtonFirstClickListener);
this.menu.el.removeEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.removeEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}
// TODO: Move this logic to Expander as an option callback that runs after collapse.
_collapseMenuAfterTimeout() {
setTimeout(() => {
this._expander.expanded = false;
this._buttonEl.focus();
}, 150);
}
destroy() {
this._destroyed = true;
Expand All @@ -78,6 +86,7 @@ class index_default {
this._onButtonFirstClickListener = null;
this._onMenuKeyDownListener = null;
this._onMenuItemSelectListener = null;
this._onMenuItemChangeListener = null;
this._onMutationListener = null;
}
}
Expand All @@ -104,12 +113,21 @@ function _onMenuKeyDown(e) {
}
}
function _onMenuItemSelect(e) {
const widget = this;
this._collapseMenuAfterTimeout();
this.el.dispatchEvent(
new CustomEvent("makeup-menu-button-select", {
detail: e.detail
})
);
}
function _onMenuItemChange(e) {
const { el } = e.detail;
setTimeout(function() {
widget._expander.expanded = false;
widget._buttonEl.focus();
}, 150);
this._collapseMenuAfterTimeout();
this.el.dispatchEvent(
new CustomEvent("makeup-menu-button-change", {
detail: e.detail
})
);
if (el.getAttribute("role") !== "menuitemradio") {
return;
}
Expand Down
36 changes: 29 additions & 7 deletions packages/ui/makeup-menu-button/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default class {
this._onButtonFirstClickListener = _onButtonFirstClick.bind(this);
this._onMenuKeyDownListener = _onMenuKeyDown.bind(this);
this._onMenuItemSelectListener = _onMenuItemSelect.bind(this);
this._onMenuItemChangeListener = _onMenuItemChange.bind(this);
this._onMutationListener = _onMutation.bind(this);

this.el.classList.add("menu-button--js");
Expand Down Expand Up @@ -70,15 +71,23 @@ export default class {
this._buttonEl.addEventListener("click", this._onButtonFirstClickListener, { once: true });
this.menu.el.addEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.addEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.addEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}
}

_unobserveEvents() {
this._buttonEl.removeEventListener("click", this._onButtonFirstClickListener);
this.menu.el.removeEventListener("keydown", this._onMenuKeyDownListener);
this.menu.el.removeEventListener("makeup-menu-select", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemSelectListener);
this.menu.el.removeEventListener("makeup-menu-change", this._onMenuItemChangeListener);
}

// TODO: Move this logic to Expander as an option callback that runs after collapse.
_collapseMenuAfterTimeout() {
setTimeout(() => {
this._expander.expanded = false;
this._buttonEl.focus();
}, 150);
}

destroy() {
Expand All @@ -90,6 +99,7 @@ export default class {
this._onButtonFirstClickListener = null;
this._onMenuKeyDownListener = null;
this._onMenuItemSelectListener = null;
this._onMenuItemChangeListener = null;
this._onMutationListener = null;
}
}
Expand Down Expand Up @@ -120,13 +130,25 @@ function _onMenuKeyDown(e) {
}

function _onMenuItemSelect(e) {
const widget = this;
this._collapseMenuAfterTimeout();

this.el.dispatchEvent(
new CustomEvent("makeup-menu-button-select", {
detail: e.detail,
}),
);
}

function _onMenuItemChange(e) {
const { el } = e.detail;

setTimeout(function () {
widget._expander.expanded = false;
widget._buttonEl.focus();
}, 150);
this._collapseMenuAfterTimeout();

this.el.dispatchEvent(
new CustomEvent("makeup-menu-button-change", {
detail: e.detail,
}),
);

if (el.getAttribute("role") !== "menuitemradio") {
return;
Expand Down
Loading