fix: fix HTML parsing error (#54)

simonguo · Jan 26, 2024 · 5c1aa7f · 5c1aa7f
1 parent f3b9392
commit 5c1aa7f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 26 deletions.
diff --git a/src/MarkdownRenderer.tsx b/src/MarkdownRenderer.tsx
@@ -2,35 +2,48 @@ import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import copy from 'copy-to-clipboard';
 import mergeRefs from './utils/mergeRefs';
-import { iconPath as copyPath } from './icons/Copy';
+import { iconPath as copyPath, svgTpl } from './icons/Copy';
 import { iconPath as checkPath } from './icons/Check';
 
 interface MarkdownRendererProps extends React.HTMLAttributes<HTMLDivElement> {
   children?: string | null;
 }
 
+function appendCopyButton(container?: HTMLDivElement | null) {
+  if (!container) {
+    return;
+  }
+
+  const button = document.createElement('button');
+  button.className =
+    'copy-code-button rs-btn-icon rs-btn-icon-circle rs-btn rs-btn-subtle rs-btn-xs';
+  button.title = 'Copy code';
+  button.innerHTML = svgTpl(copyPath);
+  button.onclick = e => {
+    e.preventDefault();
+    const code = container?.querySelector('code')?.textContent;
+    const icon = button.querySelector('.copy-icon-path');
+
+    icon?.setAttribute('d', checkPath);
+    if (code) {
+      copy(code);
+    }
+
+    setTimeout(() => {
+      icon?.setAttribute('d', copyPath);
+    }, 2000);
+  };
+  container?.appendChild(button);
+}
+
 const MarkdownRenderer = React.forwardRef(
   (props: MarkdownRendererProps, ref: React.Ref<HTMLDivElement>) => {
     const { children, className, ...rest } = props;
     const mdRef = React.useRef<HTMLDivElement>(null);
 
     useEffect(() => {
-      mdRef.current?.querySelectorAll('.copy-code-button').forEach(el => {
-        el.addEventListener('click', e => {
-          e.preventDefault();
-
-          const code = (el.nextElementSibling as HTMLInputElement)?.value;
-          const icon = el.querySelector('.copy-icon-path');
-
-          icon?.setAttribute('d', checkPath);
-          if (code) {
-            copy(code);
-          }
-
-          setTimeout(() => {
-            icon?.setAttribute('d', copyPath);
-          }, 2000);
-        });
+      mdRef.current?.querySelectorAll('.rcv-code-renderer').forEach((el: any) => {
+        appendCopyButton(el);
       });
     }, []);
 

diff --git a/src/icons/Copy.tsx b/src/icons/Copy.tsx
@@ -3,6 +3,9 @@ import React from 'react';
 export const iconPath =
   'M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z';
 
+export const svgTpl = (path: string) =>
+  `<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 448 512" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg" class="copy-icon"><path class="copy-icon-path" d="${path}"></path></svg>`;
+
 function CopyIcon(props: React.SVGProps<SVGSVGElement>) {
   return (
     <svg

diff --git a/webpack-md-loader/renderer.js b/webpack-md-loader/renderer.js
@@ -15,15 +15,9 @@ module.exports = (languages = defaultLanguages) => {
       ? hl.highlight(code, { language, ignoreIllegals: true })
       : hl.highlightAuto(code);
 
-    return `<div class="rcv-highlight">
-          <button type="button" class="copy-code-button rs-btn-icon rs-btn-icon-circle rs-btn rs-btn-subtle rs-btn-xs" title="Copy code" aria-label="Copy code" >
-            <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 448 512" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg">
-             <path class="copy-icon-path" d="M320 448v40c0 13.255-10.745 24-24 24H24c-13.255 0-24-10.745-24-24V120c0-13.255 10.745-24 24-24h72v296c0 30.879 25.121 56 56 56h168zm0-344V0H152c-13.255 0-24 10.745-24 24v368c0 13.255 10.745 24 24 24h272c13.255 0 24-10.745 24-24V128H344c-13.2 0-24-10.8-24-24zm120.971-31.029L375.029 7.029A24 24 0 0 0 358.059 0H352v96h96v-6.059a24 24 0 0 0-7.029-16.97z"></path>
-            </svg>
-          </button>
-          <input type="hidden" class="copy-code-input" value="${code}" />
-          <pre><code class="${language || ''}">${value}</code></pre>
-        </div>`;
+    return `<div class="rcv-highlight rcv-code-renderer"><pre><code class="${
+      language || ''
+    }">${value}</code></pre></div>`;
   };
 
   renderer.code = codeRenderer;