Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/app/examples/grid-angular.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class GridAngularComponent implements OnInit {
label: 'label',
labelSuffix: 'symbol'
},
elementOptions: {
editorOptions: {
maxHeight: 400
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/app/examples/grid-editor.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export class GridEditorComponent implements OnInit {
value: 0,
operator: OperatorType.notEqual
},
elementOptions: {
editorOptions: {
maxHeight: 400
}
},
Expand Down
3 changes: 2 additions & 1 deletion src/app/modules/angular-slickgrid/editors/selectEditor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions test/cypress/integration/example9.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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')
Expand Down