cleanup

Author: aguingand

demo/app/Sharp/Posts/PostForm.php

@@ -29,10 +29,8 @@
 use Code16\Sharp\Form\Layout\FormLayoutTab;
 use Code16\Sharp\Form\SharpForm;
 use Code16\Sharp\Utils\Fields\FieldsContainer;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 
 class PostForm extends SharpForm
 {
@@ -160,17 +158,16 @@ public function buildFormFields(FieldsContainer $formFields): void
                     ->addItemField(
                         SharpFormHtmlField::make('document_infos')
                             ->setLiveRefresh(linkedFields: ['document'])
-                            ->setTemplate(function (array $data, string $fieldKey) {
-                                $itemData = Arr::get($data, Str::beforeLast($fieldKey, '.'));
-                                if (! isset($itemData['document']['file_name'])) {
+                            ->setTemplate(function (array $data) {
+                                if (! isset($data['document']['file_name'])) {
                                     return '';
                                 }
 
                                 return sprintf(
                                     'File uploaded at : %s',
                                     Carbon::createFromTimestamp(
-                                        Storage::disk($itemData['document']['disk'])
-                                            ->lastModified($itemData['document']['file_name'])
+                                        Storage::disk($data['document']['disk'])
+                                            ->lastModified($data['document']['file_name'])
                                     )
                                 );
                             })

demo/app/Sharp/TestForm/TestForm.php

@@ -25,6 +25,7 @@
 use Code16\Sharp\Form\Layout\FormLayoutTab;
 use Code16\Sharp\Form\SharpSingleForm;
 use Code16\Sharp\Utils\Fields\FieldsContainer;
+use Illuminate\Database\Eloquent\Builder;
 
 class TestForm extends SharpSingleForm
 {
@@ -161,7 +162,16 @@ public function buildFormFields(FieldsContainer $formFields): void
                             ->setListItemTemplate('{{ $name }}')
                             ->setResultItemTemplate('{{ $name }} ({{ $id }})')
                             ->setRemoteCallback(function ($search, $data) {
-                                dd($data);
+                                $users = User::orderBy('name');
+
+                                foreach (explode(' ', trim($search)) as $word) {
+                                    $users->where(function (Builder $query) use ($word) {
+                                        $query->orWhere('name', 'like', "%$word%")
+                                            ->orWhere('email', 'like', "%$word%");
+                                    });
+                                }
+
+                                return $users->limit(10)->get();
                             }, linkedFields: ['select']),
                     )
                     ->addItemField(SharpFormEditorField::make('markdown2')
@@ -170,6 +180,18 @@ public function buildFormFields(FieldsContainer $formFields): void
                         ->setToolbar([
                             SharpFormEditorField::B, SharpFormEditorField::I, SharpFormEditorField::A,
                         ]),
+                    )
+                    ->addItemField(
+                        SharpFormHtmlField::make('document_infos')
+                            ->setLiveRefresh(linkedFields: ['select'])
+                            ->setTemplate(function (array $data) {
+                                return isset($data['select'])
+                                    ? sprintf(
+                                        'You have selected : %s',
+                                        $this->options()[$data['select']]
+                                    )
+                                    : '';
+                            })
                     ),
             )
             ->addField(

src/Form/Fields/SharpFormHtmlField.php

@@ -11,7 +11,7 @@ class SharpFormHtmlField extends SharpFormField
 {
     const FIELD_TYPE = 'html';
 
-    /** @var View|Closure(array, string)|string */
+    /** @var View|Closure(array)|string */
     private View|Closure|string $template;
 
     private bool $liveRefresh = false;
@@ -42,12 +42,12 @@ public function setTemplate(View|Closure|string $template): self
         return $this;
     }
 
-    public function render(array $data, string $fieldKey): string
+    public function render(array $data): string
     {
         if ($this->template instanceof Closure) {
-            $view = ($this->template)($data, $fieldKey);
+            $view = ($this->template)($data);
 
-            return $view instanceof View ? $view->render() : $view;
+            return $view instanceof View ? $view->with($data)->render() : $view;
         }
 
         if (is_string($this->template)) {

src/Utils/Fields/HandleFormHtmlFields.php

@@ -36,39 +36,46 @@ final public function formatHtmlFields(array $frontData, bool $keepOnlyHtmlField
                 if ($field instanceof SharpFormHtmlField) {
                     return [
                         $key => $field->render([
-                            'fieldKey' => $key,
                             ...$formattedData,
                             ...(is_array($value) ? $value : []),
-                        ], $key),
+                        ]),
                     ];
                 }
 
-                if ($field instanceof SharpFormListField && $field->itemFields()->whereInstanceOf(SharpFormHtmlField::class)->isNotEmpty()) {
+                if ($field instanceof SharpFormListField
+                    && $field->itemFields()->whereInstanceOf(SharpFormHtmlField::class)->isNotEmpty()
+                ) {
                     return [
-                        $key => collect($value)->map(function ($item, $index) use ($field, $key, $formattedData, $keepOnlyHtmlFields) {
-                            return collect($item)->mapWithKeys(function ($itemValue, $itemKey) use ($field, $key, $index, $formattedData, $keepOnlyHtmlFields) {
-                                $itemField = $field->findItemFormFieldByKey($itemKey);
-
-                                if ($itemField instanceof SharpFormHtmlField) {
-                                    $fieldKey = "$key.$index.$itemKey";
-
-                                    return [
-                                        $itemKey => $itemField->render([
-                                            'fieldKey' => $fieldKey,
-                                            ...$formattedData,
-                                            ...(is_array($itemValue) ? $itemValue : []),
-                                        ], $fieldKey),
-                                    ];
-                                }
-
-                                return $keepOnlyHtmlFields ? [] : [$itemKey => $itemValue];
-                            })->all();
-                        })->all(),
+                        $key => $this->formatListHtmlFields($field, $value, $formattedData, $keepOnlyHtmlFields),
                     ];
                 }
 
                 return $keepOnlyHtmlFields ? [] : [$key => $value];
             })
             ->all();
     }
+
+    private function formatListHtmlFields(
+        SharpFormListField $field,
+        array $listValue,
+        array $formattedData,
+        bool $keepOnlyHtmlFields
+    ): array {
+        return collect($listValue)->map(fn ($item, $index) => collect($item)->mapWithKeys(
+            function ($itemFieldValue, $itemFieldKey) use ($field, $index, $formattedData, $keepOnlyHtmlFields) {
+                $itemField = $field->findItemFormFieldByKey($itemFieldKey);
+
+                if ($itemField instanceof SharpFormHtmlField) {
+                    return [
+                        $itemFieldKey => $itemField->render([
+                            ...($formattedData[$field->key][$index] ?? []),
+                            ...(is_array($itemFieldValue) ? $itemFieldValue : []),
+                        ]),
+                    ];
+                }
+
+                return $keepOnlyHtmlFields ? [] : [$itemFieldKey => $itemFieldValue];
+            })->all()
+        )->all();
+    }
 }