Merge pull request #326 from ghiscoding/bugfix/editor-options

fix(editor): use editorOptions only

Author: ghiscoding

src/app/examples/grid-angular.component.ts

@@ -180,7 +180,7 @@ export class GridAngularComponent implements OnInit {
             label: 'label',
             labelSuffix: 'symbol'
           },
-          elementOptions: {
+          editorOptions: {
             maxHeight: 400
           }
         },

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
           }
         },

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());
     }

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

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,6 @@ describe('Example 9 - Grid Menu', () => {
         .children('.slick-header-menubutton')
         .should('be.hidden')
         .invoke('show')
-        .click()
         .trigger('click', { force: true });
 
       cy.get('.slick-header-menu')