aboutsummaryrefslogtreecommitdiffstats
path: root/apps/web/components/dashboard/bookmarks
diff options
context:
space:
mode:
authorxuatz <xzlow10@gmail.com>2025-11-03 04:32:18 +0900
committerGitHub <noreply@github.com>2025-11-02 19:32:18 +0000
commit33f407797213c56dd2f13e98228a5305efdf90fd (patch)
tree149f477c1ab61b46bb0d9cc49c656a03b1c56f64 /apps/web/components/dashboard/bookmarks
parentb63a49fc3980296c6a6ea6ac0624142e8af94d52 (diff)
downloadkarakeep-33f407797213c56dd2f13e98228a5305efdf90fd.tar.zst
feat: display notes on bookmark card (#2083)
* feat: display notes on bookmark card * apply styling * include mobile impl * apply pr comments * add display options menu into PR * put it under app setting * cleanup * address pr comments * change the default for show notes to false * make the in-card note font lighter --------- Co-authored-by: Mohamed Bassem <me@mbassem.com>
Diffstat (limited to 'apps/web/components/dashboard/bookmarks')
-rw-r--r--apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx28
-rw-r--r--apps/web/components/dashboard/bookmarks/NotePreview.tsx66
2 files changed, 86 insertions, 8 deletions
diff --git a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
index 4b511a3c..26c1c72b 100644
--- a/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
+++ b/apps/web/components/dashboard/bookmarks/BookmarkLayoutAdaptingCard.tsx
@@ -1,10 +1,14 @@
+"use client";
+
import type { BookmarksLayoutTypes } from "@/lib/userLocalSettings/types";
-import React, { useEffect, useState } from "react";
+import type { ReactNode } from "react";
+import { useEffect, useState } from "react";
import Image from "next/image";
import Link from "next/link";
import useBulkActionsStore from "@/lib/bulkActions";
import {
bookmarkLayoutSwitch,
+ useBookmarkDisplaySettings,
useBookmarkLayout,
} from "@/lib/userLocalSettings/bookmarksLayout";
import { cn } from "@/lib/utils";
@@ -17,14 +21,15 @@ import { isBookmarkStillTagging } from "@karakeep/shared/utils/bookmarkUtils";
import BookmarkActionBar from "./BookmarkActionBar";
import BookmarkFormattedCreatedAt from "./BookmarkFormattedCreatedAt";
+import { NotePreview } from "./NotePreview";
import TagList from "./TagList";
interface Props {
bookmark: ZBookmark;
- image: (layout: BookmarksLayoutTypes, className: string) => React.ReactNode;
- title?: React.ReactNode;
- content?: React.ReactNode;
- footer?: React.ReactNode;
+ image: (layout: BookmarksLayoutTypes, className: string) => ReactNode;
+ title?: ReactNode;
+ content?: ReactNode;
+ footer?: ReactNode;
className?: string;
fitHeight?: boolean;
wrapTags: boolean;
@@ -34,7 +39,7 @@ function BottomRow({
footer,
bookmark,
}: {
- footer?: React.ReactNode;
+ footer?: ReactNode;
bookmark: ZBookmark;
}) {
return (
@@ -112,6 +117,9 @@ function ListView({
footer,
className,
}: Props) {
+ const { showNotes } = useBookmarkDisplaySettings();
+ const note = showNotes ? bookmark.note?.trim() : undefined;
+
return (
<div
className={cn(
@@ -131,6 +139,7 @@ function ListView({
</div>
)}
{content && <div className="shrink-1 overflow-hidden">{content}</div>}
+ {note && <NotePreview note={note} bookmarkId={bookmark.id} />}
<div className="flex shrink-0 flex-wrap gap-1 overflow-hidden">
<TagList
bookmark={bookmark}
@@ -155,7 +164,9 @@ function GridView({
layout,
fitHeight = false,
}: Props & { layout: BookmarksLayoutTypes }) {
- const img = image("grid", "h-56 min-h-56 w-full object-cover rounded-t-lg");
+ const { showNotes } = useBookmarkDisplaySettings();
+ const note = showNotes ? bookmark.note?.trim() : undefined;
+ const img = image("grid", "h-52 min-h-52 w-full object-cover rounded-t-lg");
return (
<div
@@ -166,7 +177,7 @@ function GridView({
)}
>
<MultiBookmarkSelector bookmark={bookmark} />
- {img && <div className="h-56 w-full shrink-0 overflow-hidden">{img}</div>}
+ {img && <div className="h-52 w-full shrink-0 overflow-hidden">{img}</div>}
<div className="flex h-full flex-col justify-between gap-2 overflow-hidden p-2">
<div className="grow-1 flex flex-col gap-2 overflow-hidden">
{title && (
@@ -175,6 +186,7 @@ function GridView({
</div>
)}
{content && <div className="shrink-1 overflow-hidden">{content}</div>}
+ {note && <NotePreview note={note} bookmarkId={bookmark.id} />}
<div className="flex shrink-0 flex-wrap gap-1 overflow-hidden">
<TagList
className={wrapTags ? undefined : "h-full"}
diff --git a/apps/web/components/dashboard/bookmarks/NotePreview.tsx b/apps/web/components/dashboard/bookmarks/NotePreview.tsx
new file mode 100644
index 00000000..c32c85a3
--- /dev/null
+++ b/apps/web/components/dashboard/bookmarks/NotePreview.tsx
@@ -0,0 +1,66 @@
+"use client";
+
+import { useState } from "react";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { useTranslation } from "@/lib/i18n/client";
+import { cn } from "@/lib/utils";
+import { ExternalLink, NotepadText } from "lucide-react";
+
+interface NotePreviewProps {
+ note: string;
+ bookmarkId: string;
+ className?: string;
+}
+
+export function NotePreview({ note, bookmarkId, className }: NotePreviewProps) {
+ const { t } = useTranslation();
+ const [isOpen, setIsOpen] = useState(false);
+
+ if (!note?.trim()) {
+ return null;
+ }
+
+ return (
+ <Popover open={isOpen} onOpenChange={setIsOpen}>
+ <PopoverTrigger asChild>
+ <div
+ className={cn(
+ "flex cursor-pointer items-center gap-1.5 text-sm font-light italic text-gray-500 dark:text-gray-400",
+ className,
+ )}
+ >
+ <NotepadText className="size-5 shrink-0" />
+ <div className="line-clamp-2 min-w-0 flex-1 overflow-hidden text-wrap break-words">
+ {note}
+ </div>
+ </div>
+ </PopoverTrigger>
+ <PopoverContent className="w-96 max-w-[calc(100vw-2rem)]" align="start">
+ <div className="space-y-3">
+ <div className="max-h-60 overflow-y-auto whitespace-pre-wrap break-words text-sm text-gray-700 dark:text-gray-300">
+ {note}
+ </div>
+ <div className="flex justify-end">
+ <Link href={`/dashboard/preview/${bookmarkId}`}>
+ <Button
+ variant="outline"
+ size="sm"
+ className="gap-2"
+ onClick={() => setIsOpen(false)}
+ >
+ {t("actions.edit_notes")}
+ <ExternalLink className="size-4" />
+ </Button>
+ </Link>
+ </div>
+ </div>
+ </PopoverContent>
+ </Popover>
+ );
+}