Merge pull request #388 from blockr-org/fix.rendered

Rendered block loading not disappearing
BristolMyersSquibb · Jul 2, 2024 · db3f076 · db3f076
2 parents 39aec7b + d2ae237
commit db3f076
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: blockr
 Title: A block-based framework for data manipulation and visualization
-Version: 0.0.2
+Version: 0.0.2.9000
 Authors@R: 
     c(person(given = "Nicolas",
              family = "Bennett",
@@ -22,7 +22,7 @@ Description: A framework for data manipulation and visualization using a
 License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.1.9000
 Imports:
     magrittr,
     shiny,

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# blockr 0.0.2.9000
+
+## Fixes
+
+- Loading spinner is now correctly hidden when the block visual is updated.
+
 # blockr 0.0.2
 
 ## Breaking changes

diff --git a/R/server.R b/R/server.R
@@ -434,7 +434,7 @@ generate_server.stack <- function(x, id = NULL, new_block = NULL,
         )
       })
 
-      observe({
+      observeEvent(input$rendered, {
         session$sendCustomMessage(
           "blockr-render-stack",
           list(

diff --git a/R/ui.R b/R/ui.R
@@ -329,7 +329,8 @@ generate_ui.stack <- function(x, id = NULL, ...) {
         })
       )
     ),
-    useBlockr()
+    useBlockr(),
+    tags$script(HTML(sprintf("Shiny.setInputValue('%s', 1);", ns("rendered"))))
   )
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -329,7 +329,8 @@ generate_ui.stack <- function(x, id = NULL, ...) { @@
             })
           )
         ),
-        useBlockr()
+        useBlockr(),
+        tags$script(HTML(sprintf("Shiny.setInputValue('%s', 1);", ns("rendered"))))
       )
     }
@@ Expand Down @@