Merge pull request #779 from finos/jl-fixes

Fixes jupyterlab plugin regressions
finos · Oct 24, 2019 · 7f02f09 · 7f02f09
2 parents bfbda9c + d5dfac7
commit 7f02f09
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/packages/perspective-jupyterlab/README.md b/packages/perspective-jupyterlab/README.md
@@ -9,6 +9,7 @@ This extension allows in-lining perspective based charts in jupyterlab notebooks
 ### From npm
 
 ```bash
+jupyter labextension install @jupyter-widgets/jupyterlab-manager
 jupyter labextension install @finos/perspective-jupyterlab
 ```
 

diff --git a/packages/perspective-jupyterlab/src/less/index.less b/packages/perspective-jupyterlab/src/less/index.less
@@ -1,3 +1,5 @@
+@import "~@finos/perspective-viewer/src/less/variables.less";
+
 div.PSPContainer,
 div.PSPContainer-dark {
     overflow: auto;
@@ -8,6 +10,14 @@ div.PSPContainer-dark {
     flex: 1;
 }
 
+div.PSPContainer {
+    @import "~@finos/perspective-viewer/src/themes/material.less";
+}
+
+div.PSPContainer-dark {
+    @import "~@finos/perspective-viewer/src/themes/material.dark.less";
+}
+
 div.PSPContainer perspective-viewer,
 div.PSPContainer-dark perspective-viewer {
     display: block;

diff --git a/packages/perspective-jupyterlab/src/ts/index.ts b/packages/perspective-jupyterlab/src/ts/index.ts
@@ -17,3 +17,5 @@ export * from "./widget";
 /* css */
 import "!!style-loader!css-loader!less-loader!../less/index.less";
 
+import "@finos/perspective-viewer-hypergrid";
+import "@finos/perspective-viewer-highcharts";
diff --git a/packages/perspective-viewer-hypergrid/src/js/perspective-plugin.js b/packages/perspective-viewer-hypergrid/src/js/perspective-plugin.js
@@ -112,6 +112,7 @@ function setPSP(payload, force = false) {
     ) {
         this.grid.sbVScroller.index = 0;
         this.grid.behavior.dataModel.data = payload.rows;
+        this.grid.behavior.dataModel._data_window = undefined;
     } else {
         this.grid.sbVScroller.index = 0;
         this.grid.sbHScroller.index = 0;