Merge pull request #477 from toeverything/develop

Sync to master

apps/venus/src/app/common/Footer.tsx

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { useTranslation } from 'react-i18next';
 
-import { Box, Button, Grid, Typography } from '@mui/joy';
+import { Box, Button, Grid, styled, Typography } from '@mui/joy';
 
 import GitHubIcon from '@mui/icons-material/GitHub';
 import RedditIcon from '@mui/icons-material/Reddit';
@@ -361,7 +361,14 @@ export const AFFiNEFooter = ({
                         >
                             #OpenSource
                         </span>
-                        company
+                        <span>software, built with&nbsp;</span>
+                        <StyledLink
+                            href="https://block-suite.com"
+                            target="_blank"
+                            rel="noreferrer"
+                        >
+                            BlockSuite
+                        </StyledLink>
                     </Typography>
                 </Box>
             </Grid>
@@ -383,3 +390,13 @@ export const AFFiNEFooter = ({
         </>
     );
 };
+
+const StyledLink = styled('a')({
+    fontWeight: '900',
+    color: '#000',
+    textDecoration: 'none',
+
+    '&:hover': {
+        textDecoration: 'underline',
+    },
+});

libs/components/common/src/lib/text/EditableText.tsx

@@ -551,9 +551,9 @@ export const Text = forwardRef<ExtendedTextUtils, TextProps>((props, ref) => {
             }
         }
         // markdown interception
-        if (supportMarkdown && !!handleMarkdown(e)) {
+        if (supportMarkdown && handleMarkdown(e)) {
-            const start_selection = utils.current.getStartSelection();
+            const endOfMarkdown = utils.current.getEndSelection();
-            utils.current.setSelection(start_selection);
+            utils.current.setSelection(endOfMarkdown);
             e.preventDefault();
             return true;
         }

libs/components/editor-core/src/editor/commands/block-commands.ts

@@ -46,12 +46,14 @@ export class BlockCommands {
      *
      * remove block by block id
      * @param {string} blockId
+     * @param onDelete Delete Block's LeftMenuDraggable
      * @memberof BlockCommands
      */
-    public async removeBlock(blockId: string) {
+    public async removeBlock(blockId: string, onDelete?: () => void) {
         const block = await this._editor.getBlockById(blockId);
         if (block) {
-            block.remove();
+            onDelete();
+            await block.remove();
         }
     }
 

libs/components/editor-plugins/src/menu/left-menu/LeftMenu.tsx

@@ -18,17 +18,21 @@ interface LeftMenuProps {
     editor?: Virgo;
     hooks: PluginHooks;
     blockId: string;
+    onDelete: () => void;
 }
 
 export function LeftMenu(props: LeftMenuProps) {
-    const { editor, anchorEl, hooks, blockId, onClose } = props;
+    const { editor, anchorEl, hooks, blockId, onClose, onDelete } = props;
     const { t } = useTranslation();
     const menu: CascaderItemProps[] = useMemo(
         () => [
             {
                 title: t('Delete'),
-                callback: () => {
+                callback: async () => {
-                    editor.commands.blockCommands.removeBlock(blockId);
+                    await editor.commands.blockCommands.removeBlock(
+                        blockId,
+                        onDelete
+                    );
                 },
                 shortcut: 'Del',
                 icon: <DeleteCashBinIcon />,

libs/components/editor-plugins/src/menu/left-menu/LeftMenuDraggable.tsx

@@ -165,6 +165,10 @@ export const LeftMenuDraggable = (props: LeftMenuProps) => {
         setAnchorEl(currentTarget);
     };
 
+    const onDelete = useCallback(() => {
+        setBlock(undefined);
+    }, []);
+
     const onClose = useCallback(() => setAnchorEl(undefined), [setAnchorEl]);
 
     useEffect(() => {
@@ -241,6 +245,7 @@ export const LeftMenuDraggable = (props: LeftMenuProps) => {
                             editor={props.editor}
                             hooks={props.hooks}
                             onClose={onClose}
+                            onDelete={onDelete}
                             blockId={block.block.id}
                         >
                             <Draggable onClick={onClick}>