Skip to content

Commit 46cb2e6

Browse files
fix: prevent content menu item click when disabled (#3188)
1 parent 3f9468b commit 46cb2e6

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/combobox/stories/app-mock-query-search.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ export class MockQueryCombobox {
2323
{ content: `Random ${Math.random()}` },
2424
{ content: `Random ${Math.random()}` },
2525
{ content: `Random ${Math.random()}` },
26-
{ content: `Random ${Math.random()}` },
26+
{ content: `Random ${Math.random()}` }
2727
];
2828

2929
// Include current selected in the list to avoid auto clear
3030
if (this.currentlySelected) {
31-
array.push(this.currentlySelected)
31+
array.push(this.currentlySelected);
3232
}
3333
this.filterItems = array;
3434
}, 1000);

src/context-menu/context-menu-item.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ export class ContextMenuItemComponent implements OnInit, AfterContentInit, OnDes
117117
@HostListener("click", ["$event"])
118118
handleClick(event: MouseEvent & KeyboardEvent) {
119119
event.stopPropagation();
120+
if (this.disabled) {
121+
return;
122+
}
120123
if (this.hasChildren) {
121124
this.openSubMenu();
122125
this.childContextMenu.focusMenu();

src/datepicker/datepicker.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ export class DatePicker implements
510510

511511
const calendarContainer = this.flatpickrInstance.calendarContainer;
512512
const dayElement = calendarContainer && calendarContainer.querySelector(".flatpickr-day[tabindex]");
513-
const selectedDateElem = calendarContainer && calendarContainer.querySelector('.selected');
514-
const todayDateElem = calendarContainer && calendarContainer.querySelector('.today');
513+
const selectedDateElem = calendarContainer && calendarContainer.querySelector(".selected");
514+
const todayDateElem = calendarContainer && calendarContainer.querySelector(".today");
515515

516516
if (dayElement) {
517517
(todayDateElem || selectedDateElem || dayElement).focus();
@@ -593,7 +593,7 @@ export class DatePicker implements
593593

594594
// add day classes and special case the "today" element based on `this.value`
595595
Array.from(dayContainer).forEach(element => {
596-
element.setAttribute('role', 'button');
596+
element.setAttribute("role", "button");
597597
element.classList.add("cds--date-picker__day");
598598
if (!this.value) {
599599
return;

0 commit comments

Comments
 (0)