Skip to content

Do not add pages dynamically unless autoPaging is enabled #3915

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

Merged
merged 1 commit into from
Oct 28, 2025
Merged

Do not add pages dynamically unless autoPaging is enabled #3915

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
103 changes: 53 additions & 50 deletions src/modules/context2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,18 +1653,19 @@ import {
sheight * factorY
)
);
var pageArray = getPagesByPath.call(this, xRect);
var pages = [];
for (var ii = 0; ii < pageArray.length; ii += 1) {
if (pages.indexOf(pageArray[ii]) === -1) {
pages.push(pageArray[ii]);

if (this.autoPaging) {
var pageArray = getPagesByPath.call(this, xRect);
var pages = [];
for (var ii = 0; ii < pageArray.length; ii += 1) {
if (pages.indexOf(pageArray[ii]) === -1) {
pages.push(pageArray[ii]);
}
}
}

sortPages(pages);
sortPages(pages);

var clipPath;
if (this.autoPaging) {
var clipPath;
var min = pages[0];
var max = pages[pages.length - 1];
for (var i = min; i < max + 1; i++) {
Expand Down Expand Up @@ -1870,32 +1871,32 @@ import {
var lineWidth = Math.abs(oldLineWidth * this.ctx.transform.scaleX);
var lineJoin = this.lineJoin;

var origPath = JSON.parse(JSON.stringify(this.path));
var xPath = JSON.parse(JSON.stringify(this.path));
var clipPath;
var tmpPath;
var pages = [];

for (var i = 0; i < xPath.length; i++) {
if (typeof xPath[i].x !== "undefined") {
var page = getPagesByPath.call(this, xPath[i]);

for (var ii = 0; ii < page.length; ii += 1) {
if (pages.indexOf(page[ii]) === -1) {
pages.push(page[ii]);
if (this.autoPaging) {
var origPath = JSON.parse(JSON.stringify(this.path));
var xPath = JSON.parse(JSON.stringify(this.path));
var clipPath;
var tmpPath;
var pages = [];

for (var i = 0; i < xPath.length; i++) {
if (typeof xPath[i].x !== "undefined") {
var page = getPagesByPath.call(this, xPath[i]);

for (var ii = 0; ii < page.length; ii += 1) {
if (pages.indexOf(page[ii]) === -1) {
pages.push(page[ii]);
}
}
}
}
}

for (var j = 0; j < pages.length; j++) {
while (this.pdf.internal.getNumberOfPages() < pages[j]) {
addPage.call(this);
for (var j = 0; j < pages.length; j++) {
while (this.pdf.internal.getNumberOfPages() < pages[j]) {
addPage.call(this);
}
}
}
sortPages(pages);
sortPages(pages);

if (this.autoPaging) {
var min = pages[0];
var max = pages[pages.length - 1];
for (var k = min; k < max + 1; k++) {
Expand Down Expand Up @@ -1959,12 +1960,12 @@ import {
}
this.lineWidth = oldLineWidth;
}
this.path = origPath;
} else {
this.lineWidth = lineWidth;
drawPaths.call(this, rule, isClip);
this.lineWidth = oldLineWidth;
}
this.path = origPath;
};

/**
Expand Down Expand Up @@ -2289,30 +2290,32 @@ import {
var yTop = yBottom - textDimensions.h;

var pt = this.ctx.transform.applyToPoint(new Point(options.x, yBaseLine));
var decomposedTransformationMatrix = this.ctx.transform.decompose();
var matrix = new Matrix();
matrix = matrix.multiply(decomposedTransformationMatrix.translate);
matrix = matrix.multiply(decomposedTransformationMatrix.skew);
matrix = matrix.multiply(decomposedTransformationMatrix.scale);

var baselineRect = this.ctx.transform.applyToRectangle(
new Rectangle(options.x, yBaseLine, textDimensions.w, textDimensions.h)
);
var textBounds = matrix.applyToRectangle(
new Rectangle(options.x, yTop, textDimensions.w, textDimensions.h)
);
var pageArray = getPagesByPath.call(this, textBounds);
var pages = [];
for (var ii = 0; ii < pageArray.length; ii += 1) {
if (pages.indexOf(pageArray[ii]) === -1) {
pages.push(pageArray[ii]);
var clipPath, oldSize, oldLineWidth;

if (this.autoPaging) {
var decomposedTransformationMatrix = this.ctx.transform.decompose();
var matrix = new Matrix();
matrix = matrix.multiply(decomposedTransformationMatrix.translate);
matrix = matrix.multiply(decomposedTransformationMatrix.skew);
matrix = matrix.multiply(decomposedTransformationMatrix.scale);

var baselineRect = this.ctx.transform.applyToRectangle(
new Rectangle(options.x, yBaseLine, textDimensions.w, textDimensions.h)
);
var textBounds = matrix.applyToRectangle(
new Rectangle(options.x, yTop, textDimensions.w, textDimensions.h)
);
var pageArray = getPagesByPath.call(this, textBounds);
var pages = [];
for (var ii = 0; ii < pageArray.length; ii += 1) {
if (pages.indexOf(pageArray[ii]) === -1) {
pages.push(pageArray[ii]);
}
}
}

sortPages(pages);
sortPages(pages);

var clipPath, oldSize, oldLineWidth;
if (this.autoPaging) {
var min = pages[0];
var max = pages[pages.length - 1];
for (var i = min; i < max + 1; i++) {
Expand Down