From 08b19302d0c852aef8e0d0e6bd709aef6eee40e2 Mon Sep 17 00:00:00 2001 From: Ghislain Beaulac Date: Thu, 24 Oct 2019 13:32:05 -0400 Subject: [PATCH 1/2] fix(editor): use editorOptions only - deprecate elementOptions and use editorOptions --- src/app/examples/grid-angular.component.ts | 2 +- src/app/examples/grid-editor.component.ts | 2 +- .../modules/angular-slickgrid/editors/selectEditor.ts | 3 ++- .../angular-slickgrid/models/columnEditor.interface.ts | 10 +++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/examples/grid-angular.component.ts b/src/app/examples/grid-angular.component.ts index 03c3253b5..f22b96322 100644 --- a/src/app/examples/grid-angular.component.ts +++ b/src/app/examples/grid-angular.component.ts @@ -180,7 +180,7 @@ export class GridAngularComponent implements OnInit { label: 'label', labelSuffix: 'symbol' }, - elementOptions: { + editorOptions: { maxHeight: 400 } }, diff --git a/src/app/examples/grid-editor.component.ts b/src/app/examples/grid-editor.component.ts index 5ebbadfcf..a10ad90e4 100644 --- a/src/app/examples/grid-editor.component.ts +++ b/src/app/examples/grid-editor.component.ts @@ -239,7 +239,7 @@ export class GridEditorComponent implements OnInit { value: 0, operator: OperatorType.notEqual }, - elementOptions: { + editorOptions: { maxHeight: 400 } }, diff --git a/src/app/modules/angular-slickgrid/editors/selectEditor.ts b/src/app/modules/angular-slickgrid/editors/selectEditor.ts index 7fe9c4021..aaa7f8ca2 100644 --- a/src/app/modules/angular-slickgrid/editors/selectEditor.ts +++ b/src/app/modules/angular-slickgrid/editors/selectEditor.ts @@ -604,7 +604,8 @@ export class SelectEditor implements Editor { this.$editorElm.addClass('form-control'); } else { const elementOptions = (this.columnDef.internalColumnEditor) ? this.columnDef.internalColumnEditor.elementOptions : {}; - this.editorElmOptions = { ...this.defaultOptions, ...elementOptions }; + const editorOptions = (this.columnDef.internalColumnEditor) ? this.columnDef.internalColumnEditor.editorOptions : {}; + this.editorElmOptions = { ...this.defaultOptions, ...elementOptions, ...editorOptions }; this.$editorElm = this.$editorElm.multipleSelect(this.editorElmOptions); setTimeout(() => this.show()); } diff --git a/src/app/modules/angular-slickgrid/models/columnEditor.interface.ts b/src/app/modules/angular-slickgrid/models/columnEditor.interface.ts index 33262d504..190fc625f 100644 --- a/src/app/modules/angular-slickgrid/models/columnEditor.interface.ts +++ b/src/app/modules/angular-slickgrid/models/columnEditor.interface.ts @@ -51,6 +51,13 @@ export interface ColumnEditor { */ editorOptions?: MultipleSelectOption | any; + + /** + * @deprecated please use "editorOptions" property instead. + * DOM element extra options. + */ + elementOptions?: any; + /** * Defaults to false, when set it will render any HTML code instead of removing it (sanitized) * Only used so far in the MultipleSelect & SingleSelect Filters will support it @@ -99,9 +106,6 @@ export interface ColumnEditor { /** Step value of the filter, works only with Filters supporting it (input text, number, float, range, slider) */ valueStep?: number | string; - /** DOM element extra options */ - elementOptions?: any; - /** * Use "params" to pass any type of arguments to your Custom Editor * or regular Editor like the Editors.float From db55c8999bac75d5795777241ff07ea6a6e711fc Mon Sep 17 00:00:00 2001 From: Ghislain Beaulac Date: Thu, 24 Oct 2019 14:27:57 -0400 Subject: [PATCH 2/2] refactor(e2e): fix failing Cypress test --- test/cypress/integration/example9.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cypress/integration/example9.spec.js b/test/cypress/integration/example9.spec.js index 5df716117..fbf7363b2 100644 --- a/test/cypress/integration/example9.spec.js +++ b/test/cypress/integration/example9.spec.js @@ -25,7 +25,7 @@ describe('Example 9 - Grid Menu', () => { .children('.slick-header-menubutton') .should('be.hidden') .invoke('show') - .click(); + .trigger('click', { force: true }); cy.get('.slick-header-menu') .should('be.visible') @@ -76,7 +76,7 @@ describe('Example 9 - Grid Menu', () => { .children('.slick-header-menubutton') .should('be.hidden') .invoke('show') - .click(); + .trigger('click', { force: true }); cy.get('.slick-header-menu') .should('be.visible') @@ -147,7 +147,7 @@ describe('Example 9 - Grid Menu', () => { .children('.slick-header-menubutton') .should('be.hidden') .invoke('show') - .click(); + .trigger('click', { force: true }); cy.get('.slick-header-menu') .should('be.visible') @@ -192,7 +192,7 @@ describe('Example 9 - Grid Menu', () => { .children('.slick-header-menubutton') .should('be.hidden') .invoke('show') - .click(); + .trigger('click', { force: true }); cy.get('.slick-header-menu') .should('be.visible')