Fixed part of the problem reported in #16, resize and use svgPanZoom …

…only when visible
bupaverse · Jun 7, 2019 · 29ee7a5 · 29ee7a5
1 parent a9b7f34
commit 29ee7a5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 11 deletions.
diff --git a/inst/htmlwidgets/lib/modules/animation_playback_control.js b/inst/htmlwidgets/lib/modules/animation_playback_control.js
@@ -1,5 +1,5 @@
 /*
-processanimateR 1.0.1.9000
+processanimateR 1.0.1
 Copyright (c) 2018 Felix Mannhardt
 Licensed under MIT license
 */

diff --git a/inst/htmlwidgets/lib/modules/animation_renderer_graphviz.js b/inst/htmlwidgets/lib/modules/animation_renderer_graphviz.js
@@ -1,5 +1,5 @@
 /*
-processanimateR 1.0.1.9000
+processanimateR 1.0.1
 Copyright (c) 2018 Felix Mannhardt
 Licensed under MIT license
 */
@@ -8,6 +8,24 @@ function RendererGraphviz(el, data) {
   var svg = null;
   var svgPan = null;
 
+  // source https://stackoverflow.com/questions/178325/how-do-i-check-if-an-element-is-hidden-in-jquery/11511035#11511035
+  function isRendered(domObj) {
+      if ((domObj.nodeType != 1) || (domObj == document.body)) {
+          return true;
+      }
+      if (domObj.currentStyle && domObj.currentStyle.display != "none" &&
+            domObj.currentStyle.visibility != "hidden") {
+          return isRendered(domObj.parentNode);
+      } else if (window.getComputedStyle) {
+          var cs = document.defaultView.getComputedStyle(domObj, null);
+          if (cs.getPropertyValue("display") != "none" &&
+                cs.getPropertyValue("visibility") != "hidden") {
+              return isRendered(domObj.parentNode);
+          }
+      }
+      return false;
+  }
+
   this.getSvg = function() {
     return svg;
   };
@@ -81,7 +99,9 @@ function RendererGraphviz(el, data) {
 
         postRender(svg);
 
-        svgPan = svgPanZoom(svg, { dblClickZoomEnabled: false, preventEventsDefaults: true });
+        if (isRendered(svg)) {
+          svgPan = svgPanZoom(svg, { dblClickZoomEnabled: false, preventEventsDefaults: true });
+        }
 
       }
     ).catch(function(error) {
@@ -103,12 +123,17 @@ function RendererGraphviz(el, data) {
     svg.setAttribute("width", width);
     svg.setAttribute("height", height);
 
-    if (svgPan) {
-      svgPan.resize();
-      if (height > 0) {
-        svgPan.fit();
+
+    if (isRendered(svg)) {
+      if (svgPan) {
+        svgPan.resize();
+        if (height > 0) {
+          svgPan.fit();
+        }
+        svgPan.center();
+      } else {
+        svgPan = svgPanZoom(svg, { dblClickZoomEnabled: false, preventEventsDefaults: true });
       }
-      svgPan.center();
     }
 
   };

diff --git a/inst/htmlwidgets/lib/modules/animation_renderer_leaflet.js b/inst/htmlwidgets/lib/modules/animation_renderer_leaflet.js
@@ -1,5 +1,5 @@
 /*
-processanimateR 1.0.1.9000
+processanimateR 1.0.1
 Copyright (c) 2018 Felix Mannhardt
 Licensed under MIT license
 */

diff --git a/inst/htmlwidgets/lib/modules/animation_scales.js b/inst/htmlwidgets/lib/modules/animation_scales.js
@@ -1,5 +1,5 @@
 /*
-processanimateR 1.0.1.9000
+processanimateR 1.0.1
 Copyright (c) 2018 Felix Mannhardt
 Licensed under MIT license
 */

diff --git a/inst/htmlwidgets/lib/modules/animation_tokens.js b/inst/htmlwidgets/lib/modules/animation_tokens.js
@@ -1,5 +1,5 @@
 /*
-processanimateR 1.0.1.9000
+processanimateR 1.0.1
 Copyright (c) 2018 Felix Mannhardt
 Licensed under MIT license
 */