Compare commits

..

8 Commits
7.5.0 ... 7.5.1

Author SHA1 Message Date
Athou
aa8d3a390c release 7.5.1 2026-11-16 18:20:18 +01:00
Athou
ec0e19fa4c only allow one entry context menu to be open at a time (#2393) 2026-11-16 18:19:09 +01:00
renovate[bot]
60ee632b78 Update dependency jsdom to v31.0.1 2026-11-16 12:02:06 +00:00
renovate[bot]
04860af353 Lock file maintenance 2026-11-16 04:05:03 +00:00
Jérémie Panzer
03d369659b Merge pull request #2392 from Athou/renovate/org.mock-server-mockserver-junit-jupiter-no-dependencies-9.x
Update dependency org.mock-server:mockserver-junit-jupiter-no-dependencies to v9.3.0
2026-11-16 05:03:45 +01:00
renovate[bot]
2c05b49c63 Update dependency org.mock-server:mockserver-junit-jupiter-no-dependencies to v9.3.0 2026-11-16 00:52:23 +00:00
renovate[bot]
0cde864b85 Update dependency maven to v3.10.1 2026-11-15 17:13:59 +00:00
renovate[bot]
8a2280ce2c Update dependency @testing-library/user-event to v14.6.10 2026-11-15 05:26:59 +00:00
10 changed files with 478 additions and 298 deletions

View File

@@ -1,3 +1,3 @@
wrapperVersion=3.3.4 wrapperVersion=3.3.4
distributionType=only-script distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.0/apache-maven-3.10.0-bin.zip distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.10.1/apache-maven-3.10.1-bin.zip

View File

@@ -1,5 +1,9 @@
# Changelog # Changelog
## [7.5.1]
- Fix multiple entry context menus being open at the same time (#2393)
## [7.5.0] ## [7.5.0]
- Empty categories are now restored when importing OPML files (#2364) - Empty categories are now restored when importing OPML files (#2364)

File diff suppressed because it is too large Load Diff

View File

@@ -58,7 +58,7 @@
"@lingui/vite-plugin": "6.12.0", "@lingui/vite-plugin": "6.12.0",
"@testing-library/jest-dom": "7.0.1", "@testing-library/jest-dom": "7.0.1",
"@testing-library/react": "16.3.3", "@testing-library/react": "16.3.3",
"@testing-library/user-event": "14.6.9", "@testing-library/user-event": "14.6.10",
"@types/mousetrap": "1.6.15", "@types/mousetrap": "1.6.15",
"@types/react": "19.3.0", "@types/react": "19.3.0",
"@types/react-dom": "19.3.0", "@types/react-dom": "19.3.0",
@@ -67,7 +67,7 @@
"@types/tinycon": "0.6.7", "@types/tinycon": "0.6.7",
"@vitejs/plugin-react": "6.3.0", "@vitejs/plugin-react": "6.3.0",
"babel-plugin-react-compiler": "^1.0.0", "babel-plugin-react-compiler": "^1.0.0",
"jsdom": "31.0.0", "jsdom": "31.0.1",
"typescript": "7.0.2", "typescript": "7.0.2",
"vite": "8.3.8", "vite": "8.3.8",
"vite-plugin-checker": "1.0.0", "vite-plugin-checker": "1.0.0",

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</version> <version>7.5.1</version>
</parent> </parent>
<artifactId>commafeed-client</artifactId> <artifactId>commafeed-client</artifactId>
<name>CommaFeed Client</name> <name>CommaFeed Client</name>

View File

@@ -1,7 +1,7 @@
import { Trans } from "@lingui/react/macro" import { Trans } from "@lingui/react/macro"
import { Box } from "@mantine/core" import { Box } from "@mantine/core"
import { openModal } from "@mantine/modals" import { openModal } from "@mantine/modals"
import { useEffect } from "react" import { useEffect, useState } from "react"
import InfiniteScroll from "react-infinite-scroller" import InfiniteScroll from "react-infinite-scroller"
import { throttle } from "throttle-debounce" import { throttle } from "throttle-debounce"
import { Constants } from "@/app/constants" import { Constants } from "@/app/constants"
@@ -78,6 +78,23 @@ export function FeedEntries() {
const swipedLeft = async (entry: ExpendableEntry) => await dispatch(markEntry({ entry, read: !entry.read })) const swipedLeft = async (entry: ExpendableEntry) => await dispatch(markEntry({ entry, read: !entry.read }))
// only one context menu can be opened at a time
const [contextMenuEntryId, setContextMenuEntryId] = useState<string>()
const contextMenuChanged = (entry: ExpendableEntry, opened: boolean) =>
setContextMenuEntryId(current => {
if (opened) return entry.id
return current === entry.id ? undefined : current
})
// close context menu on scroll
useEffect(() => {
if (!contextMenuEntryId) return
const listener = throttle(100, () => setContextMenuEntryId(undefined))
window.addEventListener("scroll", listener)
return () => window.removeEventListener("scroll", listener)
}, [contextMenuEntryId])
useEffect(() => { useEffect(() => {
const listener = throttle(100, () => { const listener = throttle(100, () => {
if (viewMode !== "expanded") return if (viewMode !== "expanded") return
@@ -287,6 +304,8 @@ export function FeedEntries() {
onHeaderClick={event => headerClicked(entry, event)} onHeaderClick={event => headerClicked(entry, event)}
onBodyClick={() => bodyClicked(entry)} onBodyClick={() => bodyClicked(entry)}
onSwipedLeft={async () => await swipedLeft(entry)} onSwipedLeft={async () => await swipedLeft(entry)}
contextMenuOpened={entry.id === contextMenuEntryId}
onContextMenuChange={opened => contextMenuChanged(entry, opened)}
/> />
))} ))}
</InfiniteScroll> </InfiniteScroll>

View File

@@ -21,6 +21,8 @@ interface FeedEntryProps {
onHeaderClick: (e: React.MouseEvent) => void onHeaderClick: (e: React.MouseEvent) => void
onBodyClick: (e: React.MouseEvent) => void onBodyClick: (e: React.MouseEvent) => void
onSwipedLeft: () => void onSwipedLeft: () => void
contextMenuOpened: boolean
onContextMenuChange: (opened: boolean) => void
} }
const useStyles = tss const useStyles = tss
@@ -170,7 +172,11 @@ export function FeedEntry(props: Readonly<FeedEntryProps>) {
"show-selection-indicator": props.showSelectionIndicator, "show-selection-indicator": props.showSelectionIndicator,
})} })}
> >
<FeedEntryContextMenu entry={props.entry}> <FeedEntryContextMenu
entry={props.entry}
opened={props.contextMenuOpened}
onChange={props.onContextMenuChange}
>
<a <a
className={classes.headerLink} className={classes.headerLink}
href={props.entry.url} href={props.entry.url}

View File

@@ -1,8 +1,7 @@
import { Trans } from "@lingui/react/macro" import { Trans } from "@lingui/react/macro"
import { Menu } from "@mantine/core" import { Menu } from "@mantine/core"
import { type ReactElement, useEffect, useState } from "react" import type { ReactElement } from "react"
import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb" import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb"
import { throttle } from "throttle-debounce"
import { markEntriesUpToEntry, markEntry, starEntry } from "@/app/entries/thunks" import { markEntriesUpToEntry, markEntry, starEntry } from "@/app/entries/thunks"
import { redirectToFeed } from "@/app/redirect/thunks" import { redirectToFeed } from "@/app/redirect/thunks"
import { useAppDispatch, useAppSelector } from "@/app/store" import { useAppDispatch, useAppSelector } from "@/app/store"
@@ -12,6 +11,8 @@ import { useBrowserExtension } from "@/hooks/useBrowserExtension"
interface FeedEntryContextMenuProps { interface FeedEntryContextMenuProps {
entry: Entry entry: Entry
opened: boolean
onChange: (opened: boolean) => void
// element that opens the menu when right-clicked // element that opens the menu when right-clicked
children: ReactElement children: ReactElement
} }
@@ -19,23 +20,13 @@ interface FeedEntryContextMenuProps {
const iconSize = 16 const iconSize = 16
export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>) { export function FeedEntryContextMenu(props: Readonly<FeedEntryContextMenuProps>) {
const [opened, setOpened] = useState(false)
const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu) const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu)
const sourceType = useAppSelector(state => state.entries.source.type) const sourceType = useAppSelector(state => state.entries.source.type)
const dispatch = useAppDispatch() const dispatch = useAppDispatch()
const { openLinkInBackgroundTab } = useBrowserExtension() const { openLinkInBackgroundTab } = useBrowserExtension()
// close context menu on scroll
useEffect(() => {
if (!opened) return
const listener = throttle(100, () => setOpened(false))
window.addEventListener("scroll", listener)
return () => window.removeEventListener("scroll", listener)
}, [opened])
return ( return (
<Menu position="bottom-start" opened={opened} onChange={setOpened}> <Menu position="bottom-start" opened={props.opened} onChange={props.onChange}>
<Menu.ContextMenu disabled={!customContextMenu}>{props.children}</Menu.ContextMenu> <Menu.ContextMenu disabled={!customContextMenu}>{props.children}</Menu.ContextMenu>
<Menu.Dropdown> <Menu.Dropdown>
<Menu.Item <Menu.Item

View File

@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</version> <version>7.5.1</version>
</parent> </parent>
<artifactId>commafeed-server</artifactId> <artifactId>commafeed-server</artifactId>
<name>CommaFeed Server</name> <name>CommaFeed Server</name>
@@ -303,7 +303,7 @@
<dependency> <dependency>
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed-client</artifactId> <artifactId>commafeed-client</artifactId>
<version>7.5.0</version> <version>7.5.1</version>
</dependency> </dependency>
<!-- compile-time processors --> <!-- compile-time processors -->
@@ -483,7 +483,7 @@
<dependency> <dependency>
<groupId>org.mock-server</groupId> <groupId>org.mock-server</groupId>
<artifactId>mockserver-junit-jupiter-no-dependencies</artifactId> <artifactId>mockserver-junit-jupiter-no-dependencies</artifactId>
<version>9.2.0</version> <version>9.3.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@@ -5,7 +5,7 @@
<groupId>com.commafeed</groupId> <groupId>com.commafeed</groupId>
<artifactId>commafeed</artifactId> <artifactId>commafeed</artifactId>
<version>7.5.0</version> <version>7.5.1</version>
<name>CommaFeed</name> <name>CommaFeed</name>
<packaging>pom</packaging> <packaging>pom</packaging>