Revert initial data getters returning null

Kreyu · Nov 18, 2024 · 6801883 · 6801883
1 parent 5a55b48
commit 6801883
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/DataTable.php b/src/DataTable.php
@@ -871,7 +871,12 @@ private function getInitialFiltrationData(): ?FiltrationData
             $data = $this->getPersistenceData(PersistenceContext::Filtration);
         }
 
-        return $data ?? $this->config->getDefaultFiltrationData();
+        $data ??= $this->config->getDefaultFiltrationData();
+
+        $data ??= FiltrationData::fromDataTable($this);
+        $data->appendMissingFilters($this->getFilters());
+
+        return $data;
     }
 
     private function getInitialPersonalizationData(): ?PersonalizationData
@@ -886,7 +891,7 @@ private function getInitialPersonalizationData(): ?PersonalizationData
             $data = $this->getPersistenceData(PersistenceContext::Personalization);
         }
 
-        return $data ?? $this->config->getDefaultPersonalizationData();
+        return $data ?? $this->config->getDefaultPersonalizationData() ?? PersonalizationData::fromDataTable($this);
     }
 
     private function isPersistenceEnabled(PersistenceContext $context): bool