fix(WidgetManager): Incorrect handling of widget visibility with vdom

Kitware · Dec 4, 2019 · fe76565 · fe76565
1 parent 7ff12ac
commit fe76565
Showing 1 changed file with 27 additions and 30 deletions.
diff --git a/Sources/Widgets/Core/WidgetManager/index.js b/Sources/Widgets/Core/WidgetManager/index.js
@@ -137,43 +137,40 @@ function vtkWidgetManager(publicAPI, model) {
           .getRepresentations()
           .filter((r) => r.isA('vtkSVGRepresentation'));
 
-        if (widget.getVisibility() && svgReps.length) {
-          const pendingContent = svgReps
+        let pendingContent = [];
+        if (widget.getVisibility()) {
+          pendingContent = svgReps
             .filter((r) => r.getVisibility())
             .map((r) => r.render());
-          Promise.all(pendingContent).then((vnodes) => {
-            const oldVTree = svgVTrees.get(widget);
-            const newVTree = createSvgElement('g');
-            for (let ni = 0; ni < vnodes.length; ni++) {
-              newVTree.appendChild(vnodes[ni]);
-            }
+        }
 
-            const widgetGroup = widgetToSvgMap.get(widget);
-            let node = widgetGroup;
+        Promise.all(pendingContent).then((vnodes) => {
+          const oldVTree = svgVTrees.get(widget);
+          const newVTree = createSvgElement('g');
+          for (let ni = 0; ni < vnodes.length; ni++) {
+            newVTree.appendChild(vnodes[ni]);
+          }
 
-            const patchFns = diff(oldVTree, newVTree);
-            for (let j = 0; j < patchFns.length; j++) {
-              node = patchFns[j](node);
-            }
+          const widgetGroup = widgetToSvgMap.get(widget);
+          let node = widgetGroup;
 
-            if (!widgetGroup && node) {
-              // add
-              model.svgRoot.appendChild(node);
-              widgetToSvgMap.set(widget, node);
-            } else if (widgetGroup && !node) {
-              // delete
-              widgetGroup.remove();
-              widgetToSvgMap.delete(widget);
-            }
+          const patchFns = diff(oldVTree, newVTree);
+          for (let j = 0; j < patchFns.length; j++) {
+            node = patchFns[j](node);
+          }
 
-            svgVTrees.set(widget, newVTree);
-          });
-        } else {
-          const g = widgetToSvgMap.get(widget);
-          if (g) {
-            g.innerHTML = '';
+          if (!widgetGroup && node) {
+            // add
+            model.svgRoot.appendChild(node);
+            widgetToSvgMap.set(widget, node);
+          } else if (widgetGroup && !node) {
+            // delete
+            widgetGroup.remove();
+            widgetToSvgMap.delete(widget);
           }
-        }
+
+          svgVTrees.set(widget, newVTree);
+        });
       }
     }
   }