From fc53e54de2a14a11ba591d80249de6593c127c25 Mon Sep 17 00:00:00 2001
From: Andy Boughton <abought@gmail.com>
Date: Tue, 8 Sep 2020 15:49:42 -0400
Subject: [PATCH] Bugfix: correctly remove label texts on toggle/re-render

---
 esm/components/data_layer/scatter.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/esm/components/data_layer/scatter.js b/esm/components/data_layer/scatter.js
index 791f103e..55f0abcd 100644
--- a/esm/components/data_layer/scatter.js
+++ b/esm/components/data_layer/scatter.js
@@ -245,7 +245,6 @@ class Scatter extends BaseDataLayer {
                 .append('g')
                 .attr('class', style_class);
 
-            // Render label texts
             if (this.label_texts) {
                 this.label_texts.remove();
             }
@@ -318,12 +317,15 @@ class Scatter extends BaseDataLayer {
                 .remove();
         } else {
             // If the layout definition has changed (& no longer specifies labels), strip any previously rendered
-            if (this.label_groups) {
-                this.label_groups.remove();
+            if (this.label_texts) {
+                this.label_texts.remove();
             }
             if (this.label_lines) {
                 this.label_lines.remove();
             }
+            if (this.label_groups) {
+                this.label_groups.remove();
+            }
         }
 
         // Generate main scatter data elements