Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pagedjs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Guillaume
pagedjs
Commits
8fc46699
Commit
8fc46699
authored
Jun 11, 2020
by
Fred Chasen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add forceBreak method for layout
parent
01ee33ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
6 deletions
+38
-6
README.md
README.md
+1
-1
layout.js
src/chunker/layout.js
+37
-5
No files found.
README.md
View file @
8fc46699
...
...
@@ -135,7 +135,7 @@ onContent(contentNode, declarationNode, ruleNode)
// Layout
layoutNode
(
node
)
renderNode
(
node
,
sourceNode
)
renderNode
(
node
,
sourceNode
,
layout
)
onOverflow
(
overflow
,
rendered
,
bounds
)
onBreakToken
(
breakToken
,
overflow
,
rendered
)
```
...
...
src/chunker/layout.js
View file @
8fc46699
...
...
@@ -54,6 +54,7 @@ class Layout {
this
.
settings
=
options
||
{};
this
.
maxChars
=
this
.
settings
.
maxChars
||
MAX_CHARS_PER_BREAK
;
this
.
forceRenderBreak
=
false
;
}
async
renderTo
(
wrapper
,
source
,
breakToken
,
bounds
=
this
.
bounds
)
{
...
...
@@ -112,7 +113,7 @@ class Layout {
newBreakToken
=
this
.
breakAt
(
node
);
}
if
(
newBreakToken
.
equals
(
prevBreakToken
))
{
if
(
newBreakToken
&&
newBreakToken
.
equals
(
prevBreakToken
))
{
console
.
warn
(
"
Unable to layout item:
"
,
node
);
return
undefined
;
}
...
...
@@ -139,6 +140,21 @@ class Layout {
walker
=
walk
(
nodeAfter
(
node
,
source
),
source
);
}
if
(
this
.
forceRenderBreak
)
{
this
.
hooks
&&
this
.
hooks
.
layout
.
trigger
(
wrapper
,
this
);
newBreakToken
=
this
.
findBreakToken
(
wrapper
,
source
,
bounds
,
prevBreakToken
);
if
(
!
newBreakToken
)
{
newBreakToken
=
this
.
breakAt
(
node
);
}
length
=
0
;
this
.
forceRenderBreak
=
false
;
break
;
}
// Only check x characters
if
(
length
>=
this
.
maxChars
)
{
...
...
@@ -167,10 +183,18 @@ class Layout {
}
breakAt
(
node
,
offset
=
0
)
{
return
new
BreakToken
(
let
newBreakToken
=
new
BreakToken
(
node
,
offset
);
let
breakHooks
=
this
.
hooks
.
onBreakToken
.
triggerSync
(
newBreakToken
,
undefined
,
node
,
this
);
breakHooks
.
forEach
((
newToken
)
=>
{
if
(
typeof
newToken
!=
"
undefined
"
)
{
newBreakToken
=
newToken
;
}
});
return
newBreakToken
;
}
shouldBreak
(
node
)
{
...
...
@@ -186,6 +210,10 @@ class Layout {
return
!
doubleBreakBefore
&&
needsBreakBefore
(
node
)
||
needsPreviousBreakAfter
(
node
)
||
needsPageBreak
(
node
);
}
forceBreak
()
{
this
.
forceRenderBreak
=
true
;
}
getStart
(
source
,
breakToken
)
{
let
start
;
let
node
=
breakToken
&&
breakToken
.
node
;
...
...
@@ -230,7 +258,7 @@ class Layout {
dest
.
appendChild
(
clone
);
}
let
nodeHooks
=
this
.
hooks
.
renderNode
.
triggerSync
(
clone
,
node
);
let
nodeHooks
=
this
.
hooks
.
renderNode
.
triggerSync
(
clone
,
node
,
this
);
nodeHooks
.
forEach
((
newNode
)
=>
{
if
(
typeof
newNode
!=
"
undefined
"
)
{
clone
=
newNode
;
...
...
@@ -301,7 +329,11 @@ class Layout {
if
(
!
renderedNode
)
{
// Find closest element with data-ref
renderedNode
=
findElement
(
prevValidNode
(
temp
),
rendered
);
let
prevNode
=
prevValidNode
(
temp
);
if
(
!
isElement
(
prevNode
))
{
prevNode
=
prevNode
.
parentElement
;
}
renderedNode
=
findElement
(
prevNode
,
rendered
);
// Check if temp is the last rendered node at its level.
if
(
!
temp
.
nextSibling
)
{
// We need to ensure that the previous sibling of temp is fully rendered.
...
...
@@ -394,7 +426,7 @@ class Layout {
});
// Stop removal if we are in a loop
if
(
breakToken
.
equals
(
prevBreakToken
))
{
if
(
breakToken
&&
breakToken
.
equals
(
prevBreakToken
))
{
return
breakToken
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment