From 2162e9d5633395e975cff63b412189122df247fb Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Thu, 20 Jan 2022 10:38:18 -0500
Subject: [PATCH] properly merge multiple class names

---
 components/CodeBlock/CodeBlock.module.css   | 16 +++++++++++++++-
 components/CodeBlock/CodeBlock.tsx          |  7 ++++---
 components/ContactForm/ContactForm.tsx      |  2 +-
 components/CopyButton/CopyButton.module.css | 11 -----------
 components/CopyButton/CopyButton.tsx        |  5 +++--
 components/Heading/Heading.tsx              |  3 ++-
 components/Menu/Menu.tsx                    |  9 +++++----
 components/NoteMeta/NoteMeta.tsx            |  9 +++++----
 components/ThemeToggle/ThemeToggle.tsx      | 13 +++++++++----
 components/Video/Video.tsx                  |  6 +++---
 10 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/components/CodeBlock/CodeBlock.module.css b/components/CodeBlock/CodeBlock.module.css
index aadcb7de..c4b711b7 100644
--- a/components/CodeBlock/CodeBlock.module.css
+++ b/components/CodeBlock/CodeBlock.module.css
@@ -1,6 +1,7 @@
 /* all code */
 .code {
   font-size: 0.925em;
+  tab-size: 2;
   page-break-inside: avoid;
   border: 1px solid var(--kinda-light);
 }
@@ -16,13 +17,26 @@
   margin: 1em auto;
 }
 
+.block .copy_btn {
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 0.65em;
+  color: var(--medium-dark);
+  background-color: var(--background-inner);
+  border: 1px solid var(--kinda-light);
+}
+
+.block .copy_btn:hover {
+  color: var(--link);
+}
+
 /* the following sub-classes MUST be global -- the highlight rehype plugin isn't aware of this file */
 
 .block :global(.code-highlight) {
   display: block;
   overflow-x: auto;
   padding: 1em;
-  tab-size: 2;
   color: var(--code-text);
   background-color: var(--code-background);
 }
diff --git a/components/CodeBlock/CodeBlock.tsx b/components/CodeBlock/CodeBlock.tsx
index ea86f1f7..ea441578 100644
--- a/components/CodeBlock/CodeBlock.tsx
+++ b/components/CodeBlock/CodeBlock.tsx
@@ -1,3 +1,4 @@
+import classNames from "classnames";
 import CopyButton from "../CopyButton/CopyButton";
 import type { ReactNode } from "react";
 
@@ -13,15 +14,15 @@ const CodeBlock = (props: Props) => {
     // full multi-line code blocks with prism highlighting and copy-to-clipboard button
     return (
       <div className={styles.block}>
-        <CopyButton source={props.children} />
-        <code {...props} className={`${styles.code} ${props.className}`}>
+        <CopyButton source={props.children} className={styles.copy_btn} />
+        <code {...props} className={classNames(styles.code, props.className)}>
           {props.children}
         </code>
       </div>
     );
   } else {
     // inline code in paragraphs, headings, etc. (not highlighted)
-    return <code className={`${styles.code} ${styles.inline}`}>{props.children}</code>;
+    return <code className={classNames(styles.code, styles.inline)}>{props.children}</code>;
   }
 };
 
diff --git a/components/ContactForm/ContactForm.tsx b/components/ContactForm/ContactForm.tsx
index 990eba4b..8c68c59a 100644
--- a/components/ContactForm/ContactForm.tsx
+++ b/components/ContactForm/ContactForm.tsx
@@ -160,7 +160,7 @@ const ContactForm = () => {
                 <span>Sending...</span>
               ) : (
                 <>
-                  <SendIcon className={`icon ${styles.send_icon}`} /> <span>Send</span>
+                  <SendIcon className={classNames("icon", styles.send_icon)} /> <span>Send</span>
                 </>
               )}
             </button>
diff --git a/components/CopyButton/CopyButton.module.css b/components/CopyButton/CopyButton.module.css
index a0617595..56a420fe 100644
--- a/components/CopyButton/CopyButton.module.css
+++ b/components/CopyButton/CopyButton.module.css
@@ -1,19 +1,8 @@
 .copy {
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 0.65em;
   line-height: 1;
-  color: var(--medium-dark);
-  background-color: var(--background-inner);
-  border: 1px solid var(--kinda-light);
   cursor: pointer;
 }
 
