From 8b854b5cda869a36795e03e7e8f3f5603e1635bd Mon Sep 17 00:00:00 2001 From: Athou Date: Sat, 5 Apr 2025 17:12:40 +0200 Subject: [PATCH] remove intermediate element by rendering the mantine Paper as
--- .../src/components/content/FeedEntries.tsx | 29 +++++++------------ .../src/components/content/FeedEntry.tsx | 3 ++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/commafeed-client/src/components/content/FeedEntries.tsx b/commafeed-client/src/components/content/FeedEntries.tsx index b6d38bb4..a1686432 100644 --- a/commafeed-client/src/components/content/FeedEntries.tsx +++ b/commafeed-client/src/components/content/FeedEntries.tsx @@ -307,25 +307,18 @@ export function FeedEntries() { loader={{loading && }} > {entries.map(entry => ( -
{ - if (el) el.id = Constants.dom.entryId(entry) - }} - data-id={entry.id} - > - headerClicked(entry, event)} - onHeaderRightClick={event => headerRightClicked(entry, event)} - onBodyClick={() => bodyClicked(entry)} - onSwipedLeft={async () => await swipedLeft(entry)} - /> -
+ entry={entry} + expanded={!!entry.expanded || viewMode === "expanded"} + selected={entry.id === selectedEntryId} + showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")} + maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined} + onHeaderClick={event => headerClicked(entry, event)} + onHeaderRightClick={event => headerRightClicked(entry, event)} + onBodyClick={() => bodyClicked(entry)} + onSwipedLeft={async () => await swipedLeft(entry)} + /> ))} ) diff --git a/commafeed-client/src/components/content/FeedEntry.tsx b/commafeed-client/src/components/content/FeedEntry.tsx index e46f7a12..56c464f7 100644 --- a/commafeed-client/src/components/content/FeedEntry.tsx +++ b/commafeed-client/src/components/content/FeedEntry.tsx @@ -137,6 +137,9 @@ export function FeedEntry(props: FeedEntryProps) { const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy") return (