From c01aef866ebccbe36e1bd50d424d799d0f9c731d Mon Sep 17 00:00:00 2001
From: Jerel Miller <jerelmiller@gmail.com>
Date: Wed, 2 Dec 2020 22:32:06 -0800
Subject: [PATCH] fix: update main layout to use new layout components

---
 src/components/Sidebar.js |  69 -----------------
 src/layouts/MainLayout.js | 157 +++++++++++++-------------------------
 src/layouts/index.js      |   2 +-
 3 files changed, 56 insertions(+), 172 deletions(-)
 delete mode 100644 src/components/Sidebar.js

diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
deleted file mode 100644
index 3307416c6..000000000
--- a/src/components/Sidebar.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { css } from '@emotion/core';
-import { Link } from 'gatsby';
-import Navigation from './Navigation';
-import { Logo, SearchInput } from '@newrelic/gatsby-theme-newrelic';
-
-const Sidebar = ({ className }) => {
-  const [searchTerm, setSearchTerm] = useState('');
-
-  return (
-    <aside
-      data-swiftype-index={false}
-      className={className}
-      css={css`
-        padding: 0 2rem 2rem;
-        border-right: 1px solid var(--divider-color);
-
-        @media screen and (max-width: 760px) {
-          height: 60px;
-          border-bottom: 1px solid var(--divider-color);
-        }
-      `}
-    >
-      <div
-        css={css`
-          background: var(--primary-background-color);
-          position: sticky;
-          top: 0;
-          z-index: 10;
-          padding: 1rem 0.5rem;
-          margin: 0 -0.5rem 0.5rem;
-        `}
-      >
-        <Link
-          css={css`
-            display: block;
-            margin-bottom: 1rem;
-          `}
-          to="/"
-        >
-          <Logo
-            css={css`
-              display: block;
-              width: 150px;
-
-              @media screen and (max-width: 760px) {
-                width: 160px;
-              }
-            `}
-          />
-        </Link>
-        <SearchInput
-          placeholder="Filter navigation"
-          onClear={() => setSearchTerm('')}
-          onChange={(e) => setSearchTerm(e.target.value)}
-          value={searchTerm}
-        />
-      </div>
-      <Navigation searchTerm={searchTerm} />
-    </aside>
-  );
-};
-
-Sidebar.propTypes = {
-  className: PropTypes.string,
-};
-
-export default Sidebar;
diff --git a/src/layouts/MainLayout.js b/src/layouts/MainLayout.js
index 6e8ca43f4..b4f40d9f5 100644
--- a/src/layouts/MainLayout.js
+++ b/src/layouts/MainLayout.js
@@ -4,68 +4,31 @@ import { css } from '@emotion/core';
 import {
   CookieConsentDialog,
   GlobalHeader,
-  GlobalFooter,
+  Layout,
+  Logo,
+  SearchInput,
+  useLayout,
 } from '@newrelic/gatsby-theme-newrelic';
-import { graphql, useStaticQuery } from 'gatsby';
 import MobileHeader from '../components/MobileHeader';
-import Sidebar from '../components/Sidebar';
+import { Link } from 'gatsby';
+import Navigation from '../components/Navigation';
 import '../components/styles.scss';
-import usePageContext from '../hooks/usePageContext';
 import { useLocation } from '@reach/router';
