From 1869a863a38b079a0bb50320bb8f80ac750e2721 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Sun, 14 Dec 2025 01:52:26 +0800 Subject: [PATCH] fix(layout): fixed max inline width not applied for EPUBs, closes #2706 (#2711) --- apps/readest-app/src/app/reader/components/ProgressInfo.tsx | 4 ++-- apps/readest-app/src/app/reader/components/SectionInfo.tsx | 2 +- apps/readest-app/src/utils/style.ts | 4 ++++ packages/foliate-js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/readest-app/src/app/reader/components/ProgressInfo.tsx b/apps/readest-app/src/app/reader/components/ProgressInfo.tsx index bd1dbc4b..a638c545 100644 --- a/apps/readest-app/src/app/reader/components/ProgressInfo.tsx +++ b/apps/readest-app/src/app/reader/components/ProgressInfo.tsx @@ -147,8 +147,8 @@ const ProgressInfoView: React.FC = ({ height: `calc(100% - ${((contentInsets.top + contentInsets.bottom) / 2) * 3}px)`, } : { - paddingInlineStart: `calc(${horizontalGap / 2}% + ${contentInsets.left / 2}px)`, - paddingInlineEnd: `calc(${horizontalGap / 2}% + ${contentInsets.right / 2}px)`, + paddingInlineStart: `calc(${horizontalGap / 2}% + ${contentInsets.left}px)`, + paddingInlineEnd: `calc(${horizontalGap / 2}% + ${contentInsets.right}px)`, paddingBottom: appService?.hasSafeAreaInset ? `${gridInsets.bottom * 0.33}px` : 0, } } diff --git a/apps/readest-app/src/app/reader/components/SectionInfo.tsx b/apps/readest-app/src/app/reader/components/SectionInfo.tsx index 6479e03f..61504f93 100644 --- a/apps/readest-app/src/app/reader/components/SectionInfo.tsx +++ b/apps/readest-app/src/app/reader/components/SectionInfo.tsx @@ -70,7 +70,7 @@ const SectionInfo: React.FC = ({ } : { top: `${topInset}px`, - paddingInline: `calc(${horizontalGap / 2}% + ${contentInsets.left / 2}px)`, + paddingInline: `calc(${horizontalGap / 2}% + ${contentInsets.left}px)`, width: '100%', } } diff --git a/apps/readest-app/src/utils/style.ts b/apps/readest-app/src/utils/style.ts index 90a5caef..e604bdd9 100644 --- a/apps/readest-app/src/utils/style.ts +++ b/apps/readest-app/src/utils/style.ts @@ -303,8 +303,12 @@ const getLayoutStyles = ( p { ${vertical ? `margin-left: ${paragraphMargin}em ${overrideLayout ? '!important' : ''};` : ''} ${vertical ? `margin-right: ${paragraphMargin}em ${overrideLayout ? '!important' : ''};` : ''} + ${vertical ? `margin-top: unset ${overrideLayout ? '!important' : ''};` : ''} + ${vertical ? `margin-bottom: unset ${overrideLayout ? '!important' : ''};` : ''} ${!vertical ? `margin-top: ${paragraphMargin}em ${overrideLayout ? '!important' : ''};` : ''} ${!vertical ? `margin-bottom: ${paragraphMargin}em ${overrideLayout ? '!important' : ''};` : ''} + ${!vertical ? `margin-left: unset ${overrideLayout ? '!important' : ''};` : ''} + ${!vertical ? `margin-right: unset ${overrideLayout ? '!important' : ''};` : ''} } div { ${vertical && overrideLayout ? `margin-left: ${paragraphMargin}em !important;` : ''} diff --git a/packages/foliate-js b/packages/foliate-js index a325057b..0e0096d1 160000 --- a/packages/foliate-js +++ b/packages/foliate-js @@ -1 +1 @@ -Subproject commit a325057bcedb9d5073353c85949d0f2f8037f237 +Subproject commit 0e0096d1f0908a06458f35f02a09138aea786e31