Fix default values

Author: osbre

src/Plugin.php

@@ -22,7 +22,7 @@ protected function onBoot(): void
     #[\Override]
     public function onActivation(): void
     {
-        $this->registerOptions();
+        $this->addOptions();
     }
 
     #[\Override]
@@ -52,9 +52,17 @@ public function onInit(): void
      * to preload them on each page and avoid
      * extra database queries.
      */
-    protected function registerOptions(): void
+    protected function addOptions(): void
     {
-        foreach (SettingName::cases() as $name) {
+        // Add options with default values
+        add_option(SettingName::ENABLED, '1', null, true);
+
+        // Autoload the option introduced in a previous release.
+        update_option(SettingName::CUSTOM_DOMAIN, get_option(SettingName::CUSTOM_DOMAIN), true);
+
+        // Add all remaining options
+        $optionNames = array_diff(SettingName::cases(), [SettingName::ENABLED]);
+        foreach ($optionNames as $name) {
             add_option($name, null, null, true);
         }
     }
@@ -94,8 +102,7 @@ protected function defineAdminPage(): void
                     ->docs('https://docs.simpleanalytics.com/bypass-ad-blockers');
 
                 $tab->checkbox(SettingName::ENABLED, 'Enabled')
-                    ->description('Enable or disable Simple Analytics on your website.')
-                    ->default(true);
+                    ->description('Enable or disable Simple Analytics on your website.');
             })
             ->tab('Ignore Rules', function (Tab $tab) {
                 $tab->icon(get_icon('eye-slash'));
@@ -130,8 +137,7 @@ protected function defineAdminPage(): void
                     ->docs('https://docs.simpleanalytics.com/trigger-custom-page-views#use-custom-collection-anyway');
 
                 $tab->checkbox(SettingName::NOSCRIPT, 'Support no JavaScript mode')
-                    ->description('Collect analytics from visitors with disabled or no JavaScript.')
-                    ->default(false);
+                    ->description('Collect analytics from visitors with disabled or no JavaScript.');
 
                 $tab->input(SettingName::ONLOAD_CALLBACK, 'Onload Callback')
                     ->description('JavaScript function to call when the script is loaded.')

src/Setting.php

@@ -15,9 +15,15 @@ public static function get(string $key, $default = null): mixed
         return $value;
     }
 
-    public static function boolean(string $key, bool $default = false): bool
+    public static function boolean(string $key, ?bool $default = null): ?bool
     {
-        return (bool)self::get($key, $default);
+        $value = get_option($key);
+
+        if (empty($value)) {
+            return $default;
+        }
+
+        return (bool)$value;
     }
 
     public static function array(string $key): array

src/Settings/Blocks/Fields/Field.php

@@ -10,8 +10,6 @@ abstract class Field implements Block
 
     protected string $label;
 
-    protected mixed $default = null;
-
     public function __construct(string $key, string $label)
     {
         $this->key = $key;
@@ -33,16 +31,4 @@ abstract public function getValueSanitizer(): callable;
     abstract public function getValueType(): string;
 
     abstract public function render(): void;
-
-    public function default(mixed $default): static
-    {
-        $this->default = $default;
-
-        return $this;
-    }
-
-    public function getDefaultValue(): mixed
-    {
-        return $this->default;
-    }
 }

src/Settings/Concerns/WordPressPageIntegration.php

@@ -55,7 +55,6 @@ protected function registerField(Field $field, Tab $tab): void
             $field->getKey(),
             [
                 'type'              => $field->getValueType(),
-                'default'           => $field->getDefaultValue(),
                 'sanitize_callback' => $field->getValueSanitizer(),
             ]
         );