Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-07-04 22:25:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21514 from nicolo-ribaudo/remove-selection-conflict-chrome

Browse Source 
Avoid text selection workaround in modern Chromium
This commit is contained in:
Tim van der Meij 2026-07-03 20:10:28 +02:00 committed by GitHub
commit 70c52132af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/text_layer_spec.mjs
View File

@ -757,7 +757,7 @@ describe("Text layer", () => {
.withContext(`In ${browserName}`)
.toHaveRoughlySelected(
"rs as the railway projects under\n" +
"development enter the construction phase (estimated at"
"development enter the construction phase (estimated a"
);
})
);
@ -801,7 +801,7 @@ describe("Text layer", () => {
.withContext(`In ${browserName}`)
.toHaveRoughlySelected(
"quarters as the railway projects under\n" +
"development enter the construction phase (estimated at around"
"development enter the construction phase (estimated at"
);
})
);

44
web/text_layer_builder.js
View File

@ -264,7 +264,7 @@ class TextLayerBuilder {
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
// eslint-disable-next-line no-var
var isFirefox, prevRange;
var isFirefoxOrModernChromium, prevRange;
}
document.addEventListener(
@ -304,22 +304,38 @@ class TextLayerBuilder {
if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
return;
}
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("CHROME")) {
isFirefox ??=
getComputedStyle(
this.#textLayers.values().next().value
).getPropertyValue("-moz-user-select") === "none";
if (isFirefoxOrModernChromium === undefined) {
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("CHROME")) {
isFirefoxOrModernChromium =
getComputedStyle(
this.#textLayers.values().next().value
).getPropertyValue("-moz-user-select") === "none";
}
if (
(typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME")) ||
!isFirefoxOrModernChromium
) {
// navigator.userAgentData is only available in secure contexts
const chromiumVersion = navigator.userAgentData
? navigator.userAgentData.brands.find(
({ brand }) => brand === "Chromium"
)?.version
: /\bChrome\/(\d+)\b/.exec(navigator.userAgent)?.[1];
if (isFirefox) {
return;
isFirefoxOrModernChromium =
!!chromiumVersion && parseInt(chromiumVersion, 10) >= 148;
}
}
// In non-Firefox browsers, when hovering over an empty space (thus,
// on .endOfContent), the selection will expand to cover all the
// text between the current selection and .endOfContent. By moving
// .endOfContent to right after (or before, depending on which side
// of the selection the user is moving), we limit the selection jump
// to at most cover the enteirety of the <span> where the selection
if (isFirefoxOrModernChromium) {
return;
}
// In browsers other than Firefox or Chromium 148+, when hovering over
// an empty space (thus, on .endOfContent), the selection will expand to
// cover all the text between the current selection and .endOfContent.
// By moving .endOfContent to right after (or before, depending on which
// side of the selection the user is moving), we limit the selection
// jump to at most cover the entirety of the <span> where the selection
// is being modified.
const range = selection.getRangeAt(0);
const modifyStart =