fix commneu menu style

This commit is contained in:
DiamondThree
2022-07-28 14:42:40 +08:00
parent 6c26485343
commit d7c9d430e4
2 changed files with 29 additions and 25 deletions

View File

@@ -19,8 +19,30 @@ import { domToRect } from '@toeverything/utils';
import { MenuCategories } from './Categories'; import { MenuCategories } from './Categories';
import { menuItemsMap, CommandMenuCategories } from './config'; import { menuItemsMap, CommandMenuCategories } from './config';
import { QueryResult } from '../../search'; import { QueryResult } from '../../search';
import { MuiClickAwayListener as ClickAwayListener } from '@toeverything/components/ui'; import {
MuiClickAwayListener as ClickAwayListener,
styled,
} from '@toeverything/components/ui';
const RootContainer = styled('div')(({ theme }) => {
return {
position: 'fixed',
zIndex: 1,
width: 352,
maxHeight: 525,
borderRadius: '10px',
boxShadow: '0px 1px 10px rgba(152, 172, 189, 0.6)',
backgroundColor: '#fff',
padding: '8px 4px',
};
});
const ContentContainer = styled('div')(({ theme }) => {
return {
display: 'flex',
overflow: 'hidden',
maxHeight: '35vh',
};
});
export type CommandMenuContainerProps = { export type CommandMenuContainerProps = {
editor: Virgo; editor: Virgo;
hooks: PluginHooks; hooks: PluginHooks;
@@ -215,13 +237,12 @@ export const CommandMenuContainer = ({
}, [searchBlocks, types]); }, [searchBlocks, types]);
return isShow ? ( return isShow ? (
<div <RootContainer
ref={menuRef} ref={menuRef}
className={styles('rootContainer')}
onKeyDownCapture={handleKeyDown} onKeyDownCapture={handleKeyDown}
style={style} style={style}
> >
<div className={styles('contentContainer')}> <ContentContainer>
<MenuCategories <MenuCategories
currentCategories={currentCategory} currentCategories={currentCategory}
onSetCategories={handleSetCategories} onSetCategories={handleSetCategories}
@@ -233,25 +254,7 @@ export const CommandMenuContainer = ({
currentItem={currentItem} currentItem={currentItem}
setCurrentItem={setCurrentItem} setCurrentItem={setCurrentItem}
/> />
</div> </ContentContainer>
</div> </RootContainer>
) : null; ) : null;
}; };
const styles = style9.create({
rootContainer: {
position: 'fixed',
zIndex: 1,
width: 352,
maxHeight: 525,
borderRadius: '10px',
boxShadow: '0px 1px 10px rgba(152, 172, 189, 0.6)',
backgroundColor: '#fff',
padding: '8px 4px',
},
contentContainer: {
display: 'flex',
overflow: 'hidden',
maxHeight: 493,
},
});

View File

@@ -113,7 +113,8 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
let clientHeight = let clientHeight =
document.documentElement.clientHeight; document.documentElement.clientHeight;
const COMMAND_MENU_HEIGHT = 509; const COMMAND_MENU_HEIGHT =
window.innerHeight * 0.4;
if (clientHeight - top <= COMMAND_MENU_HEIGHT) { if (clientHeight - top <= COMMAND_MENU_HEIGHT) {
top = clientHeight - top + 10; top = clientHeight - top + 10;
setCommandMenuPosition({ setCommandMenuPosition({