merge develop to fix/bugs

libs/components/editor-blocks/package.json

@@ -38,7 +38,8 @@
         "react-window": "^1.8.7",
         "slate": "^0.81.1",
         "slate-react": "^0.81.0",
-        "style9": "^0.14.0"
+        "style9": "^0.14.0",
+        "html-escaper": "^3.0.3"
     },
     "devDependencies": {
         "@types/codemirror": "^5.60.5",

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) {

libs/components/editor-blocks/src/blocks/image/ImageView.tsx

@@ -168,7 +168,9 @@ export const ImageView = ({ block, editor }: ImageView) => {
         <BlockPendantProvider editor={editor} block={block}>
             <ImageBlock>
                 <div style={{ position: 'relative' }} ref={resizeBox}>
-                    {!isSelect ? <ImageShade onClick={handleClick} /> : null}
+                    {!isSelect && imgUrl ? (
+                        <ImageShade onClick={handleClick} />
+                    ) : null}
                     {imgUrl ? (
                         <div
                             onMouseDown={e => {

libs/components/editor-blocks/src/blocks/text/TextBlock.tsx

@@ -1,17 +1,17 @@
-import {
-    BaseView,
-    CreateView,
-    AsyncBlock,
-    HTML2BlockResult,
-    BlockEditor,
-} from '@toeverything/framework/virgo';
 import { Protocol } from '@toeverything/datasource/db-service';
-import { TextView } from './TextView';
+import {
+    AsyncBlock,
+    BaseView,
+    BlockEditor,
+    CreateView,
+    HTML2BlockResult,
+} from '@toeverything/framework/virgo';
 import {
     Block2HtmlProps,
     commonBlock2HtmlContent,
     commonHTML2block,
 } from '../../utils/commonBlockClip';
+import { TextView } from './TextView';
 
 export class TextBlock extends BaseView {
     type = Protocol.Block.Type.text;
@@ -41,12 +41,12 @@ export class TextBlock extends BaseView {
             tagName: [
                 'DIV',
                 'P',
-                'PRE',
+                // 'PRE',
                 'B',
                 'A',
                 'EM',
                 'U',
-                'CODE',
+                // 'CODE',
                 'S',
                 'DEL',
             ],

libs/components/editor-blocks/src/blocks/text/TextView.tsx

@@ -1,5 +1,3 @@
-import { useState } from 'react';
-
 import { CustomText, TextProps } from '@toeverything/components/common';
 import {
     BlockPendantProvider,
@@ -11,9 +9,11 @@ import {
 import { styled } from '@toeverything/components/ui';
 import { Protocol } from '@toeverything/datasource/db-service';
 import { CreateView } from '@toeverything/framework/virgo';
+import { useState } from 'react';
 import { BlockContainer } from '../../components/BlockContainer';
 import { TextManage } from '../../components/text-manage';
 import { dedentBlock, tabBlock } from '../../utils/indent';
+
 interface CreateTextView extends CreateView {
     // TODO: need to optimize
     containerClassName?: string;
@@ -247,6 +247,9 @@ export const TextView = ({
         await block.setProperty('text', {
             value: options?.['text'] as CustomText[],
         });
+        setTimeout(async () => {
+            await editor.selectionManager.activeNodeByNodeId(block.id);
+        }, 100);
         block.firstCreateFlag = true;
     };
     const onTab: TextProps['handleTab'] = async ({ isShiftKey }) => {