mirror of
https://github.com/dergigi/boris.git
synced 2026-02-16 20:45:01 +01:00
- Change condition from 'readingProgress && readingProgress > 0' to 'readingProgress !== undefined && readingProgress > 0' - Prevent React from rendering 0 values when readingProgress is 0 - Fix weird 0 artefacts appearing in compact list view - Ensure clean conditional rendering without unwanted text output
95 lines
3.1 KiB
TypeScript
95 lines
3.1 KiB
TypeScript
import React from 'react'
|
|
import { useNavigate } from 'react-router-dom'
|
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
|
import { IconDefinition } from '@fortawesome/fontawesome-svg-core'
|
|
import { IndividualBookmark } from '../../types/bookmarks'
|
|
import { formatDateCompact } from '../../utils/bookmarkUtils'
|
|
import RichContent from '../RichContent'
|
|
import { naddrEncode } from 'nostr-tools/nip19'
|
|
import { ReadingProgressBar } from '../ReadingProgressBar'
|
|
|
|
interface CompactViewProps {
|
|
bookmark: IndividualBookmark
|
|
index: number
|
|
hasUrls: boolean
|
|
extractedUrls: string[]
|
|
onSelectUrl?: (url: string, bookmark?: { id: string; kind: number; tags: string[][]; pubkey: string }) => void
|
|
articleTitle?: string
|
|
contentTypeIcon: IconDefinition
|
|
readingProgress?: number
|
|
}
|
|
|
|
export const CompactView: React.FC<CompactViewProps> = ({
|
|
bookmark,
|
|
index,
|
|
hasUrls,
|
|
extractedUrls,
|
|
onSelectUrl,
|
|
articleTitle,
|
|
contentTypeIcon,
|
|
readingProgress
|
|
}) => {
|
|
const navigate = useNavigate()
|
|
const isArticle = bookmark.kind === 30023
|
|
const isWebBookmark = bookmark.kind === 39701
|
|
const isNote = bookmark.kind === 1
|
|
const isClickable = hasUrls || isArticle || isWebBookmark || isNote
|
|
|
|
const displayText = isArticle && articleTitle ? articleTitle : bookmark.content
|
|
|
|
|
|
const handleCompactClick = () => {
|
|
if (isArticle) {
|
|
const dTag = bookmark.tags.find(t => t[0] === 'd')?.[1]
|
|
if (dTag) {
|
|
const naddr = naddrEncode({
|
|
kind: bookmark.kind,
|
|
pubkey: bookmark.pubkey,
|
|
identifier: dTag
|
|
})
|
|
navigate(`/a/${naddr}`)
|
|
}
|
|
} else if (hasUrls) {
|
|
onSelectUrl?.(extractedUrls[0])
|
|
} else if (isNote) {
|
|
navigate(`/e/${bookmark.id}`)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div key={`${bookmark.id}-${index}`} className={`individual-bookmark compact ${bookmark.isPrivate ? 'private-bookmark' : ''}`}>
|
|
<div
|
|
className={`compact-row ${isClickable ? 'clickable' : ''}`}
|
|
onClick={handleCompactClick}
|
|
role={isClickable ? 'button' : undefined}
|
|
tabIndex={isClickable ? 0 : undefined}
|
|
>
|
|
<span className="bookmark-type-compact">
|
|
<FontAwesomeIcon icon={contentTypeIcon} className="content-type-icon" />
|
|
</span>
|
|
{displayText ? (
|
|
<div className="compact-text">
|
|
<RichContent content={displayText.slice(0, 60) + (displayText.length > 60 ? '…' : '')} className="" />
|
|
</div>
|
|
) : (
|
|
<div className="compact-text" style={{ opacity: 0.5, fontSize: '0.85em' }}>
|
|
<code>{bookmark.id.slice(0, 12)}...</code>
|
|
</div>
|
|
)}
|
|
<span className="bookmark-date-compact">{formatDateCompact(bookmark.created_at ?? bookmark.listUpdatedAt)}</span>
|
|
{/* CTA removed */}
|
|
</div>
|
|
|
|
{/* Reading progress indicator - only show when there's actual progress */}
|
|
{readingProgress !== undefined && readingProgress > 0 && (
|
|
<ReadingProgressBar
|
|
readingProgress={readingProgress}
|
|
height={1}
|
|
marginLeft="1.5rem"
|
|
/>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|