[components/MDX][s]: observer moved to MDXContent

life-itself · Jun 6, 2022 · 706c7b0 · 706c7b0
1 parent e0a316e
commit 706c7b0
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 62 deletions.
diff --git a/site/components/MDX.js b/site/components/MDX.js
@@ -1,27 +1,13 @@
-import { NextSeo } from 'next-seo'
+import { NextSeo } from "next-seo";
 import LiteYouTubeEmbed from "react-lite-youtube-embed";
 
 import { YOUTUBE_REGEX } from "../lib/constants";
 import siteConfig from "../config/siteConfig";
-import MdxContent from './MdxContent'
-import useHeadingsObserver from '../hooks/useHeadingsObserver'
-// import dynamic from 'next/dynamic'
-
-// import { Paragraph } from "./Paragraph";
-// import { Anchor } from "./Anchor";
-
-// const Anchor = dynamic(() => import('./Anchor').then(module => module.Anchor), {
-//   ssr: false
-// })
-
-// const Paragraph = dynamic(() => import("./Paragraph").then(mod => mod.Paragraph))
+import MdxContent from "./MdxContent";
 
 export default function MdxPage({ body, frontMatter }) {
-  const observer = useHeadingsObserver();
-
-  const {
-    title, description, date, keywords, youtube, podcast, image, _raw
-  } = frontMatter
+  const { title, description, date, keywords, youtube, podcast, image, _raw } =
+    frontMatter;
 
   let youtubeThumnbnail;
 
@@ -97,58 +83,58 @@ export default function MdxPage({ body, frontMatter }) {
                   on {date}
                 </p>
               )}
-            {description && <p className="">{description}</p>}
-            {youtubeId && <LiteYouTubeEmbed id={youtubeId} />}
+              {description && <p className="">{description}</p>}
+              {youtubeId && <LiteYouTubeEmbed id={youtubeId} />}
               {podcast && (
                 <div className="pt-4">
                   <ul className="list-disc">
                     <li>
-                    <a
-                      className="flex items-center"
-                      target="_blank"
-                      rel="noopener"
-                      href={podcast}
-                    >
-                      <div className="w-4 mr-2">
-                        <PodcastIcon />
-                      </div>
-                      <p className="m-0">Listen to this podcast</p>
-                    </a>
+                      <a
+                        className="flex items-center"
+                        target="_blank"
+                        rel="noopener"
+                        href={podcast}
+                      >
+                        <div className="w-4 mr-2">
+                          <PodcastIcon />
+                        </div>
+                        <p className="m-0">Listen to this podcast</p>
+                      </a>
                     </li>
                   </ul>
                 </div>
               )}
             </div>
           </header>
           <main className="my-6">
-            <MdxContent body={body} observer={observer}/>
+            <MdxContent body={body} />
             {editUrl && (
-            <div className="mt-12 mb-6">
-              <a
-                className="flex no-underline font-semibold text-yellow-li"
-                href={editUrl}
-                target="_blank"
-              >
+              <div className="mt-12 mb-6">
+                <a
+                  className="flex no-underline font-semibold text-yellow-li"
+                  href={editUrl}
+                  target="_blank"
+                >
                   Edit this page
                   <span className="mx-1">
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    className="h-6 w-6"
-                    fill="none"
-                    viewBox="0 0 24 24"
-                    stroke="currentColor"
-                    strokeWidth="2"
-                  >
-                    <path
-                      strokeLinecap="round"
-                      strokeLinejoin="round"
-                      d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"
-                    />
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      className="h-6 w-6"
+                      fill="none"
+                      viewBox="0 0 24 24"
+                      stroke="currentColor"
+                      strokeWidth="2"
+                    >
+                      <path
+                        strokeLinecap="round"
+                        strokeLinejoin="round"
+                        d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"
+                      />
                     </svg>
                   </span>
                 </a>
-            </div>
-          )}
+              </div>
+            )}
           </main>
         </article>
       </div>

diff --git a/site/components/MdxContent.js b/site/components/MdxContent.js
@@ -1,12 +1,15 @@
-import React from 'react'
-import Head from 'next/head'
-import { useMDXComponent } from 'next-contentlayer/hooks';
-import { Paragraph } from './Paragraph'
-import { Anchor } from './Anchor'
-import { Heading } from './Heading'
+import React from "react";
+import Head from "next/head";
+import { useMDXComponent } from "next-contentlayer/hooks";
 
+import useHeadingsObserver from "../hooks/useHeadingsObserver";
+import { Paragraph } from "./Paragraph";
+import { Anchor } from "./Anchor";
+import { Heading } from "./Heading";
+
+const MdxContent = ({ body }) => {
+  const observer = useHeadingsObserver();
 
-const MdxContent = ({ body, observer }) => {
   const customComponents = {
     Head,
     p: Paragraph,
@@ -17,10 +20,10 @@ const MdxContent = ({ body, observer }) => {
     h4: Heading({ level: 4, observer }),
     h5: Heading({ level: 5, observer }),
     h6: Heading({ level: 6, observer }),
-  }
+  };
   const Component = useMDXComponent(body.code);
 
-  return <Component components={ customComponents }/>
+  return <Component components={customComponents} />;
 };
 
 // prevent rerendering of the component if it's props don't change