Skip to content

Commit 29369b8

Browse files
committed
fix(ewd): principles navigation
1 parent 49b5503 commit 29369b8

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

apps/epic-web/src/templates/principles-layout.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ function findCurrentAndAdjacentItems(
230230
item: subsection,
231231
parentSlug: section.slug,
232232
})
233-
234233
subsection.principles?.forEach((principle) => {
235234
flattenedItems.push({
236235
item: principle,
@@ -241,18 +240,16 @@ function findCurrentAndAdjacentItems(
241240
})
242241
})
243242

244-
// Find current item index based on full path match
243+
// Find current item index based on exact path match
245244
const currentIndex = flattenedItems.findIndex(
246245
({item, parentSlug, subsectionSlug}) => {
247-
if (subsectionSlug) {
248-
return currentPath.includes(
249-
`/principles/${parentSlug}/${subsectionSlug}/${item.slug}`,
250-
)
251-
}
252-
if (parentSlug) {
253-
return currentPath.includes(`/principles/${parentSlug}/${item.slug}`)
254-
}
255-
return currentPath === `/principles/${item.slug}`
246+
const expectedPath = subsectionSlug
247+
? `/principles/${parentSlug}/${subsectionSlug}/${item.slug}`
248+
: parentSlug
249+
? `/principles/${parentSlug}/${item.slug}`
250+
: `/principles/${item.slug}`
251+
252+
return currentPath === expectedPath
256253
},
257254
)
258255

0 commit comments

Comments
 (0)