merge develop to fix/bugs

libs/components/editor-blocks/src/blocks/code/CodeView.tsx

@@ -171,7 +171,7 @@ export const CodeView = ({ block, editor }: CreateCodeView) => {
     };
     const handleLangChange = (lang: string) => {
         block.setProperty('lang', lang);
-        setExtensions([langs[lang]()]);
+        langs[lang] && setExtensions([langs[lang]()]);
     };
     useEffect(() => {
         handleLangChange(langType ? langType : DEFAULT_LANG);

libs/components/editor-blocks/src/blocks/code/index.ts

@@ -5,10 +5,10 @@ import {
     BlockEditor,
     HTML2BlockResult,
 } from '@toeverything/framework/virgo';
+import { unescape } from 'html-escaper';
 import {
     Block2HtmlProps,
     commonBlock2HtmlContent,
-    commonHTML2block,
 } from '../../utils/commonBlockClip';
 import { CodeView } from './CodeView';
 
@@ -34,12 +34,30 @@ export class CodeBlock extends BaseView {
         element: Element;
         editor: BlockEditor;
     }): Promise<HTML2BlockResult> {
-        return commonHTML2block({
-            element,
-            editor,
-            type: this.type,
-            tagName: 'CODE',
-        });
+        // debugger;
+        if (element.tagName === 'CODE') {
+            return [
+                {
+                    type: this.type,
+                    properties: {
+                        text: {
+                            value: [
+                                {
+                                    text: unescape(
+                                        (element as HTMLElement).innerText
+                                    ),
+                                },
+                            ],
+                        },
+                        lang:
+                            element.classList[0] &&
+                            element.classList[0].substr(9),
+                    },
+                    children: [],
+                },
+            ];
+        }
+        return null;
     }
 
     override async block2html(props: Block2HtmlProps) {