Merge pull request #2 from mc-favorite-tools/feat/1.20+

fix: first node lack of \n
mc-favorite-tools · Jun 1, 2024 · 79bb1d2 · 79bb1d2
2 parents bc72366 + de99c02
commit 79bb1d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/src/components/editor/index.tsx b/src/components/editor/index.tsx
@@ -15,9 +15,8 @@ import { MarkNode } from '@lexical/mark';
 import JsonTablePlugin from './plugins/JsonTablePlugin';
 import ObfuscatedPlugin from './plugins/ObfuscatedPlugin';
 import { Slider } from 'antd';
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useState } from 'react';
 import { AppContext } from '../../store';
-import { $getRoot } from 'lexical';
 import HorizontalRulePlugin from './plugins/HorizontalRulePlugin';
 import { HorizontalRuleNode } from '@lexical/react/LexicalHorizontalRuleNode';
 
@@ -36,12 +35,6 @@ const Wrapper = styled.div`
     }
 `
 
-function onChange(editorState: any) {
-    editorState.read(() => {
-
-    })
-}
-
 export function Editor() {
     const [state, dispatch] = useContext(AppContext)
     const [visible, setVisible] = useState(false)
@@ -73,7 +66,11 @@ export function Editor() {
                         }} />}
                     placeholder={''}
                 />
-                <OnChangePlugin onChange={onChange} />
+                <OnChangePlugin onChange={(editorState) => {
+                    editorState.read(() => {
+
+                    })
+                }} />
                 <CommentPlugin />
                 <HistoryPlugin />
                 <ObfuscatedPlugin />

diff --git a/src/components/editor/plugins/ToolbarPlugin.tsx b/src/components/editor/plugins/ToolbarPlugin.tsx
@@ -416,19 +416,19 @@ export default function ToolbarPlugin(props: {
 
                 // 处理边缘情况
                 // 1
-                const firstNode = nodes[0]
-                if ($isTextNode(firstNode)) {
-                    const parentNode = firstNode.getParent()
-                    if ($isMarkNode(parentNode)) {
-                        nodes.unshift(parentNode)
-                    }
-                    for (let i = 0; i < nodes.length; i++) {
-                        if (nodes[i] === parentNode) {
-                            nodes.splice(i, 1)
-                            break
-                        }
-                    }
-                }
+                // const firstNode = nodes[0]
+                // if ($isTextNode(firstNode)) {
+                //     const parentNode = firstNode.getParent()
+                //     if ($isMarkNode(parentNode)) {
+                //         nodes.unshift(parentNode)
+                //     }
+                //     for (let i = 0; i < nodes.length; i++) {
+                //         if (nodes[i] === parentNode) {
+                //             nodes.splice(i, 1)
+                //             break
+                //         }
+                //     }
+                // }
                 // 2
                 const textNodes: TextNode[] = []
                 for (let i = 0; i < nodes.length; i++) {