Skip to content

Commit ee1e920

Browse files
authored
include all exercises in chapter that matches search - closes sveltejs#226 (sveltejs#231)
1 parent 5eb79b5 commit ee1e920

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

src/routes/tutorial/[slug]/Menu.svelte

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,18 @@
3636
3737
$: filtered = index
3838
.map((part, i) => {
39-
const chapters = part.chapters
40-
.map((chapter, i) => ({
41-
...chapter,
42-
label: String.fromCharCode(97 + i),
43-
first: chapter.exercises[0].slug,
44-
exercises: chapter.exercises.filter((exercise) => regex.test(exercise.title))
45-
}))
46-
.filter((chapter) => chapter.exercises.length > 0 || regex.test(chapter.title));
47-
4839
return {
49-
...part,
50-
label: i + 1,
51-
first: part.chapters[0].exercises[0].slug,
52-
chapters
40+
slug: part.slug,
41+
title: part.title,
42+
chapters: part.chapters
43+
.map((chapter) => ({
44+
slug: chapter.slug,
45+
title: chapter.title,
46+
exercises: regex.test(chapter.title)
47+
? chapter.exercises
48+
: chapter.exercises.filter((exercise) => regex.test(exercise.title))
49+
}))
50+
.filter((chapter) => chapter.exercises.length > 0)
5351
};
5452
})
5553
.filter((part) => part.chapters.length > 0 || regex.test(part.title));
@@ -102,7 +100,7 @@
102100

103101
<div class="exercises">
104102
<ul>
105-
{#each filtered as part (part.slug)}
103+
{#each filtered as part, i (part.slug)}
106104
<li
107105
class="part"
108106
class:expanded={part.slug === expanded_part}
@@ -117,7 +115,7 @@
117115
}
118116
}}
119117
>
120-
Part {part.label}: {part.title}
118+
Part {i + 1}: {part.title}
121119
</button>
122120

123121
{#if search.length >= 2 || part.slug === expanded_part}

0 commit comments

Comments
 (0)