Merge pull request #45 from channeladam/fix-short-circuit-draw-visibl…

…e-in-labeljs

FIX #44 - correctly set invalid labels to undefined

lib/network/modules/components/shared/Label.js

@@ -39,7 +39,7 @@ class Label {
       this.labelDirty = true
     } else {
       // Bad label! Change the option value to prevent bad stuff happening
-      options.label = ''
+      options.label = undefined
     }
 
     if (options.font !== undefined && options.font !== null) {

test/Label.test.js

@@ -11,6 +11,8 @@
  */
 var assert = require('assert')
 var Label = require('../lib/network/modules/components/shared/Label').default
+var ComponentUtil = require('../lib/network/modules/components/shared/ComponentUtil')
+  .default
 var NodesHandler = require('../lib/network/modules/NodesHandler').default
 var util = require('../lib/util')
 var canvasMockify = require('./canvas-mock')
@@ -1843,4 +1845,43 @@ describe('Network Label', function() {
 
     done()
   })
+
+  describe('visible function', function() {
+    it('correctly determines label is not visible when label is invalid', function(done) {
+      var invalidLabel = ''
+      assert(
+        !ComponentUtil.isValidLabel(invalidLabel),
+        'An empty string should be identified as an invalid label'
+      )
+
+      var body = {
+        view: {
+          scale: 1
+        }
+      }
+
+      var options = {
+        label: invalidLabel,
+        font: {
+          size: 12
+        },
+        scaling: {
+          label: {
+            drawThreshold: 1
+          }
+        }
+      }
+
+      var label = new Label(body, options)
+      label.size.width = 1
+      label.size.height = 1
+
+      assert(
+        !label.visible(),
+        'Label should not be visible because the label text is invalid'
+      )
+
+      done()
+    })
+  })
 })