blockquoteではなくasideに変更、ネスト対応

Author: na-trium-144

app/markdown/markdown.tsx

@@ -16,6 +16,7 @@ import {
   DaisySuccessIcon,
   DaisyWarningIcon,
 } from "@/daisyAlertIcon";
+import { CSSProperties } from "react";
 
 export function StyledMarkdown(props: {
   content: string;
@@ -68,6 +69,19 @@ const baseComponents: Components = {
   hr: () => null,
   blockquote: ({ node, className, children, ...props }) => (
     <blockquote
+      className={clsx("alert", className, "mx-2 my-2", "flex")}
+      {...props}
+    >
+      <div
+        // <p>がmx-2 my-2を設定するので、その分広げて相殺
+        className="flex-1 w-full -m-2"
+      >
+        {children}
+      </div>
+    </blockquote>
+  ),
+  aside: ({ node, className, children, ...props }) => (
+    <aside
       className={clsx(
         "alert",
         className,
@@ -86,9 +100,15 @@ const baseComponents: Components = {
       ) : className?.includes("alert-error") ? (
         <DaisyErrorIcon />
       ) : null}
-      {/* <p>がmx-2 my-2を設定するので、その分広げて相殺 */}
-      <div className="flex-1 w-full -m-2 self-center">{children}</div>
-    </blockquote>
+      <div
+        // <p>がmx-2 my-2を設定するので、その分広げて相殺
+        className="flex-1 w-full -m-2 self-center"
+        // alertネスト対応
+        style={{ "--alert-color": "initial" } as CSSProperties}
+      >
+        {children}
+      </div>
+    </aside>
   ),
   pre: ({ children }) => children,
   code: (props) => <AutoCodeBlock interactive={false} {...props} />,

app/markdown/remarkGithubAlerts.ts

@@ -56,7 +56,7 @@ type Option = {
  */
 export const remarkAlert: Plugin<[Option?], Root> = ({
   legacyTitle = false,
-  tagName = "blockquote",
+  tagName = "aside",
   classNames = "",
 } = {}) => {
   return (tree) => {