Skip to content

fix: bullet/number lost when list item starts with linebreak in pdf #10045

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
BacLuc wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

fix: bullet/number lost when list item starts with linebreak in pdf #10045

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
28 changes: 22 additions & 6 deletions pdf/src/campPrint/RichText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@ function visitChildren(children, parent) {
: [visit({ type: 'text', content: ' ' }, parent)]
}

function prependTextContent(node, prefix) {
if (node.type === 'text') {
node.content = prefix + (node.content || '')
return true
}
if (node.children?.length) {
for (const child of node.children) {
if (prependTextContent(child, prefix)) return true
}
}
return false
}

const rules = [
{
shouldProcessNode: (node) => node.type === 'text',
Expand Down Expand Up @@ -78,16 +91,19 @@ const rules = [
if (!node.children.length) {
node.children.push({ ...emptyChild })
}
if (!node.children[0].children.length) {
node.children[0].children.push({ ...emptyChild, content: '' })
}

let prefix = ''
if (parent.name === 'ul') {
node.children[0].children[0].content = '• ' + node.children[0].children[0].content
prefix = '• '
} else if (parent.name === 'ol') {
const number = calculateListNumber(node, parent)
node.children[0].children[0].content =
`${number}. ` + node.children[0].children[0].content
prefix = `${number}. `
}

if (prefix) {
prependTextContent(node, prefix)
}

return h(
'View',
{ style: { marginLeft: '4pt' } },
Expand Down
16 changes: 15 additions & 1 deletion ...ests__/__snapshots__/single_activity_with_special_text_with_empty_lists_A3.spec.json.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,21 @@
},
{
"box": {},
"children": [],
"children": [
{
"box": {},
"children": [
{
"type": "TEXT_INSTANCE",
"value": "• ",
},
],
"parent": [Circular],
"props": {},
"style": {},
"type": "TEXT",
},
],
"parent": [Circular],
"props": {
"style": {
Expand Down
16 changes: 15 additions & 1 deletion ...ests__/__snapshots__/single_activity_with_special_text_with_empty_lists_A4.spec.json.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,21 @@
},
{
"box": {},
"children": [],
"children": [
{
"box": {},
"children": [
{
"type": "TEXT_INSTANCE",
"value": "• ",
},
],
"parent": [Circular],
"props": {},
"style": {},
"type": "TEXT",
},
],
"parent": [Circular],
"props": {
"style": {
Expand Down
16 changes: 15 additions & 1 deletion ...ests__/__snapshots__/single_activity_with_special_text_with_empty_lists_A5.spec.json.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,21 @@
},
{
"box": {},
"children": [],
"children": [
{
"box": {},
"children": [
{
"type": "TEXT_INSTANCE",
"value": "• ",
},
],
"parent": [Circular],
"props": {},
"style": {},
"type": "TEXT",
},
],
"parent": [Circular],
"props": {
"style": {
Expand Down
Loading