Skip to content
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
13 changes: 8 additions & 5 deletions js/datagrid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ import {
DOMWidgetView,
ICallbacks,
ISerializers,
// @ts-ignore needed for ipywidgetx 8.x compatibility
JupyterLuminoPanelWidget,
//@ts-ignore needed for ipywidgetx 7.x compatibility
// @ts-ignore needed for ipywidgetx 7.x compatibility
JupyterPhosphorPanelWidget,
resolvePromisesDict,
unpack_models,
Expand Down Expand Up @@ -348,7 +349,7 @@ export class DataGridView extends DOMWidgetView {
return this.luminoWidget.node;
}

// Added for ipywidgets 7.x compatibility
// @ts-ignore Added for ipywidgets 7.x compatibility
get pWidget(): any {
return this.luminoWidget;
}
Expand All @@ -371,7 +372,7 @@ export class DataGridView extends DOMWidgetView {
// ipywidgets 7 compatibility
_processLuminoMessage(
msg: Message,
_super: DOMWidgetView['processLuminoMessage'],
_super: any,
): void {
_super.call(this, msg);

Expand All @@ -385,11 +386,12 @@ export class DataGridView extends DOMWidgetView {
}

processLuminoMessage(msg: Message): void {
// @ts-ignore needed for ipywidgets 8.x compatibility
this._processLuminoMessage(msg, super.processLuminoMessage);
}

processPhosphorMessage(msg: Message): void {
//@ts-ignore needed for ipywidgets 7.x compatibility
// @ts-ignore needed for ipywidgets 7.x compatibility
this._processLuminoMessage(msg, super.processPhosphorMessage);
}

Expand Down Expand Up @@ -722,6 +724,7 @@ export class DataGridView extends DOMWidgetView {
default_renderer: CellRendererView;
header_renderer: CellRendererView;
grid: FeatherGrid;
// @ts-ignore needed for ipywidgetx 8.x compatibility
luminoWidget: JupyterLuminoPanelWidget;
model: DataGridModel;
backboneModel: DataGridModel;
Expand Down Expand Up @@ -766,7 +769,7 @@ export namespace DataGridModel {
*/
namespace Private {
export function getWidgetPanel(): any {
//@ts-ignore needed for ipywidget 7.x compatibility
// @ts-ignore needed for ipywidget 7.x compatibility
return JupyterLuminoPanelWidget ?? JupyterPhosphorPanelWidget;
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@lumino/messaging": "^1.9.0",
"@lumino/virtualdom": "^1.13.0",
"@lumino/widgets": "^1.28.0",
"bqplot": "^0.4.6",
"bqplot": "^0.5",
"d3-array": "^2.2.0",
"d3-color": "^3.1.0",
"d3-format": "^1.3.2",
Expand Down
Loading