Update paginatators logic

spatie · Apr 4, 2024 · 4d5ee82 · 4d5ee82
1 parent e6f82ef
commit 4d5ee82
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Resolvers/TransformedDataCollectableResolver.php b/src/Resolvers/TransformedDataCollectableResolver.php
@@ -89,18 +89,16 @@ protected function transformPaginator(
         Wrap $wrap,
         TransformationContext $nestedContext,
     ): array {
-        $items = array_map(fn (BaseData $data) => $this->transformationClosure($nestedContext)($data), $paginator->items());
-
         if ($nestedContext->transformValues === false) {
-            return $items;
+            return $paginator->map(fn (BaseData $data) => $this->transformationClosure($nestedContext)($data))->all();
         }
 
         $paginated = $paginator->toArray();
 
         $wrapKey = $wrap->getKey() ?? 'data';
 
         return [
-            $wrapKey => $items,
+            $wrapKey => array_map(fn (BaseData $data) => $this->transformationClosure($nestedContext)($data), $paginator->items()),
             'links' => $paginated['links'] ?? [],
             'meta' => Arr::except($paginated, [
                 'data',