Merge branch '3.x' into column-selection-hide-on-init

moonshine-software · Jan 26, 2025 · 8c5116c · 8c5116c
2 parents 275c6d7 + 97e5c23
commit 8c5116c
Show file tree

Hide file tree

Showing 46 changed files with 485 additions and 197 deletions.
diff --git a/.meta-storm.xml b/.meta-storm.xml
@@ -10,6 +10,15 @@
             <stopCompletion />
         </classMethod>
 
+        <classMethod
+            class="\MoonShine\UI\Components\Icon"
+            method="make"
+            argument="0"
+        >
+            <files extension="blade.php" xpath="$project/vendor/moonshine/moonshine/src/UI/resources/views/icons"/>
+            <stopCompletion />
+        </classMethod>
+
         <classMethod
             class="\MoonShine\UI\Components\ActionButton"
             method="method"
@@ -63,6 +72,22 @@
             <collection name="justify-align" argument="0" />
             <stopCompletion />
         </classMethod>
+        <classMethod
+            class="\MoonShine\UI\Components\ProgressBar"
+            method="make"
+            argument="1"
+        >
+            <collection name="size" argument="1" />
+            <stopCompletion />
+        </classMethod>
+        <classMethod
+            class="\MoonShine\UI\Components\Spinner"
+            method="make"
+            argument="0"
+        >
+            <collection name="size" argument="0" />
+            <stopCompletion />
+        </classMethod>
     </definitions>
     <collections>
         <strings name="items-align">
@@ -80,5 +105,12 @@
             <value>around</value>
             <value>evenly</value>
         </strings>
+        <strings name="size">
+            <value>xs</value>
+            <value>sm</value>
+            <value>md</value>
+            <value>lg</value>
+            <value>xl</value>
+        </strings>
     </collections>
 </meta-storm>
diff --git a/src/Contracts/src/UI/FieldContract.php b/src/Contracts/src/UI/FieldContract.php
@@ -20,7 +20,8 @@ interface FieldContract extends
     SortableFieldContract,
     HasLinkContract,
     HasBadgeContract,
-    HasHintContract
+    HasHintContract,
+    HasReactivityContract
 {
     public function defaultMode(): static;
 

diff --git a/src/Contracts/src/UI/HasReactivityContract.php b/src/Contracts/src/UI/HasReactivityContract.php
@@ -14,6 +14,12 @@ interface HasReactivityContract
 {
     public function isReactive(): bool;
 
+    public function isReactivitySupported(): bool;
+
+    public function prepareReactivityValue(mixed $value, mixed &$casted, array &$except): mixed;
+
+    public function getReactiveValue(): mixed;
+
     /**
      * @param  TFields  $fields
      *

diff --git a/src/Laravel/src/Fields/Relationships/BelongsTo.php b/src/Laravel/src/Fields/Relationships/BelongsTo.php
@@ -6,9 +6,7 @@
 
 use Closure;
 use Illuminate\Database\Eloquent\Model;
-use MoonShine\Contracts\UI\HasReactivityContract;
 use MoonShine\Core\Exceptions\PageException;
-use MoonShine\Laravel\Collections\Fields;
 use MoonShine\Laravel\Contracts\Fields\HasAsyncSearchContract;
 use MoonShine\Laravel\Contracts\Fields\HasRelatedValuesContact;
 use MoonShine\Laravel\Enums\Action;
@@ -18,7 +16,6 @@
 use MoonShine\UI\Contracts\DefaultValueTypes\CanBeObject;
 use MoonShine\UI\Contracts\HasDefaultValueContract;
 use MoonShine\UI\Traits\Fields\HasPlaceholder;
-use MoonShine\UI\Traits\Fields\Reactivity;
 use MoonShine\UI\Traits\Fields\Searchable;
 use MoonShine\UI\Traits\Fields\WithDefaultValue;
 use Throwable;
@@ -27,22 +24,18 @@
  * @template-covariant R of \Illuminate\Database\Eloquent\Relations\BelongsTo
  *
  * @extends ModelRelationField<R>
- *
- * @implements HasReactivityContract<Fields>
  */
 class BelongsTo extends ModelRelationField implements
     HasAsyncSearchContract,
     HasRelatedValuesContact,
     HasDefaultValueContract,
-    CanBeObject,
-    HasReactivityContract
+    CanBeObject
 {
     use WithRelatedValues;
     use WithAsyncSearch;
     use Searchable;
     use WithDefaultValue;
     use HasPlaceholder;
-    use Reactivity;
     use BelongsToOrManyCreatable;
 
     protected string $view = 'moonshine::fields.relationships.belongs-to';
@@ -124,6 +117,22 @@ protected function resolveOnApply(): ?Closure
         };
     }
 
+    public function prepareReactivityValue(mixed $value, mixed &$casted, array &$except): mixed
+    {
+        $value = data_get($value, 'value', $value);
+
+        $casted = $this->getRelatedModel();
+        $related = $this->getRelation()?->getRelated();
+
+        $target = $related?->forceFill([
+            $related->getKeyName() => $value,
+        ]);
+
+        $casted?->setRelation($this->getRelationName(), $target);
+
+        return $value;
+    }
+
     /**
      * @throws Throwable
      */