Some improvment and fixes

This commit is contained in:
mindfreq 2026-05-04 18:25:12 +02:00
parent 8a6336b70c
commit 6bd7b54d7f
2 changed files with 111 additions and 23 deletions

View file

@ -179,8 +179,7 @@
margin-top: 1.2rem; margin-top: 1.2rem;
} }
.reader-content, .reader-content {
.reader-content * {
-webkit-user-select: text; -webkit-user-select: text;
user-select: text; user-select: text;
} }
@ -199,7 +198,7 @@
} }
.reader-content img { .reader-content img {
@apply my-4 w-full rounded-lg border; @apply my-4 h-auto w-full rounded-lg border;
} }
.reader-content pre { .reader-content pre {

View file

@ -1,4 +1,4 @@
import { useEffect, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { commands, Feed, FeedEntry, FeedItem, Person } from "./bindings"; import { commands, Feed, FeedEntry, FeedItem, Person } from "./bindings";
import { ScrollArea } from "@/components/ui/scroll-area"; import { ScrollArea } from "@/components/ui/scroll-area";
import { Separator } from "@/components/ui/separator"; import { Separator } from "@/components/ui/separator";
@ -31,7 +31,14 @@ import {
type View = type View =
| { type: "empty" } | { type: "empty" }
| { type: "items"; feed: Feed; items: FeedItem[] } | { type: "items"; feed: Feed; items: FeedItem[] }
| { type: "entry"; feed: Feed; entry: FeedEntry }; | {
type: "entry";
feed: Feed;
items: FeedItem[];
entry: FeedEntry;
articleHtml: string;
summaryMatchesContent: boolean;
};
type UiError = { type UiError = {
id: number; id: number;
@ -85,6 +92,20 @@ const getRenderableHtml = (content: string): string => {
return /<[a-z][\s\S]*>/i.test(decoded) ? decoded : value; return /<[a-z][\s\S]*>/i.test(decoded) ? decoded : value;
}; };
const getArticleHtml = (content: string): string => {
const html = getRenderableHtml(content);
if (!/<img[\s>]/i.test(html)) return html;
const template = document.createElement("template");
template.innerHTML = html;
template.content.querySelectorAll("img").forEach((image) => {
if (!image.hasAttribute("loading")) image.setAttribute("loading", "lazy");
if (!image.hasAttribute("decoding")) image.setAttribute("decoding", "async");
});
return template.innerHTML;
};
const isSummarySameAsContent = (summary: string | null, content: string): boolean => { const isSummarySameAsContent = (summary: string | null, content: string): boolean => {
if (!summary) return false; if (!summary) return false;
@ -155,6 +176,7 @@ const renderAuthor = (author: Person, index: number) => {
export default function App() { export default function App() {
const { resolvedTheme, setTheme } = useTheme(); const { resolvedTheme, setTheme } = useTheme();
const articleScrollRef = useRef<HTMLDivElement>(null);
const [feeds, setFeeds] = useState<Feed[]>([]); const [feeds, setFeeds] = useState<Feed[]>([]);
const [loadingFeeds, setLoadingFeeds] = useState(true); const [loadingFeeds, setLoadingFeeds] = useState(true);
const [selectedFeed, setSelectedFeed] = useState<Feed | null>(null); const [selectedFeed, setSelectedFeed] = useState<Feed | null>(null);
@ -166,6 +188,13 @@ export default function App() {
const [uiError, setUiError] = useState<UiError | null>(null); const [uiError, setUiError] = useState<UiError | null>(null);
const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false); const [isMobileSidebarOpen, setIsMobileSidebarOpen] = useState(false);
const [isDesktopSidebarOpen, setIsDesktopSidebarOpen] = useState(true); const [isDesktopSidebarOpen, setIsDesktopSidebarOpen] = useState(true);
const [feedPendingDelete, setFeedPendingDelete] = useState<Feed | null>(null);
const [removingFeedId, setRemovingFeedId] = useState<number | null>(null);
useEffect(() => {
if (view.type !== "entry") return;
articleScrollRef.current?.scrollTo({ top: 0 });
}, [view.type === "entry" ? view.entry.url : null]);
const showError = (error: unknown, fallbackMessage: string) => { const showError = (error: unknown, fallbackMessage: string) => {
console.error(error); console.error(error);
@ -223,7 +252,15 @@ export default function App() {
setLoadingView(true); setLoadingView(true);
try { try {
const entry = await commands.getEntry(feed.url, item.url); const entry = await commands.getEntry(feed.url, item.url);
setView({ type: "entry", feed, entry }); const items = view.type === "items" ? view.items : [];
setView({
type: "entry",
feed,
items,
entry,
articleHtml: getArticleHtml(entry.content),
summaryMatchesContent: isSummarySameAsContent(entry.summary, entry.content),
});
} catch (e) { } catch (e) {
showError(e, "Unable to open this article."); showError(e, "Unable to open this article.");
} finally { } finally {
@ -231,6 +268,11 @@ export default function App() {
} }
}; };
const handleBackToItems = () => {
if (view.type !== "entry") return;
setView({ type: "items", feed: view.feed, items: view.items });
};
const handleAddFeed = async () => { const handleAddFeed = async () => {
if (!addUrl.trim()) return; if (!addUrl.trim()) return;
setAdding(true); setAdding(true);
@ -246,8 +288,8 @@ export default function App() {
} }
}; };
const handleRemoveFeed = async (feed: Feed, e: React.MouseEvent) => { const handleRemoveFeed = async (feed: Feed) => {
e.stopPropagation(); setRemovingFeedId(feed.id);
try { try {
await commands.removeFeed(feed.url); await commands.removeFeed(feed.url);
setFeeds((prev) => prev.filter((f) => f.id !== feed.id)); setFeeds((prev) => prev.filter((f) => f.id !== feed.id));
@ -255,8 +297,11 @@ export default function App() {
setSelectedFeed(null); setSelectedFeed(null);
setView({ type: "empty" }); setView({ type: "empty" });
} }
setFeedPendingDelete(null);
} catch (e) { } catch (e) {
showError(e, "Unable to remove this feed."); showError(e, "Unable to remove this feed.");
} finally {
setRemovingFeedId(null);
} }
}; };
@ -287,14 +332,6 @@ export default function App() {
{resolvedTheme === "dark" ? "Switch to light" : "Switch to dark"} {resolvedTheme === "dark" ? "Switch to light" : "Switch to dark"}
</TooltipContent> </TooltipContent>
</Tooltip> </Tooltip>
<Tooltip>
<TooltipTrigger>
<Button variant="ghost" size="icon" className="h-7 w-7" onClick={loadFeeds}>
<RefreshCw className="h-3.5 w-3.5" />
</Button>
</TooltipTrigger>
<TooltipContent>Refresh feeds</TooltipContent>
</Tooltip>
<Tooltip> <Tooltip>
<TooltipTrigger> <TooltipTrigger>
<Button <Button
@ -362,7 +399,10 @@ export default function App() {
<Tooltip> <Tooltip>
<TooltipTrigger> <TooltipTrigger>
<span <span
onClick={(e) => handleRemoveFeed(feed, e)} onClick={(e) => {
e.stopPropagation();
setFeedPendingDelete(feed);
}}
className="inline-flex items-center justify-center rounded-md p-1 align-middle opacity-0 transition-all hover:bg-destructive/10 hover:text-destructive group-hover:opacity-100" className="inline-flex items-center justify-center rounded-md p-1 align-middle opacity-0 transition-all hover:bg-destructive/10 hover:text-destructive group-hover:opacity-100"
> >
<Trash2 className="h-3 w-3" /> <Trash2 className="h-3 w-3" />
@ -504,16 +544,19 @@ export default function App() {
variant="ghost" variant="ghost"
size="icon" size="icon"
className="h-7 w-7 shrink-0" className="h-7 w-7 shrink-0"
onClick={() => handleSelectFeed(view.feed)} onClick={handleBackToItems}
> >
<ChevronLeft className="h-4 w-4" /> <ChevronLeft className="h-4 w-4" />
</Button> </Button>
<span className="text-xs text-muted-foreground truncate">{view.feed.title}</span> <div className="min-w-0 flex-1">
<p className="truncate text-xs text-muted-foreground">{view.feed.title}</p>
<p dir="auto" className="truncate text-sm font-medium leading-5">{view.entry.title}</p>
</div>
<a href={view.entry.url} target="_blank" rel="noreferrer" className="ml-auto"> <a href={view.entry.url} target="_blank" rel="noreferrer" className="ml-auto">
<ExternalLink className="h-3.5 w-3.5 text-muted-foreground hover:text-foreground transition-colors" /> <ExternalLink className="h-3.5 w-3.5 text-muted-foreground hover:text-foreground transition-colors" />
</a> </a>
</div> </div>
<ScrollArea className="min-h-0 flex-1"> <div ref={articleScrollRef} className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
<article className="mx-auto w-full max-w-3xl select-text px-4 py-7 sm:px-6 lg:px-8"> <article className="mx-auto w-full max-w-3xl select-text px-4 py-7 sm:px-6 lg:px-8">
<h1 dir="auto" className="mb-3 text-2xl font-semibold leading-tight tracking-tight"> <h1 dir="auto" className="mb-3 text-2xl font-semibold leading-tight tracking-tight">
{view.entry.title} {view.entry.title}
@ -528,17 +571,17 @@ export default function App() {
<span className="text-xs text-muted-foreground">{formatPublishedDate(view.entry.published, true)}</span> <span className="text-xs text-muted-foreground">{formatPublishedDate(view.entry.published, true)}</span>
)} )}
</div> </div>
{view.entry.summary && !isSummarySameAsContent(view.entry.summary, view.entry.content) && ( {view.entry.summary && !view.summaryMatchesContent && (
<p className="mb-7 border-l-2 border-border pl-4 text-sm italic leading-6 text-muted-foreground"> <p className="mb-7 border-l-2 border-border pl-4 text-sm italic leading-6 text-muted-foreground">
{view.entry.summary} {view.entry.summary}
</p> </p>
)} )}
<div <div
className="reader-content prose prose-neutral prose-sm sm:prose-base break-words dark:prose-invert prose-headings:font-semibold prose-headings:tracking-tight prose-p:leading-7 prose-li:leading-7 prose-a:text-primary prose-a:no-underline prose-a:hover:underline prose-blockquote:border-primary/40 prose-blockquote:text-muted-foreground prose-img:rounded-lg prose-img:border [&_img]:max-w-full [&_pre]:max-w-full" className="reader-content prose prose-neutral prose-sm sm:prose-base break-words dark:prose-invert prose-headings:font-semibold prose-headings:tracking-tight prose-p:leading-7 prose-li:leading-7 prose-a:text-primary prose-a:no-underline prose-a:hover:underline prose-blockquote:border-primary/40 prose-blockquote:text-muted-foreground prose-img:rounded-lg prose-img:border [&_img]:max-w-full [&_pre]:max-w-full"
dangerouslySetInnerHTML={{ __html: getRenderableHtml(view.entry.content) }} dangerouslySetInnerHTML={{ __html: view.articleHtml }}
/> />
</article> </article>
</ScrollArea> </div>
</> </>
) : null} ) : null}
</main> </main>
@ -566,6 +609,52 @@ export default function App() {
</div> </div>
</div> </div>
)} )}
{feedPendingDelete && (
<div className="absolute inset-0 z-[65] flex items-center justify-center bg-background/55 px-4 backdrop-blur-[2px]">
<div className="w-full max-w-md rounded-xl border border-border/80 bg-card p-5 shadow-2xl">
<div className="mb-3 flex items-start gap-3">
<div className="rounded-lg bg-destructive/10 p-2 text-destructive">
<Trash2 className="h-4 w-4" />
</div>
<div className="min-w-0 flex-1">
<h3 className="text-sm font-semibold tracking-tight">Delete this feed?</h3>
<p className="mt-1 text-xs leading-relaxed text-muted-foreground">
This removes the feed from your sidebar and clears its articles from this app view.
</p>
</div>
</div>
<div className="mb-4 rounded-lg border border-border/70 bg-muted/30 px-3 py-2.5">
<p dir="auto" className="truncate text-xs font-medium text-foreground">
{feedPendingDelete.title || feedPendingDelete.url}
</p>
{feedPendingDelete.title && (
<p dir="auto" className="mt-0.5 truncate text-xs text-muted-foreground">
{feedPendingDelete.url}
</p>
)}
</div>
<div className="flex justify-end gap-2">
<Button
variant="outline"
onClick={() => setFeedPendingDelete(null)}
disabled={removingFeedId === feedPendingDelete.id}
>
Cancel
</Button>
<Button
variant="destructive"
onClick={() => handleRemoveFeed(feedPendingDelete)}
disabled={removingFeedId === feedPendingDelete.id}
>
{removingFeedId === feedPendingDelete.id ? "Deleting..." : "Delete feed"}
</Button>
</div>
</div>
</div>
)}
</div> </div>
</TooltipProvider> </TooltipProvider>
); );