diff --git a/.eslintrc b/.eslintrc index 0e98a92f..1f883e38 100644 --- a/.eslintrc +++ b/.eslintrc @@ -5,7 +5,7 @@ ], "env": { "browser": true, - "es2015": true, + "es6": true, "node": true }, "globals": { diff --git a/controls/slick.columnpicker.js b/controls/slick.columnpicker.js index 3f50e70c..281afdc3 100644 --- a/controls/slick.columnpicker.js +++ b/controls/slick.columnpicker.js @@ -110,7 +110,7 @@ } function handleBodyMouseDown(e) { - if ((_menuElm !== e.target && !_menuElm.contains(e.target)) || e.target.className === 'close') { + if ((_menuElm !== e.target && !(_menuElm && _menuElm.contains(e.target))) || e.target.className === 'close') { _menuElm.setAttribute('aria-expanded', 'false'); _menuElm.style.display = 'none'; } diff --git a/cypress/integration/example-plugin-contextmenu.spec.js b/cypress/integration/example-plugin-contextmenu.spec.js index 76af42e6..a99eeded 100644 --- a/cypress/integration/example-plugin-contextmenu.spec.js +++ b/cypress/integration/example-plugin-contextmenu.spec.js @@ -56,6 +56,12 @@ describe('Example - Context Menu & Cell Menu', () => { .find('.slick-row .slick-cell:nth(1)') .rightclick(); + cy.get('.slick-context-menu-command-list') + .should('exist'); + + cy.get('.slick-context-menu-option-list') + .should('not.exist'); + cy.window().then((win) => { expect(win.console.log).to.have.callCount(2); expect(win.console.log).to.be.calledWith('Before the global Context Menu is shown'); @@ -118,13 +124,16 @@ describe('Example - Context Menu & Cell Menu', () => { .find('.slick-row .slick-cell:nth(5)') .rightclick(); + cy.get('.slick-context-menu-command-list') + .should('not.exist'); + + cy.get('.slick-context-menu-option-list') + .should('exist'); + cy.get('.slick-context-menu .slick-context-menu-option-list') .contains('High') .click(); - cy.get('.slick-context-menu-command-list') - .should('not.exist'); - cy.get('#myGrid') .find('.slick-row .slick-cell:nth(7)') .contains('Action') diff --git a/examples/example-plugin-contextmenu.html b/examples/example-plugin-contextmenu.html index 90c97279..4be0aee5 100644 --- a/examples/example-plugin-contextmenu.html +++ b/examples/example-plugin-contextmenu.html @@ -158,9 +158,6 @@