Merge pull request #2352 from finos/jlab-fixes

Fix Jupyter plugin resize behavior
finos · Aug 31, 2023 · 01cbbb0 · 01cbbb0
2 parents bec2442 + 085dc44
commit 01cbbb0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -3,4 +3,5 @@ build/
 node_modules/
 target/
 .emsdk/
-boost*/
+boost*/
+py_modules/
diff --git a/cmake/arrow/CMakeLists.txt b/cmake/arrow/CMakeLists.txt
@@ -210,7 +210,7 @@ set(ARROW_SRCS
     # ${CMAKE_BINARY_DIR}/arrow-src/cpp/src/arrow/compute/exec/task_util.cc
 )
 
-if(PSP_PYTHON_BUILD)
+if(PSP_PYTHON_BUILD AND NOT PSP_PYODIDE)
     set(ARROW_SRCS
         ${ARROW_SRCS}
         # use standard reader in Python builds.

diff --git a/packages/perspective-jupyterlab/src/less/index.less b/packages/perspective-jupyterlab/src/less/index.less
@@ -14,13 +14,17 @@
 
 div.PSPContainer {
     overflow: auto;
-    resize: both;
     padding-right: 5px;
     padding-bottom: 5px;
     height: 100%;
+    width: 100%;
     flex: 1;
 }
 
+.jp-Notebook div.PSPContainer {
+    resize: vertical;
+}
+
 // Widget height for Jupyterlab
 .jp-NotebookPanel-notebook div.PSPContainer {
     height: 520px;
@@ -32,11 +36,6 @@ div.PSPContainer {
     margin: auto;
 }
 
-// Widget height for Voila
-.jp-OutputArea-output div.PSPContainer {
-    height: 520px;
-}
-
 // Widget height for Jupyter Notebook
 .jupyter-widgets-view div.PSPContainer {
     height: 520px;

diff --git a/python/perspective/setup.py b/python/perspective/setup.py
@@ -311,6 +311,11 @@ def run_check(self):
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Framework :: Jupyter :: JupyterLab",
+        "Framework :: Jupyter :: JupyterLab :: 3",
+        "Framework :: Jupyter :: JupyterLab :: Extensions",
+        "Framework :: Jupyter :: JupyterLab :: Extensions :: Mime Renderers",
+        "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
     ],
     keywords="analytics tools plotting",
     packages=find_packages(exclude=["bench", "bench.*"]),
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,5 @@ build/ @@
     node_modules/
     target/
     .emsdk/
-    boost*/
+    boost*/
+    py_modules/