Merge branch 'develop' into feat/quick-search

This commit is contained in:
JimmFly
2022-12-13 16:46:20 +08:00
15 changed files with 114 additions and 122 deletions
@@ -1,9 +1,5 @@
import React from 'react';
import {
MiddleFavouritesIcon,
MiddleTrashIcon,
MiddleAllPagesIcon,
} from '@blocksuite/icons';
import { FavouritesIcon, TrashIcon, AllPagesIcon } from '@blocksuite/icons';
import Link from 'next/link';
import { StyledJumpTo } from '../style';
import { useModal } from '@/providers/global-modal-provider';
@@ -16,21 +12,21 @@ const JumpTo = () => {
href={{ pathname: '/page-list/all' }}
onClick={() => triggerQuickSearchModal()}
>
<MiddleAllPagesIcon width={20} height={20} />
<AllPagesIcon width={20} height={20} />
<span> All pages</span>
</Link>
<Link
href={{ pathname: '/page-list/favorite' }}
onClick={() => triggerQuickSearchModal()}
>
<MiddleFavouritesIcon width={20} height={20} />
<FavouritesIcon width={20} height={20} />
<span> Favourites</span>
</Link>
<Link
href={{ pathname: '/page-list/trash' }}
onClick={() => triggerQuickSearchModal()}
>
<MiddleTrashIcon width={20} height={20} />
<TrashIcon width={20} height={20} />
<span> Trash</span>
</Link>
</StyledJumpTo>
@@ -1,5 +1,5 @@
import React from 'react';
import { MiddleAddIcon } from '@blocksuite/icons';
import { AddIcon } from '@blocksuite/icons';
import { StyledModalFooterContent } from './style';
import { useEditor } from '@/providers/editor-provider';
import { useModal } from '@/providers/global-modal-provider';
@@ -10,15 +10,15 @@ const QuickSearchFooter = () => {
const { triggerQuickSearchModal } = useModal();
return (
<StyledModalFooterContent>
<IconButton>
<MiddleAddIcon
onClick={async () => {
const page = createPage();
const pageMeta = getPageMeta((await page).id);
pageMeta && openPage(pageMeta.id);
triggerQuickSearchModal();
}}
/>
<IconButton
onClick={async () => {
const page = createPage();
const pageMeta = getPageMeta((await page).id);
pageMeta && openPage(pageMeta.id);
triggerQuickSearchModal();
}}
>
<AddIcon />
</IconButton>
<span>New page</span>
</StyledModalFooterContent>
@@ -1,5 +1,5 @@
import React, { Dispatch, SetStateAction } from 'react';
import { MiddleSearchIcon } from '@blocksuite/icons';
import { SearchIcon } from '@blocksuite/icons';
import { StyledInputContent, StyledLabel } from './style';
import { Command } from 'cmdk';
const Input = (props: {
@@ -9,7 +9,7 @@ const Input = (props: {
return (
<StyledInputContent>
<StyledLabel htmlFor=":r5:">
<MiddleSearchIcon />
<SearchIcon />
</StyledLabel>
<Command.Input
value={props.query}