feature: added setting to always show the previous and next links

Author: Marvin Kuhn

Classes/Fusion/PaginationArrayImplementation.php

@@ -96,13 +96,11 @@ protected function getPageArray()
      */
     protected function addItemToTheStartOfPageArray($pageArray, $page, $type)
     {
-        if ($this->firstPage > 1) {
-            array_unshift($pageArray, [
-                'page' => $page,
-                'label' => $this->paginationConfig['labels'][$type],
-                'type' => $type
-            ]);
-        }
+        array_unshift($pageArray, [
+            'page' => $page,
+            'label' => $this->paginationConfig['labels'][$type],
+            'type' => $type
+        ]);
 
         return $pageArray;
     }
@@ -116,13 +114,11 @@ protected function addItemToTheStartOfPageArray($pageArray, $page, $type)
      */
     protected function addItemToTheEndOfPageArray($pageArray, $page, $type)
     {
-        if ($this->lastPage  < $this->numberOfPages) {
-            $pageArray[] = [
-                'page' => $page,
-                'label' => $this->paginationConfig['labels'][$type],
-                'type' => $type
-            ];
-        }
+        $pageArray[] = [
+            'page' => $page,
+            'label' => $this->paginationConfig['labels'][$type],
+            'type' => $type
+        ];
 
         return $pageArray;
     }
@@ -136,18 +132,31 @@ public function evaluate()
         }
 
         $pageArray = $this->getPageArray();
-
+        // add seperators
         if ($this->paginationConfig['showSeperators']) {
-            $pageArray = $this->addItemToTheStartOfPageArray($pageArray, false, 'seperator');
-            $pageArray = $this->addItemToTheEndOfPageArray($pageArray, false, 'seperator');
+            if ($this->firstPage > 1) {
+                $pageArray = $this->addItemToTheStartOfPageArray($pageArray, false, 'seperator');
+            }
+            if ($this->lastPage  < $this->numberOfPages) {
+                $pageArray = $this->addItemToTheEndOfPageArray($pageArray, false, 'seperator');
+            }
         }
+        // add previous and next
         if ($this->paginationConfig['showNextAndPrevious']) {
-            $pageArray = $this->addItemToTheStartOfPageArray($pageArray, $this->currentPage - 1, 'previous');
-            $pageArray = $this->addItemToTheEndOfPageArray($pageArray, $this->currentPage + 1, 'next');
+            if ($this->firstPage > 1 || $this->paginationConfig['alwaysShowNextAndPrevious']) {
+                $pageArray = $this->addItemToTheStartOfPageArray($pageArray, $this->currentPage - 1, 'previous');
+            }
+            if ($this->lastPage  < $this->numberOfPages || $this->paginationConfig['alwaysShowNextAndPrevious']) {
+                $pageArray = $this->addItemToTheEndOfPageArray($pageArray, $this->currentPage + 1, 'next');
+            }
         }
         if ($this->paginationConfig['showFirstAndLast']) {
-            $pageArray = $this->addItemToTheStartOfPageArray($pageArray, 1, 'first');
-            $pageArray = $this->addItemToTheEndOfPageArray($pageArray, $this->numberOfPages, 'last');
+            if ($this->firstPage > 1 || $this->paginationConfig['alwaysShowFirstAndLast']) {
+                $pageArray = $this->addItemToTheStartOfPageArray($pageArray, 1, 'first');
+            }
+            if ($this->lastPage  < $this->numberOfPages || $this->paginationConfig['alwaysShowFirstAndLast']) {
+                $pageArray = $this->addItemToTheEndOfPageArray($pageArray, $this->numberOfPages, 'last');
+            }
         }
         return $pageArray;
     }

Configuration/Settings.yaml

@@ -21,7 +21,9 @@ Breadlesscode:
     pagination:
       showSeperators: true
       showNextAndPrevious: true
+      alwaysShowNextAndPrevious: false
       showFirstAndLast: true
+      alwaysShowFirstAndLast: false
       labels:
         seperator: '…'
         previous: '⟨'

Resources/Private/Fusion/Component/PaginationConfig.fusion

@@ -1,7 +1,9 @@
 prototype(Breadlesscode.Listable:PaginationConfig) < prototype(Neos.Fusion:RawArray) {
     showSeperators = ${ Configuration.setting('Breadlesscode.Listable.pagination.showSeperators') }
     showNextAndPrevious = ${ Configuration.setting('Breadlesscode.Listable.pagination.showNextAndPrevious') }
+    alwaysShowNextAndPrevious = ${ Configuration.setting('Breadlesscode.Listable.pagination.alwaysShowNextAndPrevious') }
     showFirstAndLast = ${ Configuration.setting('Breadlesscode.Listable.pagination.showFirstAndLast') }
+    alwaysShowFirstAndLast = ${ Configuration.setting('Breadlesscode.Listable.pagination.alwaysShowFirstAndLast') }
 
     labels = Neos.Fusion:RawArray {
         seperator = ${ Configuration.setting('Breadlesscode.Listable.pagination.labels.seperator') }