Skip to content

safeguard against the lack of disclosure menu in a matrix field #18372

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
brandonkelly merged 3 commits into from
Feb 3, 2026
+6 −5
Merged

safeguard against the lack of disclosure menu in a matrix field #18372

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
8bf0687
safeguard against the lack of disclosure menu in a matrix field
i-just Feb 3, 2026
0078983
Merge branch '5.x' into bugfix/18366-matrix-field-with-hidden-label
brandonkelly Feb 3, 2026
5a5e72d
Release note
brandonkelly Feb 3, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Fixed a bug where newly-selected elements weren’t being rendered correctly for relational fields set to the “Card grid” view mode. ([#18362](https://github.com/craftcms/cms/issues/18362))
- Fixed a bug where card previews weren’t getting updated when a selected field was removed from the field layout.
- Fixed potential JavaScript errors that could occur if a disclosure menu’s trigger or target elements were missing. ([#18358](https://github.com/craftcms/cms/issues/18358))
- Fixed a JavaScript error that occurred if a Matrix field’s label was hidden. ([#18366](https://github.com/craftcms/cms/issues/18366))
- Fixed an infinite recursion bug. ([#18363](https://github.com/craftcms/cms/issues/18363))

## 5.9.5 - 2026-01-31
Expand Down
10 changes: 5 additions & 5 deletions src/fields/Matrix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ private function blockViewActionMenuItems(): array

setTimeout(() => {
const disclosureMenu = menu.data('disclosureMenu');
disclosureMenu.on('show', () => {
disclosureMenu?.on('show', () => {
let blocks = getBlocks();
let expandLabel, collapseLabel;
if (blocks.is('.sel')) {
Expand Down Expand Up @@ -1030,7 +1030,7 @@ private function copyAction(string $type, string $entrySelector): array

if (!field.length) {
setTimeout(() => {
menu.data('disclosureMenu').removeItem(btn[0]);
menu.data('disclosureMenu')?.removeItem(btn[0]);
}, 1);
return;
}
Expand All @@ -1057,7 +1057,7 @@ private function copyAction(string $type, string $entrySelector): array

setTimeout(() => {
const disclosureMenu = menu.data('disclosureMenu');
disclosureMenu.on('show', () => {
disclosureMenu?.on('show', () => {
const entries = getEntries();
let copyLabel;
if ($(entries).is('.sel')) {
Expand Down Expand Up @@ -1134,7 +1134,7 @@ private function bulkAction(string $entrySelector, string $activateJs, array $it

if (!field.length) {
setTimeout(() => {
menu.data('disclosureMenu').removeItem(btn[0]);
menu.data('disclosureMenu')?.removeItem(btn[0]);
}, 1);
return;
}
Expand All @@ -1147,7 +1147,7 @@ private function bulkAction(string $entrySelector, string $activateJs, array $it

setTimeout(() => {
const disclosureMenu = menu.data('disclosureMenu');
disclosureMenu.on('show', () => {
disclosureMenu?.on('show', () => {
disclosureMenu.toggleItem(btn[0], !!getEntries().length);
});
}, 1);
Expand Down