Merge pull request #1448 from moonshine-software/multi-selectors-n-fr…

…agments feat: Multi selectors n fragments
moonshine-software · Jan 9, 2025 · c810bad · c810bad
2 parents d3490a3 + fe5a600
commit c810bad
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 28 deletions.
diff --git a/src/Contracts/src/Core/CrudResourceContract.php b/src/Contracts/src/Core/CrudResourceContract.php
@@ -120,15 +120,15 @@ public function delete(mixed $item, ?FieldsContract $fields = null): bool;
     public function save(mixed $item, ?FieldsContract $fields = null): mixed;
 
 
-    public function getIndexPageUrl(array $params = [], ?string $fragment = null): string;
+    public function getIndexPageUrl(array $params = [], null|string|array $fragment = null): string;
 
     /**
      * @param DataWrapperContract<TData>|int|string|null $key
      */
     public function getFormPageUrl(
         DataWrapperContract|int|string|null $key = null,
         array $params = [],
-        ?string $fragment = null
+        null|string|array $fragment = null
     ): string;
 
     /**
@@ -137,7 +137,7 @@ public function getFormPageUrl(
     public function getDetailPageUrl(
         DataWrapperContract|int|string $key,
         array $params = [],
-        ?string $fragment = null
+        null|string|array $fragment = null
     ): string;
 
     public function setQueryParams(iterable $params): static;

diff --git a/src/Contracts/src/UI/ActionButtonContract.php b/src/Contracts/src/UI/ActionButtonContract.php
@@ -70,7 +70,7 @@ public function method(
         string $method,
         array|Closure $params = [],
         ?string $message = null,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null,
         ?PageContract $page = null,
@@ -83,7 +83,7 @@ public function dispatchEvent(array|string $events): static;
 
     public function async(
         HttpMethod $method = HttpMethod::GET,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null
     ): static;

diff --git a/src/Contracts/src/UI/FieldContract.php b/src/Contracts/src/UI/FieldContract.php
@@ -68,7 +68,7 @@ public function onChangeMethod(
         string $method,
         array|Closure $params = [],
         ?string $message = null,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null,
         ?PageContract $page = null,
@@ -79,7 +79,7 @@ public function onChangeUrl(
         Closure $url,
         HttpMethod $method = HttpMethod::GET,
         array $events = [],
-        ?string $selector = null,
+        null|string|array $selector = null,
         ?AsyncCallback $callback = null,
     ): static;
 

diff --git a/src/Laravel/src/Http/Responses/MoonShineJsonResponse.php b/src/Laravel/src/Http/Responses/MoonShineJsonResponse.php
@@ -52,7 +52,7 @@ public function events(array $events): self
         return $this->mergeJsonData(['events' => AlpineJs::prepareEvents($events)]);
     }
 
-    public function html(string $value): self
+    public function html(string|array $value): self
     {
         return $this->mergeJsonData(['html' => $value]);
     }

diff --git a/src/Laravel/src/MoonShineEndpoints.php b/src/Laravel/src/MoonShineEndpoints.php
@@ -106,6 +106,14 @@ public function toPage(
         $redirect = $extra['redirect'] ?? false;
         $fragment = $extra['fragment'] ?? null;
 
+        if (\is_array($fragment)) {
+            $fragment = implode(',', array_map(
+                static fn ($key, $value): string => "$key:$value",
+                array_keys($fragment),
+                $fragment
+            ));
+        }
+
         if ($fragment !== null && $fragment !== '') {
             $params += ['_fragment-load' => $fragment];
         }

diff --git a/src/Laravel/src/Pages/Page.php b/src/Laravel/src/Pages/Page.php
@@ -11,6 +11,7 @@
 use MoonShine\Core\Pages\Page as CorePage;
 use MoonShine\Laravel\Contracts\WithResponseModifierContract;
 use MoonShine\Laravel\DependencyInjection\MoonShine;
+use MoonShine\Laravel\Http\Responses\MoonShineJsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -35,9 +36,7 @@ protected function prepareBeforeRender(): void
 
     protected function prepareRender(Renderable|Closure|string $view): Renderable|Closure|string
     {
-        /**
-         * @var View $view
-         */
+        /** @var View $view */
         return $view->fragmentIf(
             moonshineRequest()->isFragmentLoad(),
             moonshineRequest()->getFragmentLoad(),
@@ -56,6 +55,25 @@ public function getModifiedResponse(): ?Response
 
     protected function modifyResponse(): ?Response
     {
+        $fragments = moonshineRequest()->getFragmentLoad();
+
+        if ($fragments === null) {
+            return null;
+        }
+
+        if (str_contains($fragments, ',')) {
+            $fragments = explode(',', $fragments);
+            $data = [];
+            foreach ($fragments as $fragment) {
+                [$selector, $name] = explode(':', $fragment);
+                /** @var View $view */
+                $view = $this->renderView();
+                $data[$selector] = $view->fragment($name);
+            }
+
+            return MoonShineJsonResponse::make()->html($data);
+        }
+
         return null;
     }
 }
