Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(core): add favorite operation to all collection #6428

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/frontend/core/src/components/page-list/list.css.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { cssVar } from '@toeverything/theme';
import { createContainer, style } from '@vanilla-extract/css';

import * as itemStyles from './docs/page-list-item.css';
import { root as collectionItemRoot } from './collections/collection-list-item.css';
import { root as pageItemRoot } from './docs/page-list-item.css';
export const listRootContainer = createContainer('list-root-container');
export const pageListScrollContainer = style({
width: '100%',
Expand Down Expand Up @@ -48,9 +49,10 @@ export const favoriteCell = style({
flexShrink: 0,
opacity: 0,
selectors: {
[`&[data-favorite], ${itemStyles.root}:hover &`]: {
opacity: 1,
},
[`&[data-favorite], ${pageItemRoot}:hover &, ${collectionItemRoot}:hover &`]:
{
opacity: 1,
},
},
});
export const clearLinkStyle = style({
Expand Down
65 changes: 53 additions & 12 deletions packages/frontend/core/src/components/page-list/operation-cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ export const CollectionOperationCell = ({
info,
}: CollectionOperationCellProps) => {
const t = useAFFiNEI18N();
const favAdapter = useService(FavoriteItemsAdapter);
const favourite = useLiveData(
favAdapter.isFavorite$(collection.id, 'collection')
);

const { open: openEditCollectionModal, node: editModal } =
useEditCollection(config);
Expand Down Expand Up @@ -322,10 +326,28 @@ export const CollectionOperationCell = ({
return service.deleteCollection(info, collection.id);
}, [service, info, collection]);

const onToggleFavoriteCollection = useCallback(() => {
const status = favAdapter.isFavorite(collection.id, 'collection');
favAdapter.toggle(collection.id, 'collection');
toast(
status
? t['com.affine.toastMessage.removedFavorites']()
: t['com.affine.toastMessage.addedFavorites']()
);
}, [favAdapter, collection.id, t]);

return (
<>
{editModal}
{editNameModal}
<ColWrapper
hideInSmallContainer
data-testid="page-list-item-favorite"
data-favorite={favourite ? true : undefined}
className={styles.favoriteCell}
>
<FavoriteTag onClick={onToggleFavoriteCollection} active={favourite} />
</ColWrapper>
<Tooltip content={t['com.affine.collection.menu.rename']()} side="top">
<IconButton onClick={handleEditName}>
<EditIcon />
Expand All @@ -336,21 +358,40 @@ export const CollectionOperationCell = ({
<FilterIcon />
</IconButton>
</Tooltip>

<ColWrapper alignment="start">
<Menu
items={
<MenuItem
onClick={handleDelete}
preFix={
<MenuIcon>
<DeleteIcon />
</MenuIcon>
}
type="danger"
>
{t['Delete']()}
</MenuItem>
<>
<MenuItem
onClick={onToggleFavoriteCollection}
preFix={
<MenuIcon>
{favourite ? (
<FavoritedIcon
style={{ color: 'var(--affine-primary-color)' }}
/>
) : (
<FavoriteIcon />
)}
</MenuIcon>
}
>
{favourite
? t['com.affine.favoritePageOperation.remove']()
: t['com.affine.favoritePageOperation.add']()}
</MenuItem>
<MenuItem
onClick={handleDelete}
preFix={
<MenuIcon>
<DeleteIcon />
</MenuIcon>
}
type="danger"
>
{t['Delete']()}
</MenuItem>
</>
}
contentOptions={{
align: 'end',
Expand Down
Loading