- Fix CSS issue messing with inputs.\n - Handle settings defaults values.\n - Added support for laravel nova 5.

Author: AbdullahFaqeir

composer.json

@@ -22,8 +22,8 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "spatie/laravel-settings": "^3.3",
-        "laravel/nova": "^4.0"
+        "spatie/laravel-settings": "^3.4",
+        "laravel/nova": "^4.0|^5.0"
     },
     "autoload": {
         "psr-4": {

dist/css/tool.css

@@ -1,10 +1,10 @@
 /* Nova Tool CSS */
 
-@tailwind base;
+/*@tailwind base;*/
 @tailwind components;
 @tailwind utilities;
 
-@layer base {
+@layer utilities {
     .rounded-none {
         border-radius: 0;
     }

dist/js/tool.js

@@ -290,16 +290,17 @@ export default {
     :is(.active\:text-white:is(.active *)) {
         color: white;
     }
-}
 
-/* we will explain what these classes do next! */
-.v-enter-active,
-.v-leave-active {
-    transition: opacity 0.3s ease;
-}
+    /* we will explain what these classes do next! */
 
-.v-enter-from,
-.v-leave-to {
-    opacity: 0;
+    .v-enter-active,
+    .v-leave-active {
+        transition: opacity 0.3s ease;
+    }
+
+    .v-enter-from,
+    .v-leave-to {
+        opacity: 0;
+    }
 }
 </style>

resources/css/tool.css

@@ -3,10 +3,8 @@
 namespace Devloops\NovaSystemSettings\Contracts;
 
 use Laravel\Nova\Makeable;
-use Spatie\LaravelSettings\SettingsMapper;
 use Devloops\NovaSystemSettings\Components\Settings;
 use Spatie\LaravelSettings\Settings as SpatieSettings;
-use Devloops\NovaSystemSettings\Traits\ManeuversSettingsMigration;
 
 /**
  * Class SystemSettings.
@@ -18,7 +16,6 @@
 abstract class SystemSettings extends SpatieSettings
 {
     use Makeable;
-    use ManeuversSettingsMigration;
 
     /**
      * System setting's Settings component.
@@ -78,19 +75,4 @@ public function getSettingsComponent(): SettingsContract
         return $this->settings;
     }
 
-    /**
-     * Migrate and set default values.
-     *
-     * @return void
-     */
-    public function migrateDefaultValues(): void
-    {
-        foreach (
-            $this->getSettingsComponent()
-                 ->getFieldsKeys() as $fieldKey
-        ) {
-            $this->getRepository()
-                 ->createProperty($this->getGroup(), $fieldKey, null);
-        }
-    }
 }

resources/js/pages/Tool.vue

@@ -11,9 +11,10 @@
 /**
  * Class SettingsMapper.
  *
+ * @see     https://github.com/spatie/laravel-settings/pull/298 Taken from this PR to fix default values setting.
+ * @author  Abdullah Al-Faqeir <abdullah@devloops.net>
  * @package Devloops\NovaSystemSettings
  * @date    09/05/2024
- * @author  Abdullah Al-Faqeir <abdullah@devloops.net>
  */
 class SettingsMapper extends SpatieSettingsMapper
 {
@@ -45,6 +46,7 @@ public function load(string $settingsClass): Collection
 
         event(new LoadingSettings($settingsClass, $properties));
 
+        $properties = $this->fillMissingSettingsWithDefaultValues($config, $properties);
         $this->ensureNoMissingSettings($config, $properties, 'loading');
 
         return $properties;
@@ -109,6 +111,25 @@ private function getConfig(string $settingsClass): SettingsConfig
         return $this->configs[$settingsClass];
     }
 
+    private function fillMissingSettingsWithDefaultValues(SettingsConfig $config, Collection $properties): Collection
+    {
+        $config->getReflectedProperties()
+               ->keys()
+               ->diff($properties->keys())
+               ->each(function ($missingSetting) use ($config, &$properties) {
+                   /** @var ReflectionProperty $reflectionProperty */
+                   $reflectionProperty = $config->getReflectedProperties()[$missingSetting];
+
+                   if ($reflectionProperty->hasDefaultValue()
+                       || $reflectionProperty->getType()
+                                             ->allowsNull()) {
+                       $properties->put($missingSetting, $reflectionProperty->getDefaultValue());
+                   }
+               });
+
+        return $properties;
+    }
+
     private function ensureNoMissingSettings(
         SettingsConfig $config,
         Collection $properties,