1 files changed, 21 insertions, 5 deletions
diff --git a/apps/web/components/dashboard/bookmarks/LinkCard.tsx b/apps/web/components/dashboard/bookmarks/LinkCard.tsx
index ec224ca6..2c91bd08 100644
--- a/apps/web/components/dashboard/bookmarks/LinkCard.tsx
+++ b/apps/web/components/dashboard/bookmarks/LinkCard.tsx
@@ -2,6 +2,7 @@
 
 import Image from "next/image";
 import Link from "next/link";
+import { useUserSettings } from "@/lib/userSettings";
 
 import type { ZBookmarkTypeLink } from "@karakeep/shared/types/bookmarks";
 import {
@@ -14,11 +15,25 @@ import {
 import { BookmarkLayoutAdaptingCard } from "./BookmarkLayoutAdaptingCard";
 import FooterLinkURL from "./FooterLinkURL";
 
+const useOnClickUrl = (bookmark: ZBookmarkTypeLink) => {
+  const userSettings = useUserSettings();
+  return {
+    urlTarget:
+      userSettings.bookmarkClickAction === "open_original_link"
+        ? ("_blank" as const)
+        : ("_self" as const),
+    onClickUrl:
+      userSettings.bookmarkClickAction === "expand_bookmark_preview"
+        ? `/dashboard/preview/${bookmark.id}`
+        : bookmark.content.url,
+  };
+};
+
 function LinkTitle({ bookmark }: { bookmark: ZBookmarkTypeLink }) {
-  const link = bookmark.content;
-  const parsedUrl = new URL(link.url);
+  const { onClickUrl, urlTarget } = useOnClickUrl(bookmark);
+  const parsedUrl = new URL(bookmark.content.url);
   return (
-    <Link href={link.url} target="_blank" rel="noreferrer">
+    <Link href={onClickUrl} target={urlTarget} rel="noreferrer">
       {getBookmarkTitle(bookmark) ?? parsedUrl.host}
     </Link>
   );
@@ -31,6 +46,7 @@ function LinkImage({
   bookmark: ZBookmarkTypeLink;
   className?: string;
 }) {
+  const { onClickUrl, urlTarget } = useOnClickUrl(bookmark);
   const link = bookmark.content;
 
   const imgComponent = (url: string, unoptimized: boolean) => (
@@ -61,8 +77,8 @@ function LinkImage({
 
   return (
     <Link
-      href={link.url}
-      target="_blank"
+      href={onClickUrl}
+      target={urlTarget}
       rel="noreferrer"
       className={className}
     >