diff --git a/packages/frontend/core/src/components/app-sidebar/menu-item/index.css.ts b/packages/frontend/core/src/components/app-sidebar/menu-item/index.css.ts index ae41cb2915..f85bf4fc4d 100644 --- a/packages/frontend/core/src/components/app-sidebar/menu-item/index.css.ts +++ b/packages/frontend/core/src/components/app-sidebar/menu-item/index.css.ts @@ -1,4 +1,5 @@ import { cssVar } from '@toeverything/theme'; +import { cssVarV2 } from '@toeverything/theme/v2'; import { style } from '@vanilla-extract/css'; export const linkItemRoot = style({ color: 'inherit', @@ -71,7 +72,7 @@ export const postfix = style({ }, }); export const icon = style({ - color: cssVar('iconColor'), + color: cssVarV2('icon/primary'), fontSize: '20px', }); export const collapsedIconContainer = style({ diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx index 4acb2e4f36..83ea030e3e 100644 --- a/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx +++ b/packages/frontend/core/src/modules/explorer/views/nodes/collection/operations.tsx @@ -139,7 +139,13 @@ export const useExplorerCollectionNodeOperations = ( index: 0, inline: true, view: ( - + ), diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx index b18bd137ce..748bf11e6d 100644 --- a/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx +++ b/packages/frontend/core/src/modules/explorer/views/nodes/doc/operations.tsx @@ -1,4 +1,5 @@ import { + IconButton, MenuIcon, MenuItem, MenuSeparator, @@ -18,6 +19,7 @@ import { InformationIcon, LinkedPageIcon, OpenInNewIcon, + PlusIcon, SplitViewIcon, } from '@blocksuite/icons/rc'; import { DocsService, useLiveData, useServices } from '@toeverything/infra'; @@ -129,6 +131,18 @@ export const useExplorerDocNodeOperations = ( return useMemo( () => [ + { + index: 0, + inline: true, + view: ( + } + tooltip={t['com.affine.rootAppSidebar.explorer.doc-add-tooltip']()} + onClick={handleAddLinkedPage} + /> + ), + }, ...(runtimeConfig.enableInfoModal ? [ { diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx index 8259229c04..bf2574efea 100644 --- a/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx +++ b/packages/frontend/core/src/modules/explorer/views/nodes/folder/index.tsx @@ -8,6 +8,7 @@ import { MenuItem, MenuSeparator, MenuSub, + notify, } from '@affine/component'; import { useSelectCollection, @@ -182,7 +183,13 @@ export const ExplorerFolderNodeFolder = ({ module: 'organize', control: `delete folder`, }); - }, [node]); + notify.success({ + title: t['com.affine.rootAppSidebar.organize.delete.notify-title']({ + name, + }), + message: t['com.affine.rootAppSidebar.organize.delete.notify-message'](), + }); + }, [name, node, t]); const children = useLiveData(node.sortedChildren$); @@ -636,7 +643,13 @@ export const ExplorerFolderNodeFolder = ({ index: 0, inline: true, view: ( - + ), diff --git a/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx b/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx index 98c0794d2f..b02cb79459 100644 --- a/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx +++ b/packages/frontend/core/src/modules/explorer/views/nodes/tag/operations.tsx @@ -115,7 +115,11 @@ export const useExplorerTagNodeOperations = ( index: 0, inline: true, view: ( - + ), diff --git a/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx index 6ddde6c8bb..fb6115e7c8 100644 --- a/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx +++ b/packages/frontend/core/src/modules/explorer/views/sections/collections/index.tsx @@ -64,6 +64,9 @@ export const ExplorerCollections = () => { data-testid="explorer-bar-add-collection-button" onClick={handleCreateCollection} size="16" + tooltip={t[ + 'com.affine.rootAppSidebar.explorer.collection-section-add-tooltip' + ]()} > diff --git a/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx index 26618293fc..7e4f4064de 100644 --- a/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx +++ b/packages/frontend/core/src/modules/explorer/views/sections/favorites/index.tsx @@ -240,6 +240,9 @@ export const ExplorerFavorites = () => { data-testid="explorer-bar-add-favorite-button" onClick={handleCreateNewFavoriteDoc} size="16" + tooltip={t[ + 'com.affine.rootAppSidebar.explorer.fav-section-add-tooltip' + ]()} > diff --git a/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx index aa5fa614c7..11651c4d2c 100644 --- a/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx +++ b/packages/frontend/core/src/modules/explorer/views/sections/organize/index.tsx @@ -123,6 +123,9 @@ export const ExplorerOrganize = () => { data-testid="explorer-bar-add-organize-button" onClick={handleCreateFolder} size="16" + tooltip={t[ + 'com.affine.rootAppSidebar.explorer.organize-section-add-tooltip' + ]()} > diff --git a/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx b/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx index afa972ede0..8013694d83 100644 --- a/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx +++ b/packages/frontend/core/src/modules/explorer/views/sections/tags/index.tsx @@ -54,6 +54,9 @@ export const ExplorerTags = () => { data-testid="explorer-bar-add-favorite-button" onClick={handleCreateNewFavoriteDoc} size="16" + tooltip={t[ + 'com.affine.rootAppSidebar.explorer.tag-section-add-tooltip' + ]()} > diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json index 9ffcc3839b..db9b51aecd 100644 --- a/packages/frontend/i18n/src/resources/en.json +++ b/packages/frontend/i18n/src/resources/en.json @@ -1139,6 +1139,12 @@ "com.affine.rootAppSidebar.organize.new-folders": "New Folder", "com.affine.rootAppSidebar.organize.delete": "Delete", "com.affine.rootAppSidebar.organize.delete-from-folder": "Remove from folder", + "com.affine.rootAppSidebar.organize.delete.notify-title": "Delete {{name}}", + "com.affine.rootAppSidebar.organize.delete.notify-message": "Delete the folder will not delete any docs, tags, or collections.", + "com.affine.rootAppSidebar.organize.move.notify-title": "Successfully added to {{to}}", + "com.affine.rootAppSidebar.organize.move.notify-message": "Add {{from}} to {{to}}", + "com.affine.rootAppSidebar.organize.link.notify-title": "Successfully linked to {{to}}", + "com.affine.rootAppSidebar.organize.link.notify-message": "Link {{from}} to {{to}}", "com.affine.rootAppSidebar.organize.root-folder-only": "Only folder can be placed on here", "com.affine.rootAppSidebar.organize.folder-add-favorite": "Add to favorites", "com.affine.rootAppSidebar.organize.folder-rm-favorite": "Remove from favorites", @@ -1152,6 +1158,14 @@ "com.affine.rootAppSidebar.explorer.drop-effect.link": "Link", "com.affine.rootAppSidebar.explorer.drop-effect.move": "Move", "com.affine.rootAppSidebar.explorer.drop-effect.copy": "Copy", + "com.affine.rootAppSidebar.explorer.tag-section-add-tooltip": "New Tag", + "com.affine.rootAppSidebar.explorer.tag-add-tooltip": "New Doc", + "com.affine.rootAppSidebar.explorer.fav-section-add-tooltip": "New Doc", + "com.affine.rootAppSidebar.explorer.organize-section-add-tooltip": "New Folder", + "com.affine.rootAppSidebar.explorer.organize-add-tooltip": "New Doc", + "com.affine.rootAppSidebar.explorer.collection-section-add-tooltip": "New Collection", + "com.affine.rootAppSidebar.explorer.collection-add-tooltip": "New Doc", + "com.affine.rootAppSidebar.explorer.doc-add-tooltip": "New Linked Doc", "com.affine.rootAppSidebar.docs.no-subdoc": "No linked docs", "com.affine.rootAppSidebar.favorites.empty": "No Favorites", "com.affine.rootAppSidebar.others": "Others",