From f37a4276f141b109c150b79e871653e27d23cef0 Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 6 Jul 2023 12:05:50 +0800 Subject: [PATCH] feat: improve print mode Signed-off-by: Innei --- global.d.ts | 12 +++++------- src/app/(page-detail)/[slug]/pageExtra.tsx | 5 ++++- src/components/common/Lazyload.tsx | 4 +++- src/components/layout/footer/Footer.tsx | 5 ++++- .../layout/header/internal/HeaderWithShadow.tsx | 1 + src/components/ui/loading/index.tsx | 1 + src/components/widgets/comment/CommentBox/Root.tsx | 2 +- src/components/widgets/subscribe/SubscribeBell.tsx | 5 ++++- src/components/widgets/xlog/XLogInfo.tsx | 5 ++++- src/components/widgets/xlog/XLogSummary.tsx | 1 + 10 files changed, 28 insertions(+), 13 deletions(-) diff --git a/global.d.ts b/global.d.ts index 9d4a98dafe..7b7d3e8aa4 100644 --- a/global.d.ts +++ b/global.d.ts @@ -29,14 +29,12 @@ declare global { updateCallbackDone: () => void skipTransition(): void } +} - declare module 'react' { - export interface HTMLAttributes - extends AriaAttributes, - DOMAttributes { - 'data-hide-print'?: boolean - 'data-testid'?: string - } +declare module 'react' { + export interface AriaAttributes { + 'data-hide-print'?: boolean + 'data-testid'?: string } } diff --git a/src/app/(page-detail)/[slug]/pageExtra.tsx b/src/app/(page-detail)/[slug]/pageExtra.tsx index c60279b1f4..f6bb577df7 100644 --- a/src/app/(page-detail)/[slug]/pageExtra.tsx +++ b/src/app/(page-detail)/[slug]/pageExtra.tsx @@ -97,7 +97,10 @@ export const PagePaginator = () => { const hasNext = indexInPages + 1 < n const hasPrev = indexInPages - 1 >= 0 return ( -
+
{hasPrev && ( diff --git a/src/components/common/Lazyload.tsx b/src/components/common/Lazyload.tsx index a6e18b1fda..d3b70b7b85 100644 --- a/src/components/common/Lazyload.tsx +++ b/src/components/common/Lazyload.tsx @@ -25,7 +25,9 @@ export const LazyLoad: FC = (props) => { return ( <> - {!isLoaded && } + {!isLoaded && ( + + )} {!inView ? placeholder : props.children} ) diff --git a/src/components/layout/footer/Footer.tsx b/src/components/layout/footer/Footer.tsx index fb060bae11..90e9436ca6 100644 --- a/src/components/layout/footer/Footer.tsx +++ b/src/components/layout/footer/Footer.tsx @@ -4,7 +4,10 @@ import { FooterInfo } from './FooterInfo' export const Footer = () => { return ( -