diff --git a/apps/web/package.json b/apps/web/package.json index c2238d630e..5e27d8b46a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -16,7 +16,7 @@ "@affine/i18n": "workspace:*", "@blocksuite/blocks": "0.5.0-20230310062711-a86b71f", "@blocksuite/editor": "0.5.0-20230310062711-a86b71f", - "@blocksuite/icons": "2.0.22", + "@blocksuite/icons": "2.0.23", "@blocksuite/react": "0.5.0-20230310062711-a86b71f", "@blocksuite/store": "0.5.0-20230310062711-a86b71f", "@emotion/cache": "^11.10.5", diff --git a/apps/web/src/components/blocksuite/block-suite-page-list/page-list/index.tsx b/apps/web/src/components/blocksuite/block-suite-page-list/page-list/index.tsx index 143c29de1b..c304745d8c 100644 --- a/apps/web/src/components/blocksuite/block-suite-page-list/page-list/index.tsx +++ b/apps/web/src/components/blocksuite/block-suite-page-list/page-list/index.tsx @@ -11,7 +11,7 @@ import { EdgelessIcon, FavoritedIcon, FavoriteIcon, - PaperIcon, + PageIcon, } from '@blocksuite/icons'; import { PageMeta } from '@blocksuite/store'; import { @@ -143,7 +143,7 @@ export const PageList: React.FC = ({ {pageMeta.mode === 'edgeless' ? ( ) : ( - + )} {pageMeta.title || t('Untitled')} diff --git a/apps/web/src/components/blocksuite/header/header-right-items/EditorOptionMenu.tsx b/apps/web/src/components/blocksuite/header/header-right-items/EditorOptionMenu.tsx index afdc70e2fc..872c33df4a 100644 --- a/apps/web/src/components/blocksuite/header/header-right-items/EditorOptionMenu.tsx +++ b/apps/web/src/components/blocksuite/header/header-right-items/EditorOptionMenu.tsx @@ -12,7 +12,7 @@ import { FavoriteIcon, MoreVerticalIcon, } from '@blocksuite/icons'; -import { EdgelessIcon, PaperIcon } from '@blocksuite/icons'; +import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import { assertExists } from '@blocksuite/store'; import { useTheme } from '@mui/material'; import { useState } from 'react'; @@ -64,7 +64,7 @@ export const EditorOptionMenu = () => { {favorite ? t('Remove from favorites') : t('Add to Favorites')} : } + icon={mode === 'page' ? : } iconSize={[20, 20]} data-testid="editor-option-menu-edgeless" onClick={() => { diff --git a/apps/web/src/components/pure/help-island/style.ts b/apps/web/src/components/pure/help-island/style.ts index 7dde1a607c..5d62865e9c 100644 --- a/apps/web/src/components/pure/help-island/style.ts +++ b/apps/web/src/components/pure/help-island/style.ts @@ -67,5 +67,8 @@ export const StyledTriggerWrapper = styled('div')(({ theme }) => { fontSize: '24px', ...displayFlex('center', 'center'), ...positionAbsolute({ left: '4px', bottom: '4px' }), + ':hover': { + color: theme.colors.primaryColor, + }, }; }); diff --git a/apps/web/src/components/pure/quick-search-modal/PublishedResults.tsx b/apps/web/src/components/pure/quick-search-modal/PublishedResults.tsx index 518e0e1ca4..2fb305d344 100644 --- a/apps/web/src/components/pure/quick-search-modal/PublishedResults.tsx +++ b/apps/web/src/components/pure/quick-search-modal/PublishedResults.tsx @@ -1,5 +1,5 @@ import { useTranslation } from '@affine/i18n'; -import { EdgelessIcon, PaperIcon } from '@blocksuite/icons'; +import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import { Command } from 'cmdk'; import { useRouter } from 'next/router'; import React, { useEffect, useMemo, useState } from 'react'; @@ -21,7 +21,6 @@ export const PublishedResults: React.FC = ({ query, loading, onClose, - setPublishWorkspaceName, blockSuiteWorkspace, }) => { const [results, setResults] = useState(new Map()); @@ -75,7 +74,7 @@ export const PublishedResults: React.FC = ({ {result.mode === 'edgeless' ? ( ) : ( - + )} {result.title} diff --git a/apps/web/src/components/pure/quick-search-modal/Results.tsx b/apps/web/src/components/pure/quick-search-modal/Results.tsx index 8313f15d7a..36ade0806c 100644 --- a/apps/web/src/components/pure/quick-search-modal/Results.tsx +++ b/apps/web/src/components/pure/quick-search-modal/Results.tsx @@ -1,6 +1,6 @@ import { UNTITLED_WORKSPACE_NAME } from '@affine/env'; import { useTranslation } from '@affine/i18n'; -import { EdgelessIcon, PaperIcon } from '@blocksuite/icons'; +import { EdgelessIcon, PageIcon } from '@blocksuite/icons'; import { assertExists } from '@blocksuite/store'; import { Command } from 'cmdk'; import { NextRouter } from 'next/router'; @@ -83,7 +83,7 @@ export const Results: React.FC = ({ {result.mode === 'edgeless' ? ( ) : ( - + )} {result.title} @@ -117,7 +117,7 @@ export const Results: React.FC = ({ {recent.mode === 'edgeless' ? ( ) : ( - + )} {page.title || UNTITLED_WORKSPACE_NAME} diff --git a/apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx b/apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx index a0fa211f0e..6e5bfc88b3 100644 --- a/apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx +++ b/apps/web/src/pages/public-workspace/[workspaceId]/[pageId].tsx @@ -5,7 +5,7 @@ import { styled, } from '@affine/component'; import { useTranslation } from '@affine/i18n'; -import { PaperIcon } from '@blocksuite/icons'; +import { PageIcon } from '@blocksuite/icons'; import { useAtomValue, useSetAtom } from 'jotai'; import Link from 'next/link'; import { useRouter } from 'next/router'; @@ -97,7 +97,7 @@ const PublicWorkspaceDetailPageInner: React.FC<{ - + {pageTitle ? pageTitle : t('Untitled')} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 393e1789cd..0aba5023ab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,7 +140,7 @@ importers: '@affine/i18n': workspace:* '@blocksuite/blocks': 0.5.0-20230310062711-a86b71f '@blocksuite/editor': 0.5.0-20230310062711-a86b71f - '@blocksuite/icons': 2.0.22 + '@blocksuite/icons': 2.0.23 '@blocksuite/react': 0.5.0-20230310062711-a86b71f '@blocksuite/store': 0.5.0-20230310062711-a86b71f '@emotion/cache': ^11.10.5 @@ -191,7 +191,7 @@ importers: '@affine/i18n': link:../../packages/i18n '@blocksuite/blocks': 0.5.0-20230310062711-a86b71f_34dmxnh6uvn62azxghwkfwefga '@blocksuite/editor': 0.5.0-20230310062711-a86b71f_6ewxdfixd6tjoobxljjnuzgvum - '@blocksuite/icons': 2.0.22_pmekkgnqduwlme35zpnqhenc34 + '@blocksuite/icons': 2.0.23_pmekkgnqduwlme35zpnqhenc34 '@blocksuite/react': 0.5.0-20230310062711-a86b71f_t4q3ljijrokxgukt43p662mcc4 '@blocksuite/store': 0.5.0-20230310062711-a86b71f_lit@2.6.1+yjs@13.5.48 '@emotion/cache': 11.10.5 @@ -1758,8 +1758,8 @@ packages: react: 18.2.0 dev: false - /@blocksuite/icons/2.0.22_pmekkgnqduwlme35zpnqhenc34: - resolution: {integrity: sha512-VBpxzQCSDpQCXq+3TPj+gvWR0UZXwfZXOF0buu030GNQtw53yT1Y0Pynw9mDHzhUztm4LwBN8VKiBK1CbC3Q1g==} + /@blocksuite/icons/2.0.23_pmekkgnqduwlme35zpnqhenc34: + resolution: {integrity: sha512-iBDgr16I+NDFIR32qoCOa3bgKypNX+/HZxbt+c+4ARxFv/olSw9V2YhLu4x+8PUZW9LM9Z+3BDSL5Kl90dzDcQ==} peerDependencies: '@types/react': ^18.0.25 react: ^18.2.0 @@ -5384,7 +5384,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.19.6_@babel+core@7.21.0 magic-string: 0.27.0 react-refresh: 0.14.0 - vite: 4.1.4 + vite: 4.1.4_@types+node@18.14.4 transitivePeerDependencies: - supports-color dev: true