fix: code node clean

Signed-off-by: Innei <i@innei.in>
Innei · Feb 2, 2024 · 9a2535d · 9a2535d
1 parent 619f0ea
commit 9a2535d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/components/ui/code-editor/CodeEditor.tsx b/src/components/ui/code-editor/CodeEditor.tsx
@@ -1,5 +1,6 @@
 import { forwardRef, useEffect, useState } from 'react'
 
+import { stopPropagation } from '~/lib/dom'
 import { clsxm } from '~/lib/helper'
 
 import { BaseCodeHighlighter } from '../code-highlighter'
@@ -33,6 +34,8 @@ export const CodeEditor = forwardRef<
       contentEditable={false}
     >
       <textarea
+        onKeyDown={stopPropagation}
+        onKeyUp={stopPropagation}
         contentEditable={false}
         ref={ref}
         className="absolute h-full w-full resize-none overflow-hidden bg-transparent p-0 text-transparent caret-accent"

diff --git a/src/components/ui/editor/Milkdown/plugins/CodeBlock.tsx b/src/components/ui/editor/Milkdown/plugins/CodeBlock.tsx
@@ -27,12 +27,16 @@ const CodeBlock = () => {
 
   switch (language) {
     case 'excalidraw': {
-      return <ExcalidrawBoard content={content || '{}'} />
+      return (
+        <div contentEditable={false}>
+          <ExcalidrawBoard content={content || '{}'} />
+        </div>
+      )
     }
   }
 
   return (
-    <div className="my-4">
+    <div className="my-4" contentEditable={false}>
       <NormalCodeBlock content={content || ''} language={language} />
     </div>
   )
@@ -62,9 +66,14 @@ const NormalCodeBlock: FC<{
           const node = nodeCtx.node
 
           const pos = nodeCtx.getPos()
+          const tr = view.state.tr
           if (!pos) return
+          if (!code) {
+            // remove node
 
-          const tr = view.state.tr
+            view.dispatch(view.state.tr.delete(pos, pos + node.nodeSize))
+            return
+          }
 
           const nextNode = ctx!.get(schemaCtx).text(code)