Changes for compatibility with Vega5 and altair 4 (#892)

holoviz · Dec 19, 2019 · c1a9184 · c1a9184
1 parent 6c1d370
commit c1a9184
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/panel/models/vega.py b/panel/models/vega.py
@@ -12,14 +12,14 @@ class VegaPlot(LayoutDOM):
     """
 
     __javascript__ = ["https://cdn.jsdelivr.net/npm/vega@5",
-                      'https://cdn.jsdelivr.net/npm/vega-lite@3',
+                      'https://cdn.jsdelivr.net/npm/vega-lite@4',
                       'https://cdn.jsdelivr.net/npm/vega-embed@6']
 
     __js_require__ = {
         'baseUrl': 'https://cdn.jsdelivr.net/npm/',
         'paths': {
             "vega-embed":  "vega-embed@6/build/vega-embed.min",
-            "vega-lite": "vega-lite@3/build/vega-lite.min",
+            "vega-lite": "vega-lite@4/build/vega-lite.min",
             "vega": "vega@5/build/vega.min"
         },
         'exports': {'vega-embed': 'vegaEmbed', 'vega': 'vega', 'vega-lite': 'vl'}

diff --git a/panel/pane/vega.py b/panel/pane/vega.py
@@ -103,13 +103,19 @@ def _get_dimensions(cls, json, props):
         if json is None:
             return
 
-        view = {}
-        if 'width' in json:
-            view['width'] = json['width']
-        if 'height' in json:
-            view['height'] = json['height']
         if 'config' in json and 'view' in json['config']:
-            view = json['config']['view']
+            size_config = json['config']['view']
+        else:
+            size_config = json
+
+        view = {}
+        for w in ('width', 'continuousWidth'):
+            if w in size_config:
+                view['width'] = size_config[w]
+        for h in ('height', 'continuousHeight'):
+            if h in size_config:
+                view['height'] = size_config[h]
+
         for p in ('width', 'height'):
             if p not in view:
                 continue