From af06fa79d8f62d606d008d45cb66bd0438eef608 Mon Sep 17 00:00:00 2001 From: Silberengel Date: Wed, 15 Oct 2025 15:19:20 +0200 Subject: [PATCH] reverted fix --- src/components/Image/index.tsx | 10 +++++----- src/components/ImageWithLightbox/index.tsx | 4 ++-- src/components/Note/LongFormArticle/index.tsx | 15 +++++++++++++-- src/components/ui/scroll-area.tsx | 2 +- src/layouts/SecondaryPageLayout/index.tsx | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx index c04d2a8..c7f65ae 100644 --- a/src/components/Image/index.tsx +++ b/src/components/Image/index.tsx @@ -102,7 +102,7 @@ export default function Image({ } return ( - +
{displaySkeleton && ( {blurHash ? ( @@ -141,17 +141,17 @@ export default function Image({ /> )} {hasError && ( - {errorPlaceholder} - +
)} -
+ ) } diff --git a/src/components/ImageWithLightbox/index.tsx b/src/components/ImageWithLightbox/index.tsx index 5430386..1c180fb 100644 --- a/src/components/ImageWithLightbox/index.tsx +++ b/src/components/ImageWithLightbox/index.tsx @@ -57,7 +57,7 @@ export default function ImageWithLightbox({ } return ( - +
, document.body )} - +
) } diff --git a/src/components/Note/LongFormArticle/index.tsx b/src/components/Note/LongFormArticle/index.tsx index ce40e91..67ffe2e 100644 --- a/src/components/Note/LongFormArticle/index.tsx +++ b/src/components/Note/LongFormArticle/index.tsx @@ -4,7 +4,7 @@ import { getLongFormArticleMetadataFromEvent } from '@/lib/event-metadata' import { toNote, toNoteList, toProfile } from '@/lib/link' import { ExternalLink } from 'lucide-react' import { Event, kinds } from 'nostr-tools' -import { useMemo } from 'react' +import React, { useMemo } from 'react' import Markdown from 'react-markdown' import remarkGfm from 'remark-gfm' import NostrNode from './NostrNode' @@ -61,7 +61,18 @@ export default function LongFormArticle({ ) }, - p: (props) =>

, + p: (props) => { + // Check if the paragraph contains only an image + const children = props.children + if (React.Children.count(children) === 1 && React.isValidElement(children)) { + const child = children as React.ReactElement + if (child.type === ImageWithLightbox) { + // Render image outside paragraph context + return

+ } + } + return

+ }, div: (props) =>

, code: (props) => , img: (props) => ( diff --git a/src/components/ui/scroll-area.tsx b/src/components/ui/scroll-area.tsx index 61b2ddb..79040a0 100644 --- a/src/components/ui/scroll-area.tsx +++ b/src/components/ui/scroll-area.tsx @@ -8,7 +8,7 @@ const ScrollArea = React.forwardRef< React.ComponentPropsWithoutRef & { scrollBarClassName?: string } >(({ className, scrollBarClassName, children, ...props }, ref) => ( - + {children} diff --git a/src/layouts/SecondaryPageLayout/index.tsx b/src/layouts/SecondaryPageLayout/index.tsx index 29da578..e707bc4 100644 --- a/src/layouts/SecondaryPageLayout/index.tsx +++ b/src/layouts/SecondaryPageLayout/index.tsx @@ -83,7 +83,7 @@ const SecondaryPageLayout = forwardRef( return (