Skip to content

fix(render): Improve style handling and enhance stylesheet sorting #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sgulli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(render): Improve style handling and enhance stylesheet sorting #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const convertEntities = (input: string) => {
};

export const isBlockStyle = (style: HtmlStyle) =>
['block', 'flex'].includes(style.display);
style.display && ['block', 'flex'].includes(style.display);

export const hasBlockContent = (element: HtmlElement | string): boolean => {
if (typeof element === 'string') {
Expand Down Expand Up @@ -319,7 +319,14 @@ export const applyStylesheets = (
.slice()
.reverse()
.forEach((stylesheet) => {
for (const selector of Object.keys(stylesheet)) {
const selectors = Object.keys(stylesheet).sort((a, b) => {
const aCompound = a.includes(' ');
const bCompound = b.includes(' ');
if (aCompound && !bCompound) return -1;
if (!aCompound && bCompound) return 1;
return 0;
});
for (const selector of selectors) {
try {
const elements = rootElement.querySelectorAll(
selector
Expand Down
2 changes: 1 addition & 1 deletion src/renderers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ const renderers: HtmlRenderers = {
} else if (listStyleType.includes('url(')) {
bullet = (
<Image
src={listStyleType.match(/\((.*?)\)/)[1].replace(/(['"])/g, '')}
src={listStyleType.match(/\((.*?)\)/)?.[1]?.replace(/(['"])/g, '')}
/>
);
} else if (ordered) {
Expand Down
20 changes: 14 additions & 6 deletions src/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ import { Style } from '@react-pdf/types';
import { Tag } from './tags.js';

export type HtmlStyle =
| (Style & {
| Style & {
listStyle?: string;
listStyleType?: string;
borderSpacing?: number | string;
borderCollapse?: string;
})
| any;
};

export type HtmlStyles = Record<Tag | string, HtmlStyle>;

Expand Down Expand Up @@ -111,18 +110,26 @@ export const createHtmlStylesheet = <T extends HtmlStyles>(
li: {
display: 'flex',
flexDirection: 'row',
alignItems: 'flex-start',
},
li_bullet: {
width: 30,
width: 22,
minWidth: 22,
textAlign: 'right',
flexShrink: 0,
flexGrow: 0,
paddingRight: 5,
paddingRight: 4,
},
li_content: {
textAlign: 'left',
flexGrow: 1,
flexBasis: 1,
flexShrink: 1,
flexBasis: 0,
minWidth: 0,
},
'li p': {
marginTop: 0,
marginBottom: em(0.5),
},
table: {
display: 'flex',
Expand Down Expand Up @@ -162,6 +169,7 @@ export const createHtmlStylesheet = <T extends HtmlStyles>(
for (const style of Object.keys(base[key])) {
if (
!key.startsWith('li_') &&
key !== 'li p' &&
(style.startsWith('margin') ||
style.startsWith('padding') ||
style === 'fontSize')
Expand Down