diff --git a/libs/components/editor-blocks/src/blocks/group/GroupView.tsx b/libs/components/editor-blocks/src/blocks/group/GroupView.tsx index 1fba5dc199..694fe7820f 100644 --- a/libs/components/editor-blocks/src/blocks/group/GroupView.tsx +++ b/libs/components/editor-blocks/src/blocks/group/GroupView.tsx @@ -59,7 +59,7 @@ const GroupActionWrapper = styled('div')(({ theme }) => ({ const GroupContainer = styled('div')<{ isSelect?: boolean }>( ({ isSelect, theme }) => ({ background: theme.affine.palette.white, - border: '2px solid #ECF1FB', + border: '2px solid rgba(236,241,251,.5)', padding: '15px 12px', borderRadius: '10px', ...(isSelect diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx index 5fbc3f91f6..2e5f3d3eac 100644 --- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx +++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/DropdownItem.tsx @@ -1,7 +1,7 @@ import React, { useState, useCallback } from 'react'; import style9 from 'style9'; import { - MuiPopover, + Popover, styled, type SvgIconProps, Tooltip, @@ -32,15 +32,6 @@ export const MenuDropdownItem = ({ null ); - const handle_open_dropdown_menu = useCallback( - (event: React.MouseEvent) => { - event.preventDefault(); - event.stopPropagation(); - set_anchor_ele(event.currentTarget); - }, - [] - ); - const handle_close_dropdown_menu = useCallback(() => { set_anchor_ele(null); }, []); @@ -50,103 +41,103 @@ export const MenuDropdownItem = ({ return ( <> - -

{name}

- {shortcut &&

{shortcut}

} +
+ {children.map(item => { + const { + name, + icon: ItemIcon, + onClick, + nameKey: itemNameKey, + } = item; + + const StyledIcon = withStylesForIcon(ItemIcon); + + return ( + + ); + })}
- } - placement="bottom" - trigger="hover" + } // id={anchor_ele ? 'inline-menu-pop' : undefined} + // open={Boolean(anchor_ele)} + // anchorEl={anchor_ele} + // onClose={handle_close_dropdown_menu} + // anchorOrigin={{ + // horizontal: 'left', + // vertical: 40, + // }} > - -
- -
- {children.map(item => { - const { - name, - icon: ItemIcon, - onClick, - nameKey: itemNameKey, - } = item; - - const StyledIcon = withStylesForIcon(ItemIcon); - - return ( - - ); - })} -
-
+ + + ); }; diff --git a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx index a1627da105..5e97b4f746 100644 --- a/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx +++ b/libs/components/editor-plugins/src/menu/inline-menu/menu-item/IconItem.tsx @@ -45,7 +45,7 @@ export const MenuIconItem = ({ {shortcut &&

{shortcut}

} } - placement="bottom" + placement="top" trigger="hover" >