wip

Author: pascalbaljet

src/Response.php

@@ -453,10 +453,10 @@ protected function getMergePropsForRequest(Request $request): Collection
 
         return collect($this->props)
             ->filter(fn ($prop) => $prop instanceof Mergeable)
-            ->filter(fn ($prop) => $prop->shouldMerge())
-            ->reject(fn ($_, $key) => in_array($key, $resetProps))
-            ->filter(fn ($_, $key) => count($onlyProps) === 0 || in_array($key, $onlyProps))
-            ->reject(fn ($_, $key) => in_array($key, $exceptProps));
+            ->filter(fn (Mergeable $prop) => $prop->shouldMerge())
+            ->reject(fn ($_, string $key) => in_array($key, $resetProps))
+            ->filter(fn ($_, string $key) => count($onlyProps) === 0 || in_array($key, $onlyProps))
+            ->reject(fn ($_, string $key) => in_array($key, $exceptProps));
     }
 
     /**
@@ -467,8 +467,8 @@ protected function getMergePropsForRequest(Request $request): Collection
     public function resolveScrollProps(Request $request): array
     {
         $scrollProps = $this->getMergePropsForRequest($request)
-            ->filter(fn ($prop) => $prop instanceof ScrollProp)
-            ->each(fn (ScrollProp $prop) => $prop->setMergeStrategy($request))
+            ->filter(fn (Mergeable $prop) => $prop instanceof ScrollProp)
+            ->each(fn (ScrollProp $prop) => $prop->configureMergeDirection($request))
             ->mapWithKeys(fn (ScrollProp $prop, string $key) => [$key => $prop->meta()]);
 
         return $scrollProps->isNotEmpty() ? ['scrollProps' => $scrollProps->toArray()] : [];
@@ -483,9 +483,13 @@ public function resolveMergeProps(Request $request): array
     {
         $mergeProps = $this->getMergePropsForRequest($request);
 
+        $mergePropsWithAppendOrPrependPath = $mergeProps
+            ->filter(fn (Mergeable $prop) => $prop->hasAppendPaths() || $prop->hasPrependPaths())
+            ->keys();
+
         $deepMergeProps = $mergeProps
-            ->reject(fn ($prop) => $prop->hasAppendPaths() || $prop->hasPrependPaths())
-            ->filter(fn ($prop) => $prop->shouldDeepMerge())
+            ->reject(fn ($_, string $key) => $mergePropsWithAppendOrPrependPath->contains($key))
+            ->filter(fn (Mergeable $prop) => $prop->shouldDeepMerge())
             ->keys();
 
         $matchPropsOn = $mergeProps
@@ -498,12 +502,12 @@ public function resolveMergeProps(Request $request): array
             ->values();
 
         $prependProps = $mergeProps
-            ->reject(fn ($prop) => $prop->hasAppendPaths() || $prop->hasPrependPaths())
+            ->reject(fn ($_, string $key) => $mergePropsWithAppendOrPrependPath->contains($key))
             ->filter(fn (Mergeable $prop) => ! $prop->shouldAppend() && ! $prop->shouldDeepMerge())
             ->keys();
 
         $mergeProps = $mergeProps
-            ->reject(fn ($prop) => $prop->hasAppendPaths() || $prop->hasPrependPaths())
+            ->reject(fn ($_, string $key) => $mergePropsWithAppendOrPrependPath->contains($key))
             ->filter(fn (Mergeable $prop) => $prop->shouldAppend() && ! $prop->shouldDeepMerge())
             ->keys();
 

src/ScrollProp.php

@@ -63,9 +63,12 @@ public function __construct($value, string $wrapper = 'data', callable|array|nul
     }
 
     /**
-     * Set the merge strategy for the paginated data.
+     * Configure the merge strategy based on the scroll direction header.
+     *
+     * If the "X-Inertia-Scroll-Direction" header is set to "up", the items
+     * will be prepended; otherwise, it will be appended.
      */
-    public function setMergeStrategy(?Request $request = null): self
+    public function configureMergeDirection(?Request $request = null): self
     {
         $request ??= request();
 

tests/ScrollPropTest.php

@@ -57,21 +57,21 @@ public function test_can_set_the_merge_strategy_based_on_the_scroll_direction_he
 
         // Test append strategy without header
         $appendProp = new ScrollProp($users);
-        $appendProp->setMergeStrategy();
+        $appendProp->configureMergeDirection();
         $this->assertContains('data', $appendProp->appendPaths());
         $this->assertEmpty($appendProp->prependPaths());
 
         // Test append strategy with header set to 'down'
         request()->headers->set(Header::SCROLL_DIRECTION, 'down');
         $appendProp = new ScrollProp($users);
-        $appendProp->setMergeStrategy();
+        $appendProp->configureMergeDirection();
         $this->assertContains('data', $appendProp->appendPaths());
         $this->assertEmpty($appendProp->prependPaths());
 
         // Test prepend strategy
         request()->headers->set(Header::SCROLL_DIRECTION, 'up');
         $prependProp = new ScrollProp($users);
-        $prependProp->setMergeStrategy();
+        $prependProp->configureMergeDirection();
         $this->assertContains('data', $prependProp->prependPaths());
         $this->assertEmpty($prependProp->appendPaths());
     }