From 74b1caf01da8109c9486d9b7ef739446ca3d16a3 Mon Sep 17 00:00:00 2001
From: DiamondThree <diamond.shx@gmail.com>
Date: Fri, 16 Sep 2022 11:34:45 +0800
Subject: [PATCH] fix: can't add image and delete more action button (#430)

---
 .../editor-blocks/src/blocks/image/ImageView.tsx  |  4 +++-
 .../editor-blocks/src/blocks/text/TextView.tsx    |  7 +++++--
 .../editor-plugins/src/menu/inline-menu/utils.ts  | 15 +++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/libs/components/editor-blocks/src/blocks/image/ImageView.tsx b/libs/components/editor-blocks/src/blocks/image/ImageView.tsx
index 3bc5435575..b870b359f0 100644
--- a/libs/components/editor-blocks/src/blocks/image/ImageView.tsx
+++ b/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 => {
diff --git a/libs/components/editor-blocks/src/blocks/text/TextView.tsx b/libs/components/editor-blocks/src/blocks/text/TextView.tsx
index 094d05f755..2fb9ff62e1 100644
--- a/libs/components/editor-blocks/src/blocks/text/TextView.tsx
+++ b/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 }) => {
diff --git a/libs/components/editor-plugins/src/menu/inline-menu/utils.ts b/libs/components/editor-plugins/src/menu/inline-menu/utils.ts
index bb35d31f5a..99639d2247 100644
--- a/libs/components/editor-plugins/src/menu/inline-menu/utils.ts
+++ b/libs/components/editor-plugins/src/menu/inline-menu/utils.ts
@@ -22,7 +22,6 @@ import {
     HeadingTwoIcon,
     ImageIcon,
     LinkIcon,
-    MoreIcon,
     NumberIcon,
     PagesIcon,
     QuoteIcon,
@@ -827,13 +826,13 @@ export const getInlineMenuData = ({
             nameKey: inlineMenuNamesKeys.backlinks,
             onClick: common_handler_for_inline_menu,
         },
-        {
-            type: INLINE_MENU_UI_TYPES.icon,
-            icon: MoreIcon,
-            name: inlineMenuNames.moreActions,
-            nameKey: inlineMenuNamesKeys.moreActions,
-            onClick: common_handler_for_inline_menu,
-        },
+        // {
+        //     type: INLINE_MENU_UI_TYPES.icon,
+        //     icon: MoreIcon,
+        //     name: inlineMenuNames.moreActions,
+        //     nameKey: inlineMenuNamesKeys.moreActions,
+        //     onClick: common_handler_for_inline_menu,
+        // },
     ];
 
     return inlineMenuData.filter(item => Boolean(item));