From 73adb71e10ae24ac15a8a4df9a5c23105ab84220 Mon Sep 17 00:00:00 2001
From: olayway <ola@yway.pl>
Date: Thu, 26 May 2022 18:53:18 +0200
Subject: [PATCH] [component/toc][f]: toc styles adjustment

---
 site/components/Heading.js                  |  7 +-
 site/components/Layout.js                   |  2 +-
 site/components/MDX.js                      | 78 +++++++++++----------
 site/components/MdxContent.js               | 26 +++++++
 site/components/_getIntersectionObserver.js | 30 ++++----
 site/components/_getMDXComponents.js        | 23 ------
 site/pages/[...slug].js                     | 30 ++++----
 site/styles/global.css                      | 38 ++++++----
 8 files changed, 127 insertions(+), 107 deletions(-)
 create mode 100644 site/components/MdxContent.js
 delete mode 100644 site/components/_getMDXComponents.js

diff --git a/site/components/Heading.js b/site/components/Heading.js
index d109757..1893ace 100644
--- a/site/components/Heading.js
+++ b/site/components/Heading.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 
+
 export const Heading = ({ level, observer }) => (props) => {
   useEffect(() => {
     if (observer) {
@@ -7,5 +8,9 @@ export const Heading = ({ level, observer }) => (props) => {
     }
   });
 
-  return React.createElement(`h${level}`, { ...props })
+
+  return React.createElement(`h${level}`, {
+    ...props,
+    className: "scroll-mt-16"
+  })
 }
diff --git a/site/components/Layout.js b/site/components/Layout.js
index ba79bb1..68af9fa 100644
--- a/site/components/Layout.js
+++ b/site/components/Layout.js
@@ -17,7 +17,7 @@ export default function Layout({ children }) {
         <link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />
       </Head>
       <Nav />
-      <main className="border-2 border-blue-500 max-w-7xl relative mx-auto px-2 sm:px-6 md:px-8">
+      <main className="max-w-7xl relative mx-auto px-2 sm:px-6 md:px-8">
         {/* <div className="hidden md:block w-[16rem] fixed top-16 left-[max(0px,calc(50%-40rem))] bottom-0 right-auto px-8 overflow-y-auto border-2 border-red-500"> */}
         {/*   <Sidebar /> */}
         {/* </div> */}
diff --git a/site/components/MDX.js b/site/components/MDX.js
index 265e5a4..2c02a15 100644
--- a/site/components/MDX.js
+++ b/site/components/MDX.js
@@ -6,8 +6,10 @@ import { YOUTUBE_REGEX } from "../lib/constants";
 import siteConfig from "../config/siteConfig";
 import getMDXComponents from "./_getMDXComponents";
 import getObserver from "./_getIntersectionObserver"
-import { Paragraph } from "./Paragraph";
-import { Anchor } from "./Anchor";
+import MdxContent from "./MdxContent"
+
+// import { Paragraph } from "./Paragraph";
+// import { Anchor } from "./Anchor";
 
 // const Anchor = dynamic(() => import('./Anchor').then(module => module.Anchor), {
 //   ssr: false
@@ -15,46 +17,48 @@ import { Anchor } from "./Anchor";
 
 // const Paragraph = dynamic(() => import("./Paragraph").then(mod => mod.Paragraph))
 
-
-export default function MdxPage({ children }) {
+export default function MdxPage({ body, frontMatter, editUrl }) {
   const [activeHeading, setActiveHeading] = useState("");
+  const [observer, setObserver] = useState(null);
 
-  const observer = getObserver((entry) => {
-    if (entry.isIntersecting) {
-      setActiveHeading(entry.target.id);
-    }
-  })
+  // run only after first render, in order to preserve the observer
+  useEffect((() => {
+    const observer = getObserver((entry) => {
+      if (entry.isIntersecting) {
+        setActiveHeading(entry.target.id);
+      }
+    });
+    setObserver(observer);
 
-  const components = getMDXComponents({
-    h: {
-      observer
-    }
-  })
+    return observer.disconnect();
+  }), [])
 
   useEffect(() => {
-    if (activeHeading) {
-      const tocLink = document.querySelector(`.toc-link[href="#${activeHeading}"]`)
-      tocLink.classList.add("active");
-
-      return () => {
-        tocLink.classList.remove("active")
+    if (!activeHeading) {
+      try {
+        const path = window.location.hash;
+        if (path) {
+          setActiveHeading(path.slice(1))
+        } else {
+          const firstTocHeading = document.querySelector(".toc-link");
+          const href = firstTocHeading.href;
+          setActiveHeading(href.match(/.+#(.+)/)[1]);
+        }
+      } finally {
+        return
       }
-    };
-  }, [activeHeading]);
+    }
+    const tocLink = document.querySelector(`.toc-link[href="#${activeHeading}"]`)
+    tocLink.classList.add("active");
+
+    return () => {
+      tocLink.classList.remove("active")
+    }
+  }, [activeHeading])
 
   const {
-    Component,
-    frontmatter: {
-      title,
-      description,
-      date,
-      keywords,
-      youtube,
-      podcast,
-      image,
-      _raw,
-    },
-  } = children;
+    title, description, date, authors, youtube, podcast, image, _raw
+  } = frontMatter
 
   let youtubeThumnbnail;
 
@@ -120,7 +124,7 @@ export default function MdxPage({ children }) {
           { name: "keywords", content: keywords ? keywords : "" },
         ]}
       />
-      <article className="border-2 border-green-500 prose dark:prose-invert prose-a:break-all mx-auto lg:mr-[20rem] p-6">
+      <article className="prose dark:prose-invert prose-a:break-all mx-auto lg:mr-[20rem] p-6">
         <header>
           <div className="mb-6">
             {title && <h1 className="mb-0">{title}</h1>}
@@ -152,8 +156,8 @@ export default function MdxPage({ children }) {
             )}
           </div>
         </header>
-        <main className="my-12">
-          <Component components={components} />
+        <main className="my-6">
+          <MdxContent body={body} observer={observer}/>
           {editUrl && (
             <div className="mt-12 mb-6">
               <a
diff --git a/site/components/MdxContent.js b/site/components/MdxContent.js
new file mode 100644
index 0000000..b59e64e
--- /dev/null
+++ b/site/components/MdxContent.js
@@ -0,0 +1,26 @@
+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'
+
+
+const MdxContent = ({ body, observer }) => {
+  const customComponents = {
+    Head,
+    p: Paragraph,
+    a: Anchor,
+    h1: Heading({ level: 1, observer }),
+    h2: Heading({ level: 2, observer }),
+    h3: Heading({ level: 3, 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 }/>
+};
+
+export default React.memo(MdxContent);
diff --git a/site/components/_getIntersectionObserver.js b/site/components/_getIntersectionObserver.js
index edbadd4..2be2208 100644
--- a/site/components/_getIntersectionObserver.js
+++ b/site/components/_getIntersectionObserver.js
@@ -1,22 +1,16 @@
 const getIntersectionObserver = (callback) => {
-  if (typeof window !== 'undefined') {
-    return new IntersectionObserver(
-      (entries) => {
-        const intersectingEntries = entries.filter((e) => e.isIntersecting);
-        const firstEntry = intersectingEntries[0];
-        if (firstEntry) {
-          callback(firstEntry);
-        }
-        // entries.forEach((entry) => {
-        //   callback(entry);
-        // });
-      },
-      { root: null,
-        threshold: 0.9,
-        rootMargin: `0% 0% -90% 0%`
-      }
-    );
-  }
+  return new IntersectionObserver(
+    (entries) => {
+      entries.forEach((entry) => {
+        callback(entry);
+      });
+    },
+    {
+      root: null,
+      // 65px is a navbar height
+      rootMargin: `-65px 0% -90% 0%`
+    }
+  );
 };
 
 export default getIntersectionObserver;
diff --git a/site/components/_getMDXComponents.js b/site/components/_getMDXComponents.js
deleted file mode 100644
index 8f263f0..0000000
--- a/site/components/_getMDXComponents.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import Head from 'next/head'
-import { Paragraph } from './Paragraph'
-import { Anchor } from './Anchor'
-import { Heading } from './Heading'
-
-
-/**
- * @param {object} [props] Props passed to each component
- * @param {object} [props.h] Props passed to Heading component
- */
-const getMDXComponents = (props) => ({
-      Head,
-      p: Paragraph,
-      a: Anchor,
-      h1: Heading({ level: 1, ...props?.h }),
-      h2: Heading({ level: 2, ...props?.h }),
-      h3: Heading({ level: 3, ...props?.h }),
-      h4: Heading({ level: 4, ...props?.h }),
-      h5: Heading({ level: 5, ...props?.h }),
-      h6: Heading({ level: 6, ...props?.h }),
-});
-
-export default getMDXComponents;
diff --git a/site/pages/[...slug].js b/site/pages/[...slug].js
index 32329e3..b2754d4 100644
--- a/site/pages/[...slug].js
+++ b/site/pages/[...slug].js
@@ -1,19 +1,23 @@
-import MdxPage from "../components/MDX";
-import { allOtherPages } from "contentlayer/generated";
-import { useMDXComponent } from "next-contentlayer/hooks";
+import { allOtherPages } from 'contentlayer/generated';
 
-import siteConfig from "../config/siteConfig";
+import MdxPage from '../components/MDX';
+import siteConfig from "../config/siteConfig"
 
-export default function Page({ body, ...rest }) {
-  const Component = useMDXComponent(body.code);
-  const children = {
-    Component,
-    frontmatter: {
-      ...rest,
-    },
-  };
+export default function Page({ body, ...meta }) {
+  const frontMatter = {
+    ...meta,
+    date: meta.date === "Invalid Date" ? null : meta.date,
+    created: meta.created === "Invalid Date" ? null : meta.created
+  }
 
-  return <MdxPage children={children} />;
+  // enable editing content only for claims, concepts, and guide for now
+  const editUrl = ['claims', 'concepts', 'guide'].includes(meta._raw.sourceFileDir)
+        ? siteConfig.repoRoot + siteConfig.repoEditPath + meta._raw.sourceFilePath
+        : null
+  
+  return (
+    <MdxPage body={body} frontMatter={frontMatter} editUrl={editUrl} />
+  );
 }
 
 export const getStaticProps = async ({ params }) => {
diff --git a/site/styles/global.css b/site/styles/global.css
index 929940b..ff720b0 100644
--- a/site/styles/global.css
+++ b/site/styles/global.css
@@ -13,7 +13,7 @@
 /* OTHERS */
 
 html {
-  /* scroll-behavior: smooth; */
+  scroll-behavior: smooth;
 }
 
 /* bg-neutral-800
@@ -40,36 +40,32 @@ body {
 }
 
 /* rehype-toc classes */
+/* nav element */
 .toc {
   @apply
     hidden
     lg:block
     w-[20rem]
+    my-12
+    pt-12
     px-8
-    py-24
     fixed
     top-16
-    /* bottom-0 */
+    bottom-0
     right-[max(2rem,calc(50%-40rem+2rem))]
     overflow-y-auto
-    border-2
-    border-red-500
+    border-l
+    border-slate-800
 }
 
+/* toc title */
 .toc::before {
   position: absolute;
   content: "On this page";
-  @apply text-white text-xl font-semibold top-12
-}
-
-.toc-item {
-  @apply leading-3;
-}
-
-.toc-item-h1 {
-  @apply p-0;
+  @apply text-white text-xl font-semibold top-1
 }
 
+/* list (ol) element */
 .toc-level {
   @apply list-none p-0;
 }
@@ -78,6 +74,20 @@ body {
   @apply pl-2
 }
 
+/* list item (li) element */
+.toc-item {
+  @apply leading-3;
+}
+
+.toc-item-h1 {
+  @apply p-0;
+}
+
+.toc-link {
+  @apply transition-colors;
+}
+
+/* link (a) element */
 .toc-item .toc-link {
   @apply text-sm text-slate-400 no-underline break-normal
 }