Skip to content

Commit 9190843

Browse files
authored
fix: interface for controls/plugins w/Formatter might return HTMLElement (#911)
1 parent 5c4fb0a commit 9190843

File tree

7 files changed

+109
-98
lines changed

7 files changed

+109
-98
lines changed

src/controls/slick.columnmenu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export class SlickColumnMenu {
157157

158158
const labelElm = document.createElement('label');
159159
labelElm.htmlFor = `${this._gridUid}colpicker-${columnId}`;
160-
labelElm.innerHTML = this.grid.sanitizeHtmlString(columnLabel);
160+
labelElm.innerHTML = this.grid.sanitizeHtmlString(columnLabel instanceof HTMLElement ? columnLabel.innerHTML : columnLabel);
161161
liElm.appendChild(labelElm);
162162
this._listElm.appendChild(liElm);
163163
}

src/controls/slick.columnpicker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class SlickColumnPicker {
158158

159159
const labelElm = document.createElement('label');
160160
labelElm.htmlFor = `${this._gridUid}colpicker-${columnId}`;
161-
labelElm.innerHTML = this.grid.sanitizeHtmlString(columnLabel);
161+
labelElm.innerHTML = this.grid.sanitizeHtmlString(columnLabel instanceof HTMLElement ? columnLabel.innerHTML : columnLabel);
162162
liElm.appendChild(labelElm);
163163
this._listElm.appendChild(liElm);
164164
}

src/controls/slick.gridmenu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ export class SlickGridMenu {
592592

593593
const labelElm = document.createElement('label');
594594
labelElm.htmlFor = `${this._gridUid}-gridmenu-colpicker-${columnId}`;
595-
labelElm.innerHTML = this.grid.sanitizeHtmlString(columnLabel || '');
595+
labelElm.innerHTML = this.grid.sanitizeHtmlString((columnLabel instanceof HTMLElement ? columnLabel.innerHTML : columnLabel) || '');
596596
liElm.appendChild(labelElm);
597597
this._listElm.appendChild(liElm);
598598
}

src/models/columnPicker.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface ColumnPickerOption {
3333
syncResizeTitle?: string;
3434

3535
/** Callback method to override the column name output used by the ColumnPicker/GridMenu. */
36-
headerColumnValueExtractor?: (column: Column, gridOptions?: GridOption) => string;
36+
headerColumnValueExtractor?: (column: Column, gridOptions?: GridOption) => string | HTMLElement;
3737
}
3838

3939
export interface OnColumnsChangedArgs {

src/models/gridMenuOption.interface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export interface GridMenuOption {
8686
// action/override callbacks
8787

8888
/** Callback method to override the column name output used by the ColumnPicker/GridMenu. */
89-
headerColumnValueExtractor?: (column: Column, gridOptions?: GridOption) => string;
89+
headerColumnValueExtractor?: (column: Column, gridOptions?: GridOption) => string | HTMLElement;
9090

9191
/** Callback method that user can override the default behavior of enabling/disabling an item from the list. */
9292
menuUsabilityOverride?: (args: MenuCallbackArgs<any>) => boolean;

0 commit comments

Comments
 (0)