Fix prev-next in guide

Author: distantnative

site/controllers/guide.php

@@ -1,14 +1,27 @@
 <?php
 
 use Kirby\Cms\Page;
+use Kirby\Cms\Pages;
 
 return function (Page $page) {
 
-	if ($page->text()->isEmpty() && $page->hasChildren()) {
+	if ($page->isChapter()) {
 		go($page->children()->first()->url());
 	}
 
+	$menu     = collection('guides')->group('category');
+	$prevnext = new Pages();
+
+	foreach ($menu as $guides) {
+		foreach ($guides as $guide) {
+			$prevnext->add($guide);
+			$prevnext->add($guide->index()->listed());
+		}
+	}
+
 	return [
-		'guide' => $page,
+		'guide'    => $page,
+		'menu'     => $menu,
+		'prevnext' => $prevnext->filterBy('isChapter', false)
 	];
 };

site/models/guide.php

@@ -4,6 +4,11 @@
 
 class GuidePage extends Page
 {
+	public function isChapter(): bool
+	{
+		return $this->text()->isEmpty() && $this->hasChildren();
+	}
+
 	public function metadata(): array
 	{
 		return [

site/snippets/sidebar/menu-grouped.php

@@ -1,4 +1,4 @@
-<?php foreach ($menu->group('category') as $category => $items): ?>
+<?php foreach ($menu as $category => $items): ?>
 <section class="sidebar-group">
 	<h2><?= option('categories')[$category] ?? ucfirst($category) ?></h2>
 	<?php snippet('sidebar/menu', ['menu' => $items, 'marginBottom' => 'mb-6']); ?>

site/snippets/sidebar/mobile-options.php

@@ -0,0 +1,10 @@
+<?php foreach ($items as $item): ?>
+	<option value="<?= $item->url() ?>">
+		<?= $item->title() ?>
+	</option>
+	<?php foreach ($item->children()->listed() as $subItem): ?>
+	<option value="<?= $subItem->url() ?>">
+		&nbsp;&nbsp;&nbsp;<?= $subItem->title() ?>
+	</option>
+	<?php endforeach ?>
+<?php endforeach ?>

site/snippets/sidebar/mobile-select.php

@@ -10,32 +10,16 @@
 	>
 		<option disabled selected>Select a page …</option>
 		<?php if ($hasCategories ?? false): ?>
-		<?php foreach ($menu->group('category') as $category => $items): ?>
-			<optgroup label="<?= option('categories')[$category] ?? ucfirst($category) ?>">
-				<?php foreach ($items as $item): ?>
-					<option value="<?= $item->url() ?>">
-						<?= $item->title() ?>
-					</option>
-					<?php foreach ($item->children()->listed() as $subItem): ?>
-					<option value="<?= $subItem->url() ?>">
-						&nbsp;&nbsp;&nbsp;<?= $subItem->title() ?>
-					</option>
-					<?php endforeach ?>
-				<?php endforeach ?>
-			</optgroup>
-		<?php endforeach ?>
+			<?php foreach ($menu as $category => $items): ?>
+				<optgroup
+					label="<?= option('categories')[$category] ?? ucfirst($category) ?>"
+				>
+					<?php snippet('sidebar/mobile-options', ['items' => $items]) ?>
+				</optgroup>
+			<?php endforeach ?>
 
 		<?php else: ?>
-		<?php foreach ($menu as $item): ?>
-			<option value="<?= $item->url() ?>">
-				<?= $item->title() ?>
-			</option>
-			<?php foreach ($item->children()->listed() as $subItem): ?>
-			<option value="<?= $subItem->url() ?>">
-				&nbsp;&nbsp;&nbsp;<?= $subItem->title() ?>
-			</option>
-			<?php endforeach ?>
-		<?php endforeach ?>
+			<?php snippet('sidebar/mobile-options', ['items' => $menu]) ?>
 		<?php endif ?>
 	</select>
 </div>

site/templates/guide.php

@@ -4,13 +4,11 @@
 <?php snippet('sidebar', [
 	'title'         => 'Guide',
 	'link'          => '/docs/guide',
-	'menu'          => collection('guides'),
+	'menu'          => $menu,
 	'hasCategories' => true,
 ]) ?>
 <?php endslot() ?>
 
 <?php slot('prevnext') ?>
-<?php snippet('layouts/prevnext', [
-	'siblings' => page('docs/guide')->index()->listed()
-]) ?>
+<?php snippet('layouts/prevnext', ['siblings' => $prevnext]) ?>
 <?php endslot() ?>