Skip to content

Commit c07b2d5

Browse files
authored
Merge pull request #151 from QuantStack/ky/conditionfix
Fix filter by Condition from menu
2 parents 72d028e + 4b8082d commit c07b2d5

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

src/core/filterMenu.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,11 @@ export class InteractiveFilterDialog extends BoxPanel {
135135
return;
136136
}
137137

138-
if (!this.hasFilter && !this.userInteractedWithDialog) {
138+
if (
139+
!this.hasFilter &&
140+
!this.userInteractedWithDialog &&
141+
this._mode === 'value'
142+
) {
139143
this.close();
140144
return;
141145
}

src/feathergrid.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export class FeatherGrid extends Widget {
224224
textColor: Theme.getFontColor(1),
225225
backgroundColor: Theme.getBackgroundColor(2),
226226
horizontalAlignment: 'center',
227-
verticalAlignment: 'center'
227+
verticalAlignment: 'center',
228228
});
229229

230230
const layout = (this.layout = new PanelLayout());
@@ -750,19 +750,21 @@ export class FeatherGrid extends Widget {
750750
*
751751
* @param config - CellConfig for the cell to be rendered.
752752
*/
753-
private _rendererResolver(config: CellRenderer.CellConfig): CellRenderer {
754-
const columnName: string = config.metadata['name'];
755-
const cellRegion: string = config['region'];
756-
return this._renderers.hasOwnProperty(columnName)
757-
? this._renderers[columnName]
758-
: cellRegion === 'row-header'
759-
? this._rowHeaderRenderer
760-
: this._defaultRenderer;
761-
}
753+
private _rendererResolver(config: CellRenderer.CellConfig): CellRenderer {
754+
const columnName: string = config.metadata['name'];
755+
const cellRegion: string = config['region'];
756+
return this._renderers.hasOwnProperty(columnName)
757+
? this._renderers[columnName]
758+
: cellRegion === 'row-header'
759+
? this._rowHeaderRenderer
760+
: this._defaultRenderer;
761+
}
762762

763763
private _updateGridRenderers() {
764764
this.grid.cellRenderers.update({ body: this._rendererResolver.bind(this) });
765-
this.grid.cellRenderers.update({ 'row-header': this._rendererResolver.bind(this) });
765+
this.grid.cellRenderers.update({
766+
'row-header': this._rendererResolver.bind(this),
767+
});
766768
}
767769

768770
private _updateColumnWidths() {

0 commit comments

Comments
 (0)