Upgrade vega versions in tfjs-vis

tfjs-vis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tensorflow/tfjs-vis",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Utilities for in browser visualization with TensorFlow.js",
   "repository": "https://github.com/tensorflow/tfjs-vis",
   "license": "Apache-2.0",
@@ -24,12 +24,12 @@
     "d3-selection": "~1.3.0",
     "glamor": "~2.20.40",
     "preact": "~8.2.9",
-    "vega": "5.4.0",
-    "vega-embed": "5.1.2",
-    "vega-lite": "4.0.2"
+    "vega": "5.12.3",
+    "vega-embed": "6.8.0",
+    "vega-lite": "4.13.1"
   },
   "devDependencies": {
-    "@tensorflow/tfjs": "~1.0.0",
+    "@tensorflow/tfjs": "~1.7.4",
     "@types/d3-format": "~1.3.0",
     "@types/d3-selection": "~1.3.2",
     "@types/jasmine": "~2.8.8",

tfjs-vis/src/render/confusion_matrix.ts

@@ -155,6 +155,7 @@ export async function confusionMatrix(
         'titleFontSize': options.fontSize,
       }
     },
+    //@ts-ignore
     'data': {'values': values},
     'encoding': {
       'x': {
@@ -185,6 +186,7 @@ export async function confusionMatrix(
           'color': {
             'field': 'scaleCount',
             'type': 'quantitative',
+            //@ts-ignore
             'scale': {'range': options.colorMap},
           },
           'tooltip': [

tfjs-vis/src/render/heatmap.ts

@@ -161,6 +161,7 @@ export async function heatmap(
       },
       'scale': {'bandPaddingInner': 0, 'bandPaddingOuter': 0},
     },
+    //@ts-ignore
     'data': {'values': values},
     'mark': {'type': 'rect', 'tooltip': true},
     'encoding': {
@@ -228,12 +229,14 @@ export async function heatmap(
   }
 
   if (colorRange !== 'viridis') {
+    //@ts-ignore
     const fill = spec.encoding.fill;
     // @ts-ignore
     fill.scale = {'range': colorRange};
   }
 
   if (options.domain) {
+    //@ts-ignore
     const fill = spec.encoding.fill;
     // @ts-ignore
     if (fill.scale != null) {

tfjs-vis/src/render/histogram.ts

@@ -74,6 +74,11 @@ export async function histogram(
     renderStats(stats, statsContainer, {fontSize: options.fontSize});
   }
 
+  // If there are no data values return early
+  if (values.length === 0) {
+    return undefined;
+  }
+
   // Now that we have rendered stats we need to remove any NaNs and Infinities
   // before rendering the histogram
   const filtered = [];

tfjs-vis/src/render/histogram_test.ts

@@ -147,7 +147,7 @@ describe('renderHistogram', () => {
       await histogram(container, data);
     }).not.toThrow();
 
-    expect(document.querySelectorAll('.vega-embed').length).toBe(1);
+    expect(document.querySelectorAll('.vega-embed').length).toBe(0);
     expect(document.querySelectorAll('table').length).toBe(1);
     expect(document.querySelectorAll('table thead tr').length).toBe(1);
     expect(document.querySelectorAll('table thead th').length).toBe(3);

tfjs-vis/src/render/scatterplot.ts

@@ -115,6 +115,7 @@ export async function scatterplot(
         'titleFontSize': options.fontSize,
       }
     },
+    //@ts-ignore
     'data': {
       'values': values,
     },