Merge pull request #1111 from newrelic/clark/search-fixes

Search updates
newrelic · Oct 23, 2024 · 22ba558 · 22ba558
2 parents 141d04e + 4781891
commit 22ba558
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/packages/gatsby-theme-newrelic/src/components/GlobalSearch.js b/packages/gatsby-theme-newrelic/src/components/GlobalSearch.js
@@ -6,6 +6,7 @@ import { useThrottle } from 'react-use';
 
 import useKeyPress from '../hooks/useKeyPress';
 import useThemeTranslation from '../hooks/useThemeTranslation';
+import useScrollFreeze from '../hooks/useScrollFreeze';
 import { addPageAction } from '../utils/nrBrowserAgent';
 
 import useSearch from './SearchModal/useSearch';
@@ -31,6 +32,8 @@ const GlobalSearch = ({ onClose }) => {
   const [selected, setSelected] = useState(null);
   const possibleSelections = results.length + recentQueries.length;
 
+  useScrollFreeze(open);
+
   const moveUp = () =>
     setSelected((s) => {
       if (s == null) return possibleSelections - 1;

diff --git a/packages/gatsby-theme-newrelic/src/components/SEO.js b/packages/gatsby-theme-newrelic/src/components/SEO.js
@@ -100,7 +100,7 @@ const SEO = ({ title, location, type, children }) => {
                 "@type": "SearchAction",
                 "target": {
                   "@type": "EntryPoint",
-                  "urlTemplate": "${siteUrl}/?q={search_term_string}"
+                  "urlTemplate": "${siteUrl}/search-results/?query={search_term_string}&page=1"
                 },
                 "query-input": "required name=search_term_string"
               }]

diff --git a/packages/gatsby-theme-newrelic/src/components/SearchInput.js b/packages/gatsby-theme-newrelic/src/components/SearchInput.js
@@ -91,7 +91,7 @@ const SearchInput = forwardRef(
       >
         {isIconClickable ? (
           <Link
-            to={`?q=${value}`}
+            to={`search-results/?query=${value}&page=1`}
             css={css`
               color: var(--brand-button-primary-accent);
               &:hover {

diff --git a/packages/gatsby-theme-newrelic/src/pages/404.js b/packages/gatsby-theme-newrelic/src/pages/404.js
@@ -229,7 +229,12 @@ const NotFoundPage = ({
               <SearchInput
                 placeholder={searchTerm}
                 onFocus={() =>
-                  navigate(`?q=${searchTerm.replaceAll(' ', '+')}`)
+                  navigate(
+                    `search-results/?query=${searchTerm.replaceAll(
+                      ' ',
+                      '+'
+                    )}&page=1`
+                  )
                 }
                 css={css`
                   min-width: 200px;