Update perspective-python for new theme API

finos · Jan 29, 2022 · 69188d8 · 69188d8
1 parent 6ddb7d5
commit 69188d8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/packages/perspective-jupyterlab/src/js/psp_widget.js b/packages/perspective-jupyterlab/src/js/psp_widget.js
@@ -243,7 +243,6 @@ export class PerspectiveWidget extends Widget {
         this._server = server;
     }
 
-
     get editable() {
         return this._editable;
     }

diff --git a/packages/perspective-jupyterlab/src/js/view.js b/packages/perspective-jupyterlab/src/js/view.js
@@ -412,7 +412,6 @@ export class PerspectiveView extends DOMWidgetView {
             theme: this.model.get("theme"),
         });
     }
-    }
 
     editable_changed() {
         this.pWidget.editable = this.model.get("editable");

diff --git a/python/perspective/perspective/tests/viewer/test_viewer.py b/python/perspective/perspective/tests/viewer/test_viewer.py
@@ -74,12 +74,12 @@ def test_viewer_load_data_with_options(self):
 
     def test_viewer_load_clears_state(self):
         table = Table({"a": [1, 2, 3]})
-        viewer = PerspectiveViewer(dark=True, row_pivots=["a"])
+        viewer = PerspectiveViewer(theme="Material Dark", row_pivots=["a"])
         viewer.load(table)
         assert viewer.row_pivots == ["a"]
         viewer.load({"b": [1, 2, 3]})
         assert viewer.row_pivots == []
-        assert viewer.dark is True  # should not break UI
+        assert viewer.theme == "Material Dark"  # should not break UI
 
     def test_viewer_load_np(self):
         table = Table({"a": np.arange(1, 100)})

diff --git a/python/perspective/perspective/viewer/viewer.py b/python/perspective/perspective/viewer/viewer.py
@@ -66,7 +66,7 @@ def __init__(
         filter=None,
         expressions=None,
         plugin_config=None,
-        dark=None,
+        theme=None,
         editable=False,
     ):
         """Initialize an instance of `PerspectiveViewer` with the given viewer
@@ -96,7 +96,7 @@ def __init__(
                 select by default.
             plugin_config (:obj:`dict`): A configuration for the plugin, i.e.
                 the datagrid plugin or a chart plugin.
-            dark (:obj:`bool`): Whether to invert the color theme.
+            theme (:obj:`str`): The color theme to use.
             editable (:obj:`bool`): Whether to allow editability using the grid.
 
         Examples:
@@ -128,7 +128,7 @@ def __init__(
         self.filter = validate_filter(filter) or []
         self.expressions = validate_expressions(expressions) or []
         self.plugin_config = validate_plugin_config(plugin_config) or {}
-        self.dark = dark
+        self.theme = theme
         self.editable = editable
 
     @property

diff --git a/python/perspective/perspective/viewer/viewer_traitlets.py b/python/perspective/perspective/viewer/viewer_traitlets.py
@@ -44,7 +44,7 @@ class PerspectiveTraitlets(HasTraits):
     filter = List(default_value=[]).tag(sync=True)
     expressions = List(default_value=[]).tag(sync=True)
     plugin_config = Dict(default_value={}).tag(sync=True)
-    dark = Bool(None, allow_none=True).tag(sync=True)
+    theme = Unicode("Material Light", allow_none=True).tag(sync=True)
     editable = Bool(False).tag(sync=True)
     server = Bool(False).tag(sync=True)
     client = Bool(False).tag(sync=True)
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,7 +243,6 @@ export class PerspectiveWidget extends Widget { @@
             this._server = server;
         }
         get editable() {
             return this._editable;
         }
@@ Expand Down @@