chore: clean code

This commit is contained in:
lawvs
2022-09-15 19:12:00 +08:00
parent c5a6e94a71
commit b591436e00
4 changed files with 86 additions and 81 deletions

View File

@@ -1,9 +1,8 @@
import { StrictMode } from 'react'; import { StrictMode } from 'react';
import { createRoot, type Root } from 'react-dom/client';
import { BasePlugin } from '../../base-plugin'; import { BasePlugin } from '../../base-plugin';
import { CommandMenu } from './Menu';
import { PluginRenderRoot } from '../../utils'; import { PluginRenderRoot } from '../../utils';
import { CommandMenu } from './Menu';
const PLUGIN_NAME = 'command-menu'; const PLUGIN_NAME = 'command-menu';

View File

@@ -1,28 +1,24 @@
import React, { import React, {
useEffect,
useState,
useMemo,
useCallback, useCallback,
useEffect,
useMemo,
useRef, useRef,
useState,
} from 'react'; } from 'react';
import style9 from 'style9';
import { BlockFlavorKeys } from '@toeverything/datasource/db-service';
import { Virgo, PluginHooks, HookType } from '@toeverything/framework/virgo';
import { import {
CommonList, CommonList,
CommonListItem,
commonListContainer, commonListContainer,
CommonListItem,
} from '@toeverything/components/common'; } from '@toeverything/components/common';
import { BlockFlavorKeys } from '@toeverything/datasource/db-service';
import { HookType, PluginHooks, Virgo } from '@toeverything/framework/virgo';
import { domToRect } from '@toeverything/utils'; import { domToRect } from '@toeverything/utils';
import { MenuCategories } from './Categories'; import { styled } from '@toeverything/components/ui';
import { menuItemsMap, CommandMenuCategories } from './config';
import { QueryResult } from '../../search'; import { QueryResult } from '../../search';
import { import { MenuCategories } from './Categories';
MuiClickAwayListener as ClickAwayListener, import { CommandMenuCategories, menuItemsMap } from './config';
styled,
} from '@toeverything/components/ui';
const RootContainer = styled('div')(({ theme }) => { const RootContainer = styled('div')(({ theme }) => {
return { return {
@@ -134,7 +130,6 @@ export const CommandMenuContainer = ({
const handleClickUp = useCallback( const handleClickUp = useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => { (event: React.KeyboardEvent<HTMLDivElement>) => {
if (isShow && types && event.code === 'ArrowUp') {
event.preventDefault(); event.preventDefault();
if (!currentItem && types.length) { if (!currentItem && types.length) {
setCurrentItem(types[types.length - 1]); setCurrentItem(types[types.length - 1]);
@@ -146,14 +141,12 @@ export const CommandMenuContainer = ({
setCurrentItem(types[idx - 1]); setCurrentItem(types[idx - 1]);
} }
} }
}
}, },
[isShow, types, currentItem] [types, currentItem]
); );
const handleClickDown = useCallback( const handleClickDown = useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => { (event: React.KeyboardEvent<HTMLDivElement>) => {
if (isShow && types && event.code === 'ArrowDown') {
event.preventDefault(); event.preventDefault();
if (!currentItem && types.length) { if (!currentItem && types.length) {
setCurrentItem(types[0]); setCurrentItem(types[0]);
@@ -165,28 +158,44 @@ export const CommandMenuContainer = ({
setCurrentItem(types[idx + 1]); setCurrentItem(types[idx + 1]);
} }
} }
}
}, },
[isShow, types, currentItem] [types, currentItem]
); );
const handleClickEnter = useCallback( const handleClickEnter = useCallback(
async (event: React.KeyboardEvent<HTMLDivElement>) => { async (event: React.KeyboardEvent<HTMLDivElement>) => {
if (isShow && event.code === 'Enter' && currentItem) {
event.preventDefault(); event.preventDefault();
onSelected && onSelected(currentItem); onSelected && onSelected(currentItem);
}
}, },
[isShow, currentItem, onSelected] [currentItem, onSelected]
); );
const handleKeyDown = useCallback( const handleKeyDown = useCallback(
(event: React.KeyboardEvent<HTMLDivElement>) => { (event: React.KeyboardEvent<HTMLDivElement>) => {
if (!isShow) {
return;
}
if (types && event.code === 'ArrowUp') {
handleClickUp(event); handleClickUp(event);
return;
}
if (types && event.code === 'ArrowDown') {
handleClickDown(event); handleClickDown(event);
return;
}
if (event.code === 'Enter' && currentItem) {
handleClickEnter(event); handleClickEnter(event);
return;
}
}, },
[handleClickUp, handleClickDown, handleClickEnter] [
isShow,
types,
currentItem,
handleClickUp,
handleClickDown,
handleClickEnter,
]
); );
useEffect(() => { useEffect(() => {

View File

@@ -212,7 +212,7 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
const handleSelected = async (type: BlockFlavorKeys | string) => { const handleSelected = async (type: BlockFlavorKeys | string) => {
const text = await editor.commands.textCommands.getBlockText(blockId); const text = await editor.commands.textCommands.getBlockText(blockId);
const block = await editor.getBlockById(blockId); const block = await editor.getBlockById(blockId);
let textValue = block.getProperty('text').value; const textValue = block.getProperty('text').value;
editor.blockHelper.removeSearchSlash(blockId, true); editor.blockHelper.removeSearchSlash(blockId, true);
if (type.startsWith('Virgo')) { if (type.startsWith('Virgo')) {
const handler = const handler =
@@ -261,7 +261,6 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
> >
{show ? ( {show ? (
<MuiClickAwayListener onClickAway={handleClickAway}> <MuiClickAwayListener onClickAway={handleClickAway}>
<div>
<CommandMenuContainer <CommandMenuContainer
editor={editor} editor={editor}
hooks={hooks} hooks={hooks}
@@ -277,7 +276,6 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
types={types} types={types}
categories={categories} categories={categories}
/> />
</div>
</MuiClickAwayListener> </MuiClickAwayListener>
) : ( ) : (
<></> <></>

View File

@@ -1,25 +1,24 @@
import { import {
HeadingOneIcon,
HeadingTwoIcon,
HeadingThreeIcon,
ToDoIcon,
NumberIcon,
BulletIcon, BulletIcon,
CodeIcon,
TextIcon,
PagesIcon,
ImageIcon,
FileIcon,
QuoteIcon,
CalloutIcon, CalloutIcon,
CodeIcon,
DividerIcon, DividerIcon,
FigmaIcon,
YoutubeIcon,
EmbedIcon, EmbedIcon,
FigmaIcon,
FileIcon,
HeadingOneIcon,
HeadingThreeIcon,
HeadingTwoIcon,
ImageIcon,
NumberIcon,
QuoteIcon,
TextIcon,
ToDoIcon,
YoutubeIcon,
} from '@toeverything/components/icons'; } from '@toeverything/components/icons';
import { SvgIconProps } from '@toeverything/components/ui'; import { SvgIconProps } from '@toeverything/components/ui';
import { Virgo } from '@toeverything/framework/virgo';
import { BlockFlavorKeys, Protocol } from '@toeverything/datasource/db-service'; import { BlockFlavorKeys, Protocol } from '@toeverything/datasource/db-service';
import { Virgo } from '@toeverything/framework/virgo';
import { without } from '@toeverything/utils'; import { without } from '@toeverything/utils';
export enum CommandMenuCategories { export enum CommandMenuCategories {