-.copy:hover {
-  color: var(--link);
-}
-
 .success {
   color: var(--success) !important;
 }
diff --git a/components/CopyButton/CopyButton.tsx b/components/CopyButton/CopyButton.tsx
index 600e37c4..749d36ec 100644
--- a/components/CopyButton/CopyButton.tsx
+++ b/components/CopyButton/CopyButton.tsx
@@ -11,9 +11,10 @@ const cx = classNames.bind(styles);
 type Props = {
   source: ReactNode;
   timeout?: number;
+  className?: string;
 };
 
-const CopyButton = ({ source, timeout = 2000 }: Props) => {
+const CopyButton = ({ source, timeout = 2000, className }: Props) => {
   const [copied, setCopied] = useState(false);
 
   const handleCopy = (e) => {
@@ -43,7 +44,7 @@ const CopyButton = ({ source, timeout = 2000 }: Props) => {
 
   return (
     <button
-      className={cx({ copy: true, success: !!copied })}
+      className={cx({ copy: true, success: !!copied }, className)}
       title="Copy to clipboard"
       aria-label="Copy to clipboard"
       onClick={handleCopy}
diff --git a/components/Heading/Heading.tsx b/components/Heading/Heading.tsx
index ed8caeca..ab5c94cb 100644
--- a/components/Heading/Heading.tsx
+++ b/components/Heading/Heading.tsx
@@ -1,3 +1,4 @@
+import classNames from "classnames";
 import type { HTMLAttributes } from "react";
 
 import styles from "./Heading.module.css";
@@ -8,7 +9,7 @@ type Props = HTMLAttributes<HTMLHeadingElement> & {
 
 const Heading = ({ as: Component, children, ...rest }: Props) => {
   return (
-    <Component className={`${styles.heading} ${styles[Component] || ""}`} {...rest}>
+    <Component className={classNames(styles.heading, styles[Component])} {...rest}>
       {children}
     </Component>
   );
diff --git a/components/Menu/Menu.tsx b/components/Menu/Menu.tsx
index e23bb2d4..1dc15a14 100644
--- a/components/Menu/Menu.tsx
+++ b/components/Menu/Menu.tsx
@@ -1,5 +1,6 @@
 import { memo } from "react";
 import Link from "next/link";
+import classNames from "classnames";
 import ThemeToggle from "../ThemeToggle/ThemeToggle";
 import { HomeIcon, NotesIcon, ProjectsIcon, ContactIcon } from "../Icons";
 
@@ -7,22 +8,22 @@ import styles from "./Menu.module.css";
 
 const links = [
   {
-    icon: <HomeIcon className={`icon ${styles.icon}`} />,
+    icon: <HomeIcon className={classNames("icon", styles.icon)} />,
     text: "Home",
     href: "/",
   },
   {
-    icon: <NotesIcon className={`icon ${styles.icon}`} />,
+    icon: <NotesIcon className={classNames("icon", styles.icon)} />,
     text: "Notes",
     href: "/notes/",
   },
   {
-    icon: <ProjectsIcon className={`icon ${styles.icon}`} />,
+    icon: <ProjectsIcon className={classNames("icon", styles.icon)} />,
     text: "Projects",
     href: "/projects/",
   },
   {
-    icon: <ContactIcon className={`icon ${styles.icon}`} />,
+    icon: <ContactIcon className={classNames("icon", styles.icon)} />,
     text: "Contact",
     href: "/contact/",
   },
diff --git a/components/NoteMeta/NoteMeta.tsx b/components/NoteMeta/NoteMeta.tsx
index 939cb990..96ed6765 100644
--- a/components/NoteMeta/NoteMeta.tsx
+++ b/components/NoteMeta/NoteMeta.tsx
@@ -1,4 +1,5 @@
 import Link from "next/link";
+import classNames from "classnames";
 import { format } from "date-fns";
 import HitCounter from "../HitCounter/HitCounter";
 import { DateIcon, TagIcon, EditIcon, ViewsIcon } from "../Icons";
@@ -13,7 +14,7 @@ const NoteMeta = ({ slug, date, title, tags = [] }: Props) => (
   <div className={styles.meta}>
     <div className={styles.date}>
       <span>
-        <DateIcon className={`icon ${styles.icon}`} />
+        <DateIcon className={classNames("icon", styles.icon)} />
       </span>
       <span title={format(new Date(date), "PPppp")}>
         <Link href={`/notes/${slug}/`}>
@@ -25,7 +26,7 @@ const NoteMeta = ({ slug, date, title, tags = [] }: Props) => (
     {tags.length > 0 && (
       <div className={styles.tags}>
         <span>
-          <TagIcon className={`icon ${styles.icon}`} />
+          <TagIcon className={classNames("icon", styles.icon)} />
         </span>
         {tags.map((tag) => (
           <span key={tag} className={styles.tag}>
@@ -37,7 +38,7 @@ const NoteMeta = ({ slug, date, title, tags = [] }: Props) => (
 
     <div>
       <span>
-        <EditIcon className={`icon ${styles.icon}`} />
+        <EditIcon className={classNames("icon", styles.icon)} />
       </span>
       <span>
         <a
@@ -53,7 +54,7 @@ const NoteMeta = ({ slug, date, title, tags = [] }: Props) => (
 
     <div>
       <span>
-        <ViewsIcon className={`icon ${styles.icon}`} />
+        <ViewsIcon className={classNames("icon", styles.icon)} />
       </span>
       <HitCounter slug={`notes/${slug}`} />
     </div>
diff --git a/components/ThemeToggle/ThemeToggle.tsx b/components/ThemeToggle/ThemeToggle.tsx
index f5bb78bd..9a414ace 100644
--- a/components/ThemeToggle/ThemeToggle.tsx
+++ b/components/ThemeToggle/ThemeToggle.tsx
@@ -1,10 +1,15 @@
 import { useEffect, useState, memo } from "react";
 import { useTheme } from "next-themes";
+import classNames from "classnames";
 
 import styles from "./ThemeToggle.module.css";
 
+type Props = {
+  className?: string;
+};
+
 // modified from Twemoji lightbulb:
-const BulbIcon = ({ on = false, className = "" }) => (
+const BulbIcon = ({ on = false, className }) => (
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" className={className}>
     <g fill="none">
       <path
@@ -31,13 +36,13 @@ const BulbIcon = ({ on = false, className = "" }) => (
   </svg>
 );
 
-const ThemeToggle = ({ className = "" }) => {
+const ThemeToggle = ({ className }: Props) => {
   const [mounted, setMounted] = useState(false);
   const { resolvedTheme, setTheme } = useTheme();
 
   // render a dummy bulb until we're fully mounted and self-aware
   useEffect(() => setMounted(true), []);
-  if (!mounted) return <BulbIcon on={false} className={`icon ${className}`} />;
+  if (!mounted) return <BulbIcon on={false} className={classNames("icon", className)} />;
 
   return (
     <button
@@ -46,7 +51,7 @@ const ThemeToggle = ({ className = "" }) => {
       title={resolvedTheme === "light" ? "Toggle Dark Mode" : "Toggle Light Mode"}
       aria-hidden={true}
     >
-      <BulbIcon on={resolvedTheme === "light"} className={`icon ${className}`} />
+      <BulbIcon on={resolvedTheme === "light"} className={classNames("icon", className)} />
     </button>
   );
 };
diff --git a/components/Video/Video.tsx b/components/Video/Video.tsx
index a405bd45..f61b9b2c 100644
--- a/components/Video/Video.tsx
+++ b/components/Video/Video.tsx
@@ -27,9 +27,9 @@ const Video = ({ webm, mp4, thumbnail, subs, autoplay }: Props) => {
       attributes: {
         controlsList: "nodownload",
         preload: "metadata",
-        autoPlay: autoplay,
-        muted: autoplay,
-        loop: autoplay,
+        autoPlay: !!autoplay,
+        muted: !!autoplay,
+        loop: !!autoplay,
       },
     },
   };