Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

feat(web): allow triggering bulk edit on hover

Mohamed Bassem28a48ec58214
diff --git a/apps/web/components/dashboard/BulkBookmarksAction.tsx b/apps/web/components/dashboard/BulkBookmarksAction.tsx
index ff6c5530..784d0143 100644
--- a/apps/web/components/dashboard/BulkBookmarksAction.tsx
+++ b/apps/web/components/dashboard/BulkBookmarksAction.tsx
@@ -19,7 +19,6 @@ import {
Link,
List,
ListMinus,
- Pencil,
RotateCw,
Trash2,
X,
@@ -243,13 +242,6 @@ export default function BulkBookmarksAction() {
alwaysEnable: true,
hidden: !isBulkEditEnabled,
},
- {
- name: t("actions.bulk_edit"),
- icon: <Pencil size={18} />,
- action: () => setIsBulkEditEnabled(true),
- alwaysEnable: true,
- hidden: isBulkEditEnabled,
- },
];
return (
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
index 999653f7..8fbb8701 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkActionBar.tsx
@@ -10,13 +10,18 @@ import { FavouritedActionIcon } from "./icons";
export default function BookmarkActionBar({
bookmark,
+ favouritedClassName,
}: {
bookmark: ZBookmark;
+ favouritedClassName?: string;
}) {
return (
<div className="flex text-gray-500">
{bookmark.favourited && (
- <FavouritedActionIcon className="m-1 size-8 rounded p-1" favourited />
+ <FavouritedActionIcon
+ className={cn("m-1 size-8 rounded p-1", favouritedClassName)}
+ favourited
+ />
)}
<Link
href={`/dashboard/preview/${bookmark.id}`}
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
index b76b0d91..d4cb34ec 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
@@ -18,7 +18,8 @@ import {
import { cn } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query";
import {
- Check,
+ Circle,
+ CircleCheck,
GripVertical,
Image as ImageIcon,
NotebookPen,
@@ -116,7 +117,7 @@ function OwnerIndicator({ bookmark }: { bookmark: ZBookmark }) {
);
}
-function MultiBookmarkSelector({ bookmark }: { bookmark: ZBookmark }) {
+function BulkEditSelectionOverlay({ bookmark }: { bookmark: ZBookmark }) {
const isSelected = useBulkActionsStore((s) =>
s.isBookmarkSelected(bookmark.id),
);
@@ -129,20 +130,6 @@ function MultiBookmarkSelector({ bookmark }: { bookmark: ZBookmark }) {
const isOwner = session?.user?.id === bookmark.userId;
if (!isBulkEditEnabled || !isOwner) return null;
- const getIconColor = () => {
- if (theme === "dark") {
- return isSelected ? "black" : "white";
- }
- return isSelected ? "white" : "black";
- };
-
- const getIconBackgroundColor = () => {
- if (theme === "dark") {
- return isSelected ? "bg-white" : "bg-white bg-opacity-10";
- }
- return isSelected ? "bg-black" : "bg-white bg-opacity-40";
- };
-
return (
<button
className={cn(
@@ -153,18 +140,7 @@ function MultiBookmarkSelector({ bookmark }: { bookmark: ZBookmark }) {
theme === "dark" ? "bg-white" : "bg-black",
)}
onClick={() => toggleBookmark(bookmark.id)}
- >
- <div className="absolute right-2 top-2 z-50 opacity-100">
- <div
- className={cn(
- "flex h-4 w-4 items-center justify-center rounded-full border border-gray-600",
- getIconBackgroundColor(),
- )}
- >
- <Check size={12} color={getIconColor()} />
- </div>
- </div>
- </button>
+ ></button>
);
}
@@ -227,9 +203,24 @@ function DragHandle({
);
}
-function HoverActionBar({ bookmark }: { bookmark: ZBookmark }) {
+function HoverActionBar({
+ bookmark,
+ inline = false,
+}: {
+ bookmark: ZBookmark;
+ inline?: boolean;
+}) {
const { t } = useTranslation();
- const { isBulkEditEnabled } = useBulkActionsStore();
+ const enableBulkEditForBookmark = useBulkActionsStore(
+ (state) => state.enableBulkEditForBookmark,
+ );
+ const isBulkEditEnabled = useBulkActionsStore(
+ (state) => state.isBulkEditEnabled,
+ );
+ const isSelected = useBulkActionsStore((state) =>
+ state.isBookmarkSelected(bookmark.id),
+ );
+ const toggleBookmark = useBulkActionsStore((state) => state.toggleBookmark);
const { data: session } = useSession();
const demoMode = !!useClientConfig().demoMode;
const updateBookmarkMutator = useUpdateBookmark({
@@ -242,42 +233,76 @@ function HoverActionBar({ bookmark }: { bookmark: ZBookmark }) {
});
const isOwner = session?.user?.id === bookmark.userId;
- if (!isOwner || isBulkEditEnabled || demoMode) return null;
+ if (!isOwner) return null;
return (
- <div className="pointer-events-none absolute right-2 top-2 z-30 hidden gap-1 rounded bg-white/50 p-1 opacity-0 backdrop-blur-sm transition-opacity duration-200 group-hover:opacity-100 dark:bg-black/50 [@media(pointer:fine)]:pointer-events-auto [@media(pointer:fine)]:flex">
- <button
- title={
- bookmark.favourited ? t("actions.unfavorite") : t("actions.favorite")
- }
- className="rounded p-0.5 hover:bg-background/50"
- onClick={(e) => {
- e.preventDefault();
- e.stopPropagation();
- updateBookmarkMutator.mutate({
- bookmarkId: bookmark.id,
- favourited: !bookmark.favourited,
- });
- }}
- >
- <FavouritedActionIcon favourited={bookmark.favourited} size={16} />
- </button>
+ <div
+ className={cn(
+ "z-[60] gap-1 rounded bg-white/50 p-1 backdrop-blur-sm transition-opacity duration-200 dark:bg-black/50",
+ inline ? "shrink-0" : "absolute right-2 top-2",
+ isBulkEditEnabled
+ ? "pointer-events-auto flex opacity-100"
+ : "pointer-events-none hidden opacity-0 group-hover:opacity-100 [@media(pointer:fine)]:pointer-events-auto [@media(pointer:fine)]:flex",
+ )}
+ >
<button
- title={
- bookmark.archived ? t("actions.unarchive") : t("actions.archive")
- }
+ aria-label={t("actions.bulk_edit")}
+ title={t("actions.bulk_edit")}
className="rounded p-0.5 hover:bg-background/50"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
- updateBookmarkMutator.mutate({
- bookmarkId: bookmark.id,
- archived: !bookmark.archived,
- });
+ if (isBulkEditEnabled) {
+ toggleBookmark(bookmark.id);
+ } else {
+ enableBulkEditForBookmark(bookmark.id);
+ }
}}
>
- <ArchivedActionIcon archived={bookmark.archived} size={16} />
+ {isSelected ? (
+ <CircleCheck className="size-4" />
+ ) : (
+ <Circle className="size-4" />
+ )}
</button>
+ {!demoMode && (
+ <>
+ <button
+ title={
+ bookmark.favourited
+ ? t("actions.unfavorite")
+ : t("actions.favorite")
+ }
+ className="rounded p-0.5 hover:bg-background/50"
+ onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ updateBookmarkMutator.mutate({
+ bookmarkId: bookmark.id,
+ favourited: !bookmark.favourited,
+ });
+ }}
+ >
+ <FavouritedActionIcon favourited={bookmark.favourited} size={16} />
+ </button>
+ <button
+ title={
+ bookmark.archived ? t("actions.unarchive") : t("actions.archive")
+ }
+ className="rounded p-0.5 hover:bg-background/50"
+ onClick={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ updateBookmarkMutator.mutate({
+ bookmarkId: bookmark.id,
+ archived: !bookmark.archived,
+ });
+ }}
+ >
+ <ArchivedActionIcon archived={bookmark.archived} size={16} />
+ </button>
+ </>
+ )}
</div>
);
}
@@ -307,7 +332,7 @@ function ListView({
)}
data-bookmark-index={bookmarkIndex}
>
- <MultiBookmarkSelector bookmark={bookmark} />
+ <BulkEditSelectionOverlay bookmark={bookmark} />
<OwnerIndicator bookmark={bookmark} />
<DragHandle
bookmark={bookmark}
@@ -374,7 +399,7 @@ function GridView({
)}
data-bookmark-index={bookmarkIndex}
>
- <MultiBookmarkSelector bookmark={bookmark} />
+ <BulkEditSelectionOverlay bookmark={bookmark} />
<OwnerIndicator bookmark={bookmark} />
<DragHandle bookmark={bookmark} className="left-2 top-2" />
<HoverActionBar bookmark={bookmark} />
@@ -412,6 +437,9 @@ function CompactView({
bookmarkIndex,
}: Props) {
const { showTitle } = useBookmarkDisplaySettings();
+ const isBulkEditEnabled = useBulkActionsStore(
+ (state) => state.isBulkEditEnabled,
+ );
return (
<div
className={cn(
@@ -421,7 +449,7 @@ function CompactView({
)}
data-bookmark-index={bookmarkIndex}
>
- <MultiBookmarkSelector bookmark={bookmark} />
+ <BulkEditSelectionOverlay bookmark={bookmark} />
<OwnerIndicator bookmark={bookmark} />
<div className="flex h-full justify-between gap-2 overflow-hidden p-2">
<div className="flex items-center gap-2">
@@ -459,7 +487,16 @@ function CompactView({
<BookmarkFormattedCreatedAt createdAt={bookmark.createdAt} />
</Link>
</div>
- <BookmarkActionBar bookmark={bookmark} />
+ <div className="relative z-[60] flex shrink-0 items-center">
+ <HoverActionBar bookmark={bookmark} inline />
+ <BookmarkActionBar
+ bookmark={bookmark}
+ favouritedClassName={cn(
+ "group-hover:hidden",
+ isBulkEditEnabled && "hidden",
+ )}
+ />
+ </div>
</div>
</div>
);
diff --git a/apps/web/lib/bulkActions.test.ts b/apps/web/lib/bulkActions.test.ts
index 7d67d577..fc9d0401 100644
--- a/apps/web/lib/bulkActions.test.ts
+++ b/apps/web/lib/bulkActions.test.ts
@@ -22,8 +22,10 @@ describe("useBulkActionsStore", () => {
useBulkActionsStore.getState().toggleBookmark("a");
expect(useBulkActionsStore.getState().selectedBookmarkIds).toEqual(["a"]);
+ useBulkActionsStore.setState({ isBulkEditEnabled: true });
useBulkActionsStore.getState().toggleBookmark("a");
expect(useBulkActionsStore.getState().selectedBookmarkIds).toEqual([]);
+ expect(useBulkActionsStore.getState().isBulkEditEnabled).toBe(false);
});
it("selects and unselects all visible bookmarks", () => {
@@ -38,9 +40,22 @@ describe("useBulkActionsStore", () => {
]);
expect(useBulkActionsStore.getState().isEverythingSelected()).toBe(true);
+ useBulkActionsStore.setState({ isBulkEditEnabled: true });
useBulkActionsStore.getState().unSelectAll();
expect(useBulkActionsStore.getState().selectedBookmarkIds).toEqual([]);
expect(useBulkActionsStore.getState().isEverythingSelected()).toBe(false);
+ expect(useBulkActionsStore.getState().isBulkEditEnabled).toBe(false);
+ });
+
+ it("exits bulk edit when selection is cleared directly", () => {
+ useBulkActionsStore.setState({
+ isBulkEditEnabled: true,
+ selectedBookmarkIds: ["a"],
+ });
+
+ useBulkActionsStore.getState().setSelectedBookmarkIds([]);
+
+ expect(useBulkActionsStore.getState().isBulkEditEnabled).toBe(false);
});
it("clears selection when bulk edit mode changes", () => {
@@ -64,6 +79,18 @@ describe("useBulkActionsStore", () => {
expect(useBulkActionsStore.getState().selectedBookmarkIds).toEqual(["a"]);
});
+ it("enables bulk editing with the initiating bookmark selected", () => {
+ useBulkActionsStore.setState({
+ isBulkEditEnabled: false,
+ selectedBookmarkIds: ["previous"],
+ });
+
+ useBulkActionsStore.getState().enableBulkEditForBookmark("a");
+
+ expect(useBulkActionsStore.getState().isBulkEditEnabled).toBe(true);
+ expect(useBulkActionsStore.getState().selectedBookmarkIds).toEqual(["a"]);
+ });
+
it("derives selected bookmarks from visible bookmarks in visible order", () => {
useBulkActionsStore.setState({
selectedBookmarkIds: ["c", "a"],
diff --git a/apps/web/lib/bulkActions.ts b/apps/web/lib/bulkActions.ts
index 1130f97b..4749fde2 100644
--- a/apps/web/lib/bulkActions.ts
+++ b/apps/web/lib/bulkActions.ts
@@ -9,6 +9,7 @@ interface BookmarkState {
visibleBookmarks: ZBookmark[];
isBulkEditEnabled: boolean;
setIsBulkEditEnabled: (isEnabled: boolean) => void;
+ enableBulkEditForBookmark: (bookmarkId: string) => void;
toggleBookmark: (bookmarkId: string) => void;
setSelectedBookmarkIds: (bookmarkIds: string[]) => void;
setVisibleBookmarks: (visibleBookmarks: ZBookmark[]) => void;
@@ -34,10 +35,12 @@ const useBulkActionsStore = create<BookmarkState>((set, get) => ({
const selectedBookmarkIds = get().selectedBookmarkIds;
const isBookmarkAlreadySelected = selectedBookmarkIds.includes(bookmarkId);
if (isBookmarkAlreadySelected) {
+ const remainingBookmarkIds = selectedBookmarkIds.filter(
+ (id) => id !== bookmarkId,
+ );
set({
- selectedBookmarkIds: selectedBookmarkIds.filter(
- (id) => id !== bookmarkId,
- ),
+ selectedBookmarkIds: remainingBookmarkIds,
+ isBulkEditEnabled: remainingBookmarkIds.length > 0,
});
} else {
set({ selectedBookmarkIds: [...selectedBookmarkIds, bookmarkId] });
@@ -45,14 +48,17 @@ const useBulkActionsStore = create<BookmarkState>((set, get) => ({
},
setSelectedBookmarkIds: (bookmarkIds: string[]) => {
- set({ selectedBookmarkIds: bookmarkIds });
+ set({
+ selectedBookmarkIds: bookmarkIds,
+ ...(bookmarkIds.length === 0 && { isBulkEditEnabled: false }),
+ });
},
selectAll: () => {
set({ selectedBookmarkIds: get().visibleBookmarks.map((b) => b.id) });
},
unSelectAll: () => {
- set({ selectedBookmarkIds: [] });
+ set({ selectedBookmarkIds: [], isBulkEditEnabled: false });
},
isBookmarkSelected: (bookmarkId: string) => {
@@ -85,6 +91,9 @@ const useBulkActionsStore = create<BookmarkState>((set, get) => ({
}
set({ isBulkEditEnabled: isEnabled, selectedBookmarkIds: [] });
},
+ enableBulkEditForBookmark: (bookmarkId) => {
+ set({ isBulkEditEnabled: true, selectedBookmarkIds: [bookmarkId] });
+ },
setVisibleBookmarks: (visibleBookmarks: ZBookmark[]) => {
set({