diff --git a/src/Laravel/src/Traits/Resource/ResourceCrudRouter.php b/src/Laravel/src/Traits/Resource/ResourceCrudRouter.php
@@ -37,22 +37,22 @@ public function getRoute(
      * @param class-string<PageContract>|PageContract $page
      * @param array<string, mixed> $params
      */
-    public function getPageUrl(string|PageContract $page, array $params = [], ?string $fragment = null): string
+    public function getPageUrl(string|PageContract $page, array $params = [], null|string|array $fragment = null): string
     {
         return $this->getRouter()->getEndpoints()->toPage($page, $this, params: $params, extra: [
             'fragment' => $fragment,
         ]);
     }
 
-    public function getIndexPageUrl(array $params = [], ?string $fragment = null): string
+    public function getIndexPageUrl(array $params = [], null|string|array $fragment = null): string
     {
         return $this->getPageUrl($this->getIndexPage(), params: $params, fragment: $fragment);
     }
 
     public function getFormPageUrl(
         DataWrapperContract|int|string|null $key = null,
         array $params = [],
-        ?string $fragment = null
+        null|string|array $fragment = null
     ): string {
         return $this->getPageUrl(
             $this->getFormPage(),
@@ -67,7 +67,7 @@ public function getFormPageUrl(
     public function getDetailPageUrl(
         DataWrapperContract|int|string $key,
         array $params = [],
-        ?string $fragment = null
+        null|string|array $fragment = null
     ): string {
         return $this->getPageUrl(
             $this->getDetailPage(),
@@ -83,7 +83,7 @@ public function getDetailPageUrl(
      * @param DataWrapperContract<T>|int|string|null $key
      */
     public function getFragmentLoadUrl(
-        string $fragment,
+        string|array $fragment,
         PageContract $page,
         DataWrapperContract|int|string|null $key,
         array $params = []

diff --git a/src/Laravel/src/helpers.php b/src/Laravel/src/helpers.php
@@ -101,7 +101,7 @@ function toPage(
         string|ResourceContract|null $resource = null,
         array $params = [],
         bool $redirect = false,
-        ?string $fragment = null
+        null|string|array $fragment = null
     ): RedirectResponse|string {
         return moonshineRouter()->getEndpoints()->toPage(
             page: $page,

diff --git a/src/Support/src/AlpineJs.php b/src/Support/src/AlpineJs.php
@@ -64,12 +64,12 @@ public static function eventBladeWhen(
     public static function asyncUrlDataAttributes(
         HttpMethod $method = HttpMethod::GET,
         string|array $events = [],
-        ?string $selector = null,
+        null|string|array $selector = null,
         ?AsyncCallback $callback = null
     ): array {
         return array_filter([
             'data-async-events' => self::prepareEvents($events),
-            'data-async-selector' => $selector,
+            'data-async-selector' => \is_array($selector) ? implode(',', $selector) : $selector,
             'data-async-response-handler' => $callback?->getResponseHandler(),
             'data-async-before-request' => $callback?->getBeforeRequest(),
             'data-async-method' => $method->value,

diff --git a/src/UI/dist/assets/app.js b/src/UI/dist/assets/app.js
diff --git a/src/UI/resources/js/Request/Core.js b/src/UI/resources/js/Request/Core.js
@@ -52,9 +52,13 @@ export default function request(
       }
 
       if (componentRequestData.selector) {
-        const elements = document.querySelectorAll(componentRequestData.selector)
-        elements.forEach(element => {
-          element.innerHTML = data.html ? data.html : data
+        const selectors = componentRequestData.selector.split(',')
+
+        selectors.forEach(function (selector) {
+          let elements = document.querySelectorAll(selector)
+          elements.forEach(element => {
+            element.innerHTML = data.html[selector] ?? (data.html ? data.html : data)
+          })
         })
       }
 

diff --git a/src/UI/src/Components/ActionButton.php b/src/UI/src/Components/ActionButton.php
@@ -203,7 +203,7 @@ public function method(
         string $method,
         array|Closure $params = [],
         ?string $message = null,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null,
         ?PageContract $page = null,
@@ -253,7 +253,7 @@ public function disableAsync(): static
 
     public function async(
         HttpMethod $method = HttpMethod::GET,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null
     ): static {

diff --git a/src/UI/src/Fields/Field.php b/src/UI/src/Fields/Field.php
@@ -199,7 +199,7 @@ public function onChangeMethod(
         string $method,
         array|Closure $params = [],
         ?string $message = null,
-        ?string $selector = null,
+        null|string|array $selector = null,
         array $events = [],
         ?AsyncCallback $callback = null,
         ?PageContract $page = null,
@@ -232,7 +232,7 @@ public function onChangeUrl(
         Closure $url,
         HttpMethod $method = HttpMethod::PUT,
         array $events = [],
-        ?string $selector = null,
+        null|string|array $selector = null,
         ?AsyncCallback $callback = null,
     ): static {
         $this->onChangeUrl = $url;
@@ -248,7 +248,7 @@ public function onChangeUrl(
     protected function onChangeAttributes(
         HttpMethod $method = HttpMethod::GET,
         array $events = [],
-        ?string $selector = null,
+        null|string|array $selector = null,
         ?AsyncCallback $callback = null
     ): static {
         return $this->customAttributes(