Fix rstudio/reactlog#36: Changes to reactive values not displaying ac…

…curately
rstudio · May 7, 2019 · 8a07314 · 8a07314
1 parent e6c2133
commit 8a07314
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/R/reactives.R b/R/reactives.R
@@ -395,24 +395,21 @@ ReactiveValues <- R6Class(
       # set the value for better logging
       .values[[key]] <- value
 
-      if (key_exists) {
-        # key has been depended upon (can not happen if the key is being set)
-        if (isTRUE(.hasRetrieved$keys[[key]])) {
-          rLog$valueChangeKey(.reactId, key, value, domain)
-          keyReactId <- rLog$keyIdStr(.reactId, key)
-          rLog$invalidateStart(keyReactId, NULL, "other", domain)
-          on.exit(
-            rLog$invalidateEnd(keyReactId, NULL, "other", domain),
-            add = TRUE
-          )
-        }
+      # key has been depended upon
+      if (isTRUE(.hasRetrieved$keys[[key]])) {
+        rLog$valueChangeKey(.reactId, key, value, domain)
+        keyReactId <- rLog$keyIdStr(.reactId, key)
+        rLog$invalidateStart(keyReactId, NULL, "other", domain)
+        on.exit(
+          rLog$invalidateEnd(keyReactId, NULL, "other", domain),
+          add = TRUE
+        )
+      }
 
-      } else {
-        # only invalidate if there are deps
-        if (isTRUE(.hasRetrieved$names)) {
-          rLog$valueChangeNames(.reactId, ls(.values, all.names = TRUE), domain)
-          .namesDeps$invalidate()
-        }
+      # only invalidate if there are deps
+      if (!key_exists && isTRUE(.hasRetrieved$names)) {
+        rLog$valueChangeNames(.reactId, ls(.values, all.names = TRUE), domain)
+        .namesDeps$invalidate()
       }
 
       if (hidden) {