Add more overrules

src/Forms/Concerns/WithSession.php

@@ -12,7 +12,7 @@ trait WithSession
 
     public function restore(): void
     {
-        if (! static::$store || ! $this->hasStore()) {
+        if (! $this->useStore() || ! $this->hasStore()) {
             return;
         }
 
@@ -24,7 +24,7 @@ public function restore(): void
 
     public function store(): void
     {
-        if (! static::$store || ! $this->storeWhen()) {
+        if (! $this->storeWhen()) {
             return;
         }
 
@@ -39,6 +39,11 @@ public function forget(): void
         session()->forget($this->storeId());
     }
 
+    protected function useStore(): bool
+    {
+        return static::$store;
+    }
+
     protected function getStore(): array
     {
         return unserialize(session()->get($this->storeId(), []));
@@ -51,7 +56,7 @@ protected function hasStore(): bool
 
     protected function storeWhen(): bool
     {
-        return true;
+        return $this->useStore();
     }
 
     protected function storeWith(): array

src/Forms/Concerns/WithValidation.php

@@ -8,7 +8,7 @@ trait WithValidation
 
     public function check(): void
     {
-        if (! static::$recoverable) {
+        if (! static::isRecoverable()) {
             $this->validate();
 
             return;
@@ -19,4 +19,9 @@ public function check(): void
             fn () => $this->reset(),
         );
     }
+
+    protected static function isRecoverable(): bool
+    {
+        return static::$recoverable;
+    }
 }

src/Models/Forms/CreateForm.php

@@ -24,8 +24,6 @@ protected function set(string $class): void
 
     protected function handle(): void
     {
-        app(static::$model)::create(
-            $this->all()
-        );
+        app(static::$model)::create($this->all());
     }
 }

src/Views/Concerns/WithLivewire.php

@@ -17,7 +17,7 @@ public function wireModel(): ?string
         return $this->attributes->whereStartsWith('wire:model')->first();
     }
 
-    public function uuid(): UuidInterface
+    public function uuid(): UuidInterface|string
     {
         return once(fn (): UuidInterface => Str::uuid());
     }