-import { useMeasure } from 'react-use';
-
-const MainLayout = ({ children }) => {
-  const {
-    site: { layout, siteMetadata },
-  } = useStaticQuery(graphql`
-    query {
-      site {
-        layout {
-          contentPadding
-          maxWidth
-        }
-        siteMetadata {
-          repository
-        }
-      }
-    }
-  `);
 
+const MainLayout = ({ children, pageContext }) => {
+  const { contentPadding, maxWidth } = useLayout();
   const location = useLocation();
-  const { fileRelativePath } = usePageContext();
-  const [headerRef, { height }] = useMeasure();
+  const [searchTerm, setSearchTerm] = useState('');
+  const { fileRelativePath } = pageContext;
   const [isMobileNavOpen, setIsMobileNavOpen] = useState(false);
-  const isComponentDoc = fileRelativePath.includes(
-    'src/markdown-pages/components'
-  );
-  const editUrl = isComponentDoc
-    ? null
-    : `${siteMetadata.repository}/blob/main/${fileRelativePath}`;
 
   useEffect(() => {
     setIsMobileNavOpen(false);
   }, [location.pathname]);
 
   return (
-    <div
-      css={css`
-        --sidebar-width: 300px;
-
-        min-height: 100vh;
-        display: grid;
-        grid-template-rows: auto 1fr;
-      `}
-    >
-      <div
-        ref={headerRef}
-        css={css`
-          position: sticky;
-          z-index: 99;
-          top: 0;
-        `}
-      >
-        <GlobalHeader editUrl={editUrl} />
-      </div>
+    <>
+      <GlobalHeader />
       <MobileHeader
         css={css`
           @media (min-width: 761px) {
@@ -75,70 +38,60 @@ const MainLayout = ({ children }) => {
         isOpen={isMobileNavOpen}
         toggle={() => setIsMobileNavOpen(!isMobileNavOpen)}
       />
-      <div
+      <Layout
         css={css`
-          --global-header-height: ${height}px;
-
           display: ${isMobileNavOpen ? 'none' : 'grid'};
-          grid-template-areas:
-            'sidebar content'
-            'sidebar footer';
-          grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
-          grid-template-rows: 1fr auto;
-          grid-gap: ${layout.contentPadding};
-          width: 100%;
-          max-width: ${layout.maxWidth};
-          margin: 0 auto;
-
-          @media screen and (max-width: 760px) {
-            grid-template-columns: minmax(0, 1fr);
-          }
         `}
       >
-        <Sidebar
-          css={css`
-            position: fixed;
-            top: var(--global-header-height);
-            width: var(--sidebar-width);
-            height: calc(100vh - var(--global-header-height));
-            overflow: auto;
+        <Layout.Sidebar>
+          <div
+            css={css`
+              background: var(--primary-background-color);
+              position: sticky;
+              top: -2rem;
+              z-index: 10;
+              margin: -2rem -0.5rem 1rem;
+              padding: 1rem 0.5rem;
+            `}
+          >
+            <Link
+              css={css`
+                display: block;
+                margin-bottom: 1rem;
+              `}
+              to="/"
+            >
+              <Logo
+                css={css`
+                  display: block;
+                  width: 150px;
 
-            @media (max-width: 760px) {
-              display: none;
-            }
-          `}
-        />
-        <div
-          css={css`
-            grid-area: sidebar;
-          `}
-        />
-        <article
-          data-swiftype-name="body"
-          data-swiftype-type="text"
-          css={css`
-            grid-area: content;
-            padding-top: ${layout.contentPadding};
-            padding-right: ${layout.contentPadding};
-          `}
-        >
-          {children}
-        </article>
-        <GlobalFooter
-          fileRelativePath={fileRelativePath}
-          css={css`
-            grid-area: footer;
-            margin-left: -${layout.contentPadding};
-          `}
-        />
-      </div>
+                  @media screen and (max-width: 760px) {
+                    width: 160px;
+                  }
+                `}
+              />
+            </Link>
+            <SearchInput
+              placeholder="Filter navigation"
+              onClear={() => setSearchTerm('')}
+              onChange={(e) => setSearchTerm(e.target.value)}
+              value={searchTerm}
+            />
+          </div>
+          <Navigation searchTerm={searchTerm} />
+        </Layout.Sidebar>
+        <Layout.Main>{children}</Layout.Main>
+        <Layout.Footer fileRelativePath={fileRelativePath} />
+      </Layout>
       <CookieConsentDialog />
-    </div>
+    </>
   );
 };
 
 MainLayout.propTypes = {
   children: PropTypes.node.isRequired,
+  pageContext: PropTypes.object.isRequired,
 };
 
 export default MainLayout;
diff --git a/src/layouts/index.js b/src/layouts/index.js
index d002b0d68..6f1c7ad57 100644
--- a/src/layouts/index.js
+++ b/src/layouts/index.js
@@ -6,7 +6,7 @@ const Layout = ({ children, pageContext }) => {
   if (pageContext.fileRelativePath.match(/404/)) {
     return children;
   }
-  return <MainLayout>{children}</MainLayout>;
+  return <MainLayout pageContext={pageContext}>{children}</MainLayout>;
 };
 
 Layout.propTypes = {