From a5aba6f7aed3c92f4bc1f304da19819ba3b66b8a Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Sun, 18 Jun 2023 12:46:42 +0200
Subject: [PATCH] content is no longer limited to 650px when sidebar is hidden
 (same as commafeed v2) (#1084)

---
 .../src/components/content/FeedEntries.tsx    |  4 +-
 .../src/components/content/FeedEntry.tsx      | 38 +++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/commafeed-client/src/components/content/FeedEntries.tsx b/commafeed-client/src/components/content/FeedEntries.tsx
index d4909937..681d9abb 100644
--- a/commafeed-client/src/components/content/FeedEntries.tsx
+++ b/commafeed-client/src/components/content/FeedEntries.tsx
@@ -30,9 +30,10 @@ export function FeedEntries() {
     const entriesTimestamp = useAppSelector(state => state.entries.timestamp)
     const selectedEntryId = useAppSelector(state => state.entries.selectedEntryId)
     const hasMore = useAppSelector(state => state.entries.hasMore)
-    const { viewMode } = useViewMode()
     const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
     const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry)
+    const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible)
+    const { viewMode } = useViewMode()
     const dispatch = useAppDispatch()
     const { openLinkInBackgroundTab } = useBrowserExtension()
 
@@ -267,6 +268,7 @@ export function FeedEntries() {
                         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)}
                     />
                 </div>
diff --git a/commafeed-client/src/components/content/FeedEntry.tsx b/commafeed-client/src/components/content/FeedEntry.tsx
index 84515b90..9482e1fa 100644
--- a/commafeed-client/src/components/content/FeedEntry.tsx
+++ b/commafeed-client/src/components/content/FeedEntry.tsx
@@ -18,21 +18,31 @@ interface FeedEntryProps {
     expanded: boolean
     selected: boolean
     showSelectionIndicator: boolean
+    maxWidth?: number
     onHeaderClick: (e: React.MouseEvent) => void
 }
 
 const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: ViewMode }) => {
     let backgroundColor
-    if (theme.colorScheme === "dark") backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
-    else backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
+    if (theme.colorScheme === "dark") {
+        backgroundColor = props.entry.read ? "inherit" : theme.colors.dark[5]
+    } else {
+        backgroundColor = props.entry.read && !props.expanded ? theme.colors.gray[0] : "inherit"
+    }
 
     let marginY = 10
-    if (props.viewMode === "title") marginY = 2
-    else if (props.viewMode === "cozy") marginY = 6
+    if (props.viewMode === "title") {
+        marginY = 2
+    } else if (props.viewMode === "cozy") {
+        marginY = 6
+    }
 
     let mobileMarginY = 6
-    if (props.viewMode === "title") mobileMarginY = 2
-    else if (props.viewMode === "cozy") mobileMarginY = 4
+    if (props.viewMode === "title") {
+        mobileMarginY = 2
+    } else if (props.viewMode === "cozy") {
+        mobileMarginY = 4
+    }
 
     let backgroundHoverColor = backgroundColor
     if (!props.expanded && !props.entry.read) {
@@ -59,7 +69,7 @@ const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: View
             textDecoration: "none",
         },
         body: {
-            maxWidth: Constants.layout.entryMaxWidth,
+            maxWidth: props.maxWidth ?? "100%",
         },
     }
 
@@ -87,12 +97,18 @@ export function FeedEntry(props: FeedEntryProps) {
     if (viewMode === "title" || viewMode === "cozy") paddingX = 6
 
     let paddingY: MantineNumberSize = "xs"
-    if (viewMode === "title") paddingY = 4
-    else if (viewMode === "cozy") paddingY = 8
+    if (viewMode === "title") {
+        paddingY = 4
+    } else if (viewMode === "cozy") {
+        paddingY = 8
+    }
 
     let borderRadius: MantineNumberSize = "sm"
-    if (viewMode === "title") borderRadius = 0
-    else if (viewMode === "cozy") borderRadius = "xs"
+    if (viewMode === "title") {
+        borderRadius = 0
+    } else if (viewMode === "cozy") {
+        borderRadius = "xs"
+    }
 
     const compactHeader = !props.expanded && (viewMode === "title" || viewMode === "cozy")
     return (