Merge pull request #1 from jmezzacappa/joey/excerpts

CrunchyData · Sep 26, 2023 · c9c4db2 · c9c4db2
2 parents bfdeec5 + 0d53550
commit c9c4db2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/components/layout/Search.tsx b/app/components/layout/Search.tsx
@@ -15,13 +15,17 @@ import {
 function showExcerpt(body: string | null, query: string) {
 	if (body === null) return '...'
 
-	if (!body.includes(query)) return `${body}...`
+	const startIndex = body.toLowerCase().indexOf(query.toLowerCase())
+	if (startIndex === -1) return `${body}...`
 
-	const [before, after] = body.split(query)
+	const endIndex = startIndex + query.length
+	const before = body.slice(0, startIndex)
+	const matched = body.slice(startIndex, endIndex)
+	const after = body.slice(endIndex)
 	return (
 		<>
 			...{before}
-			<strong>{query}</strong>
+			<strong>{matched}</strong>
 			{after}...
 		</>
 	)

diff --git a/app/routes/documentation.$product.$ref.actions.search.tsx b/app/routes/documentation.$product.$ref.actions.search.tsx
@@ -7,6 +7,7 @@ function getBodyContext(body: string, term: string) {
 	const numContextWords = 2
 	const searchTermRegex = new RegExp(
 		`(?:\\s?(?:[\\w]+)\\s?){0,${numContextWords}}${term}(?:\\s?(?:[\\w]+)\\s?){0,${numContextWords}}`,
+		'i',
 	)
 	const excerptRegex = /^(\w+(?:\s+\w+){0,5})/
 

diff --git a/app/routes/documentation.private.$product.$ref.actions.search.tsx b/app/routes/documentation.private.$product.$ref.actions.search.tsx
@@ -7,6 +7,7 @@ function getBodyContext(body: string, term: string) {
 	const numContextWords = 2
 	const searchTermRegex = new RegExp(
 		`(?:\\s?(?:[\\w]+)\\s?){0,${numContextWords}}${term}(?:\\s?(?:[\\w]+)\\s?){0,${numContextWords}}`,
+		'i',
 	)
 	const excerptRegex = /^(\w+(?:\s+\w+){0,5})/