From cee5875b306214d9e9574842ae913a3c06ae760d Mon Sep 17 00:00:00 2001 From: nick shook Date: Thu, 16 Apr 2020 13:08:30 -0700 Subject: [PATCH 1/3] Add null check to address #21263 https://github.com/gatsbyjs/gatsby/issues/21263 is an issue many people are arriving at for a variety of reasons. Since the code contains this logic on the following line: ``` if (pageHeadings && pageHeadings.length) { ``` There should be no issue in seeing if `document.getElementById(`gatsby-focus-wrapper`) exists first before attempting to look up `getElementsByTagName`. --- packages/gatsby/cache-dir/navigation.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/gatsby/cache-dir/navigation.js b/packages/gatsby/cache-dir/navigation.js index 4f71ee4cc6cbb..f22c2116e2cd5 100644 --- a/packages/gatsby/cache-dir/navigation.js +++ b/packages/gatsby/cache-dir/navigation.js @@ -172,6 +172,8 @@ class RouteAnnouncer extends React.Component { pageName = document.title } const pageHeadings = document + .getElementById(`gatsby-focus-wrapper`) && + document .getElementById(`gatsby-focus-wrapper`) .getElementsByTagName(`h1`) if (pageHeadings && pageHeadings.length) { From b8c4cff698f60841e7515a11f74fb3737f5cfa5d Mon Sep 17 00:00:00 2001 From: nick shook Date: Sun, 19 Apr 2020 19:00:32 -0700 Subject: [PATCH 2/3] Update packages/gatsby/cache-dir/navigation.js Co-Authored-By: Vladimir Razuvaev --- packages/gatsby/cache-dir/navigation.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/gatsby/cache-dir/navigation.js b/packages/gatsby/cache-dir/navigation.js index f22c2116e2cd5..f7284e705f705 100644 --- a/packages/gatsby/cache-dir/navigation.js +++ b/packages/gatsby/cache-dir/navigation.js @@ -172,10 +172,7 @@ class RouteAnnouncer extends React.Component { pageName = document.title } const pageHeadings = document - .getElementById(`gatsby-focus-wrapper`) && - document - .getElementById(`gatsby-focus-wrapper`) - .getElementsByTagName(`h1`) + .querySelectorAll(`#gatsby-focus-wrapper h1`) if (pageHeadings && pageHeadings.length) { pageName = pageHeadings[0].textContent } From 4d0371324cbe53e6549f606227d6f90099567f29 Mon Sep 17 00:00:00 2001 From: gatsbybot Date: Mon, 20 Apr 2020 20:44:20 +0000 Subject: [PATCH 3/3] chore: format --- packages/gatsby/cache-dir/navigation.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/gatsby/cache-dir/navigation.js b/packages/gatsby/cache-dir/navigation.js index f7284e705f705..71d0e1feb8627 100644 --- a/packages/gatsby/cache-dir/navigation.js +++ b/packages/gatsby/cache-dir/navigation.js @@ -171,8 +171,7 @@ class RouteAnnouncer extends React.Component { if (document.title) { pageName = document.title } - const pageHeadings = document - .querySelectorAll(`#gatsby-focus-wrapper h1`) + const pageHeadings = document.querySelectorAll(`#gatsby-focus-wrapper h1`) if (pageHeadings && pageHeadings.length) { pageName = pageHeadings[0].textContent }