Changed state transmission

config/platform.php

@@ -304,20 +304,6 @@
 
     'prevents_abandonment' => true,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Preserve Entire Screen State
-    |--------------------------------------------------------------------------
-    |
-    | This option determines whether the entire screen state should be preserved
-    | between requests. Enabling this option allows for the full state of the screen
-    | to be retained, including private fields, which can be useful for listeners.
-    | Disabling this option will only retain public properties.
-    |
-    */
-
-    'full_state' => true,
-
     /*
      |--------------------------------------------------------------------------
      | Service Provider

src/Screen/Layout.php

@@ -122,6 +122,24 @@ public function findBySlug(string $slug)
             ->first();
     }
 
+    /**
+     * @return Layout|null
+     */
+    public function findByType(string $type)
+    {
+        if (is_subclass_of($this, $type)) {
+            return $this;
+        }
+
+        // Trying to find the right layer inside
+        return collect($this->layouts)
+            ->flatten()
+            ->map(fn ($layout) => is_object($layout) ? $layout : resolve($layout))
+            ->map(fn (Layout $layout) => $layout->findByType($type))
+            ->filter()
+            ->first();
+    }
+
     public function jsonSerialize(): array
     {
         $props = collect(get_object_vars($this));

src/Screen/Repository.php

@@ -60,4 +60,12 @@ public function set($key, $value = null)
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isEmpty(): bool
+    {
+        return $this->count() === 0;
+    }
 }

src/Screen/Screen.php

@@ -13,8 +13,8 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Route;
-use Laravel\SerializableClosure\SerializableClosure;
 use Orchid\Platform\Http\Controllers\Controller;
+use Orchid\Screen\Layouts\Listener;
 use Orchid\Support\Facades\Dashboard;
 
 /**
@@ -188,22 +188,15 @@ public function asyncParticalLayout(Layout $layout, Request $request)
     protected function extractState(): Repository
     {
         // Check if the '_state' parameter is missing
-        if (request()->missing('_state') && session()->missing('_state')) {
+        if (!request()->request->has('_state') && session()->missing('_state')) {
             // Return an empty Repository object
             return new Repository();
         }
 
-        $raw = request()->get('_state') ?? session()->get('_state');
-
         // Extract the encrypted state from the '_state' parameter, and deserialize it
-        $data = config('platform.state.crypt', false) === true
-            ? Crypt::decryptString($raw)
-            : base64_decode($raw);
-
-        $state = unserialize($data);
+        $raw = request()->post('_state') ?? session()->get('_state');
 
-        // Return the deserialized state
-        return $state();
+        return Crypt::decrypt($raw);
     }
 
     /**
@@ -229,19 +222,19 @@ public function view(array|Repository $httpQueryArguments = [])
     }
 
     /**
-     * @param $values
+     * @param $repository
      *
      * @throws \Laravel\SerializableClosure\Exceptions\PhpVersionNotSupportedException
      *
      * @return string
      */
-    protected function serializableState($values): string
+    protected function serializableState(Repository $repository): string
     {
-        $state = serialize(new SerializableClosure(fn () => $values));
+        if ($repository->isEmpty()) {
+            return '';
+        }
 
-        return config('platform.state.crypt', false) === true
-            ? Crypt::encryptString($state)
-            : base64_encode($state);
+        return Crypt::encrypt($repository);
     }
 
     /**
@@ -388,7 +381,14 @@ public function needPreventsAbandonment(): bool
      */
     public function isScreenFullStatePreserved(): bool
     {
-        return config('platform.full_state', true);
+        /** @var Layout $layout */
+        $existListenerLayout = collect($this->layout())
+            ->map(fn ($layout) => is_object($layout) ? $layout : resolve($layout))
+            ->map(fn (Layout $layout) => $layout->findByType(Listener::class))
+            ->filter()
+            ->isNotEmpty();
+
+        return config('platform.full_state', $existListenerLayout);
     }
 
     /**