Merge pull request #2018 from khlystou/4.x

Added raw mode to password field

Author: lee-to

src/Laravel/src/Traits/Fields/WithAsyncSearch.php

@@ -220,7 +220,7 @@ public function associatedWith(string $column, ?Closure $searchQuery = null): st
         $this->associatedWithSearchQuery = $searchQuery;
 
         return $this->asyncSearch(
-            searchQuery: \is_null($searchQuery) ? $defaultQuery : $searchQuery,
+            searchQuery: $searchQuery ?? $defaultQuery,
             associatedWith: $column,
         );
     }

src/Support/src/Traits/WithComponentAttributes.php

@@ -237,7 +237,7 @@ private function xIfOrShow(
         if (! $variable instanceof Closure) {
             $o = \is_null($value) ? '=' : $operator;
             $o = $o === '=' ? '==' : $o;
-            $v = \is_null($value) ? $operator : $value;
+            $v = $value ?? $operator;
             $variable = static fn (self $ctx): string => "$variable$o'$v'";
         }
 

src/UI/src/Collections/Fields.php

@@ -159,7 +159,7 @@ public function fillCloned(
         /** @var static */
         return ($preparedFields ?? $this->onlyFields(withApplyWrappers: true))->map(
             static fn (FieldContract $field): FieldContract => (clone $field)
-                ->fillData(\is_null($casted) ? $raw : $casted, $index)
+                ->fillData($casted ?? $raw, $index)
         );
     }
 
@@ -177,7 +177,7 @@ public function fillClonedRecursively(
                 );
             }
 
-            $component->fillData(\is_null($casted) ? $raw : $casted, $index);
+            $component->fillData($casted ?? $raw, $index);
 
             return clone $component;
         });
@@ -190,7 +190,7 @@ public function fill(array $raw = [], ?DataWrapperContract $casted = null, int $
     {
         $this->onlyFields(withApplyWrappers: true)->map(
             static fn (FieldContract $field): FieldContract => $field
-                ->fillData(\is_null($casted) ? $raw : $casted, $index)
+                ->fillData($casted ?? $raw, $index)
         );
     }
 

src/UI/src/Components/FieldsGroup.php

@@ -30,7 +30,7 @@ public function previewMode(): self
     public function fill(array $raw = [], ?DataWrapperContract $casted = null, int $index = 0): self
     {
         return $this->mapFields(
-            static fn (FieldContract $field): FieldContract => $field->fillData(\is_null($casted) ? $raw : $casted, $index)
+            static fn (FieldContract $field): FieldContract => $field->fillData($casted ?? $raw, $index)
         );
     }
 

src/UI/src/Fields/Password.php

@@ -16,6 +16,8 @@ class Password extends Text
 
     protected ?TextWrap $textWrap = null;
 
+    protected bool $hashed = true;
+
     protected function resolvePreview(): string
     {
         return '***';
@@ -26,11 +28,25 @@ protected function resolveValue(): string
         return '';
     }
 
+    protected function isHashed(): bool
+    {
+        return $this->hashed;
+    }
+
     public function isUnescape(): bool
     {
         return true;
     }
 
+    public function raw(Closure|bool|null $condition = null): static
+    {
+        $result = value($condition, $this) ?? true;
+
+        $this->hashed = ! $result;
+
+        return $this;
+    }
+
     protected function resolveOnApply(): ?Closure
     {
         return function ($item) {
@@ -40,7 +56,9 @@ protected function resolveOnApply(): ?Closure
                 data_set(
                     $item,
                     $this->getColumn(),
-                    $this->getCore()->getContainer(Hasher::class)->make($value)
+                    $this->isHashed()
+                        ? $this->getCore()->getContainer(Hasher::class)->make($value)
+                        : $value
                 );
             }
 

src/UI/src/Traits/Fields/Applies.php

@@ -145,9 +145,7 @@ public function apply(Closure $default, mixed $data): mixed
             );
         }
 
-        $applyFunction = \is_null($this->onApply)
-            ? $this->resolveOnApply()
-            : $this->onApply;
+        $applyFunction = $this->onApply ?? $this->resolveOnApply();
 
         return \is_null($applyFunction)
             ? $default($data, $this->getRequestValue(), $this)