From 540b946ccb9ec6f713416364076acbef67b8b5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?=
 <211358+averissimo@users.noreply.github.com>
Date: Wed, 22 Jul 2026 17:36:15 +0100
Subject: [PATCH 1/3] fix: use withReactiveNull on other constructors

---
 R/FilterState.R  | 2 +-
 R/FilterStates.R | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/FilterState.R b/R/FilterState.R
index 7fcf2e3eb..3daf8de91 100644
--- a/R/FilterState.R
+++ b/R/FilterState.R
@@ -107,7 +107,7 @@ FilterState <- R6::R6Class( # nolint
             varlabel
           }
 
-        private$state_history <- reactiveVal(list())
+        private$state_history <- withReactiveDomain(NULL, reactiveVal(list()))
 
         invisible(self)
       })
diff --git a/R/FilterStates.R b/R/FilterStates.R
index 34c725333..fd030bd0a 100644
--- a/R/FilterStates.R
+++ b/R/FilterStates.R
@@ -64,7 +64,7 @@ FilterStates <- R6::R6Class( # nolint
       }
       private$data <- data
       private$data_reactive <- data_reactive
-      private$state_list <- reactiveVal()
+      private$state_list <- withReactiveDomain(NULL, reactiveVal())
 
       # Clears state list when finalizing the object
       private$session_bindings[["clear_state_list"]] <- list(

From b4ad3b0ed8c14978903d7768d0c212316af538a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Ver=C3=ADssimo?=
 <211358+averissimo@users.noreply.github.com>
Date: Thu, 23 Jul 2026 01:03:16 +0100
Subject: [PATCH 2/3] fix: another instance

---
 R/FilteredDataset.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/FilteredDataset.R b/R/FilteredDataset.R
index 85e5e0b48..634d34f1d 100644
--- a/R/FilteredDataset.R
+++ b/R/FilteredDataset.R
@@ -34,7 +34,7 @@ FilteredDataset <- R6::R6Class( # nolint
       logger::log_debug("Instantiating { class(self)[1] }, dataname: { dataname }")
       checkmate::assert_character(keys, any.missing = FALSE)
       checkmate::assert_character(label, null.ok = TRUE)
-      private$allow_add <- reactiveVal(TRUE)
+      private$allow_add <- withReactiveDomain(NULL, reactiveVal(TRUE))
       private$dataset <- dataset
       private$dataname <- dataname
       private$keys <- keys

From 36d43a26b92e23affe287c01a250d947d2a400d1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2026 13:15:32 +0000
Subject: [PATCH 3/3] [skip style] [skip vbump] Restyle files

---
 R/FilterState.R | 1 -
 1 file changed, 1 deletion(-)

diff --git a/R/FilterState.R b/R/FilterState.R
index 3daf8de91..7fac2e9e9 100644
--- a/R/FilterState.R
+++ b/R/FilterState.R
@@ -43,7 +43,6 @@ FilterState <- R6::R6Class( # nolint
 
   # public methods ----
   public = list(
-
     #' @description
     #' Initialize a `FilterState` object.
     #'