Browse Source

fix static profile feeds

imwald
Silberengel 4 months ago
parent
commit
ad7bbddf48
  1. 9
      src/components/Note/index.tsx
  2. 3
      src/components/NoteCard/MainNoteCard.tsx

9
src/components/Note/index.tsx

@ -45,7 +45,8 @@ export default function Note({
size = 'normal', size = 'normal',
className, className,
hideParentNotePreview = false, hideParentNotePreview = false,
showFull = false showFull = false,
disableClick = false
}: { }: {
event: Event event: Event
originalNoteId?: string originalNoteId?: string
@ -53,6 +54,7 @@ export default function Note({
className?: string className?: string
hideParentNotePreview?: boolean hideParentNotePreview?: boolean
showFull?: boolean showFull?: boolean
disableClick?: boolean
}) { }) {
const { navigateToNote } = useSmartNoteNavigation() const { navigateToNote } = useSmartNoteNavigation()
const { isSmallScreen } = useScreenSize() const { isSmallScreen } = useScreenSize()
@ -173,13 +175,14 @@ export default function Note({
return ( return (
<div <div
className={`${className} clickable`} className={`${className} ${disableClick ? '' : 'clickable'}`}
onClick={(e) => { onClick={disableClick ? undefined : (e) => {
// Don't navigate if clicking on interactive elements // Don't navigate if clicking on interactive elements
const target = e.target as HTMLElement const target = e.target as HTMLElement
if (target.closest('button') || target.closest('[role="button"]') || target.closest('a') || target.closest('[data-embedded-note]') || target.closest('[data-parent-note-preview]') || target.closest('[data-user-avatar]') || target.closest('[data-username]')) { if (target.closest('button') || target.closest('[role="button"]') || target.closest('a') || target.closest('[data-embedded-note]') || target.closest('[data-parent-note-preview]') || target.closest('[data-user-avatar]') || target.closest('[data-username]')) {
return return
} }
e.stopPropagation()
navigateToNote(toNote(event)) navigateToNote(toNote(event))
}} }}
> >

3
src/components/NoteCard/MainNoteCard.tsx

@ -28,7 +28,7 @@ export default function MainNoteCard({
onClick={(e) => { onClick={(e) => {
// Don't navigate if clicking on interactive elements // Don't navigate if clicking on interactive elements
const target = e.target as HTMLElement const target = e.target as HTMLElement
if (target.closest('button') || target.closest('[role="button"]') || target.closest('a') || target.closest('[data-parent-note-preview]')) { if (target.closest('button') || target.closest('[role="button"]') || target.closest('a') || target.closest('[data-parent-note-preview]') || target.closest('[data-user-avatar]') || target.closest('[data-username]')) {
return return
} }
// For embedded notes, allow clicks (don't exclude [data-embedded-note]) // For embedded notes, allow clicks (don't exclude [data-embedded-note])
@ -50,6 +50,7 @@ export default function MainNoteCard({
size={embedded ? 'small' : 'normal'} size={embedded ? 'small' : 'normal'}
event={event} event={event}
originalNoteId={originalNoteId} originalNoteId={originalNoteId}
disableClick={true}
/> />
</Collapsible> </Collapsible>
{!embedded && ( {!embedded && (

Loading…
Cancel
Save