Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17757 from calixteman/bug1881219

Browse Source 
[Editor] Enable the thickness input when no editors are selected (bug 1881219)
This commit is contained in:
calixteman 2024-02-29 23:26:49 +01:00 committed by GitHub
commit 8f75e34b6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/display/editor/tools.js
View File

@ -1298,6 +1298,17 @@ class AnnotationEditorUIManager {
source: this,
details: Object.assign(this.#previousStates, details),
});
// We could listen on our own event but it sounds like a bit weird and
// it's a way to simpler to handle that stuff here instead of having to
// add something in every place where an editor can be unselected.
if (
this.#mode === AnnotationEditorType.HIGHLIGHT &&
details.hasSelectedEditor === false
) {
this.#dispatchUpdateUI([
[AnnotationEditorParamsType.HIGHLIGHT_FREE, true],
]);
}
}
}

63
test/integration/highlight_editor_spec.mjs
View File

@ -1266,4 +1266,67 @@ describe("Highlight Editor", () => {
);
});
});
describe("Thickness must be enabled when there's no selected highlights", () => {
let pages;
beforeAll(async () => {
pages = await loadAndWait("tracemonkey.pdf", ".annotationEditorLayer");
});
afterAll(async () => {
await closePages(pages);
});
it("must check the thickness input state", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await page.click("#editorHighlight");
await page.waitForSelector(".annotationEditorLayer.highlightEditing");
let rect = await getSpanRectFromText(page, 1, "Abstract");
await page.mouse.click(
rect.x + rect.width / 2,
rect.y + rect.height / 2,
{ count: 2, delay: 100 }
);
await page.waitForSelector(getEditorSelector(0));
rect = await page.$eval(".annotationEditorLayer", el => {
const { x, y } = el.getBoundingClientRect();
return { x, y };
});
const clickHandle = await waitForPointerUp(page);
await page.mouse.move(rect.x + 5, rect.y + 5);
await page.mouse.down();
await page.mouse.move(rect.x + 100, rect.y + 100);
await page.mouse.up();
await awaitPromise(clickHandle);
await page.waitForSelector(getEditorSelector(1));
await page.waitForSelector(
"#editorFreeHighlightThickness:not([disabled])"
);
await page.click(getEditorSelector(0));
await page.waitForSelector(getEditorSelector(0));
await page.waitForSelector("#editorFreeHighlightThickness[disabled]");
await page.click("#editorHighlight");
await page.waitForSelector(
".annotationEditorLayer:not(.highlightEditing)"
);
await page.click("#editorHighlight");
await page.waitForSelector(".annotationEditorLayer.highlightEditing");
await page.waitForSelector(
"#editorFreeHighlightThickness:not([disabled])"
);
})
);
});
});
});