Skip to content

Commit

Permalink
[Editor] Change the arrow direction when the dropdown is visible in t…
Browse files Browse the repository at this point in the history
…he color picker (bug 1875357)

and hide the dropdown when the user click outside of the color picker.
  • Loading branch information
calixteman committed Jan 19, 2024
1 parent 1cdbcfe commit a1bf125
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 3 deletions.
15 changes: 12 additions & 3 deletions src/display/editor/color_picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import { noContextMenu } from "../display_utils.js";
class ColorPicker {
#boundKeyDown = this.#keyDown.bind(this);

#boundPointerDown = this.#pointerDown.bind(this);

#button = null;

#buttonSwatch = null;
Expand Down Expand Up @@ -177,18 +179,25 @@ class ColorPicker {
}
this.#button.addEventListener("keydown", this.#boundKeyDown);
this.#dropdownWasFromKeyboard = event.detail === 0;
window.addEventListener("pointerdown", this.#boundPointerDown);
if (this.#dropdown) {
this.#dropdown.classList.remove("hidden");
return;
}
const root = (this.#dropdown = this.#getDropdownRoot(
AnnotationEditorParamsType.HIGHLIGHT_COLOR
));
const root = (this.#dropdown = this.#getDropdownRoot());
this.#button.append(root);
}

#pointerDown(event) {
if (this.#dropdown?.contains(event.target)) {
return;
}
this.hideDropdown();
}

hideDropdown() {
this.#dropdown?.classList.add("hidden");
window.removeEventListener("pointerdown", this.#boundPointerDown);
}

_hideDropdownFromKeyboard() {
Expand Down
42 changes: 42 additions & 0 deletions test/integration/highlight_editor_spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -488,4 +488,46 @@ describe("Highlight Editor", () => {
);
});
});

describe("Color picker and click outside", () => {
let pages;

beforeAll(async () => {
pages = await loadAndWait("tracemonkey.pdf", ".annotationEditorLayer");
});

afterAll(async () => {
await closePages(pages);
});

it("must check that the dropdown is hidden", async () => {
await Promise.all(
pages.map(async ([browserName, page]) => {
await page.click("#editorHighlight");
await page.waitForSelector(".annotationEditorLayer.highlightEditing");
const sel = getEditorSelector(0);

const rect = await getSpanRectFromText(page, 1, "Abstract");
const x = rect.x + rect.width / 2;
const y = rect.y + rect.height / 2;
await page.mouse.click(x, y, { count: 2 });

await page.waitForSelector(sel);
await page.waitForSelector(
`.page[data-page-number = "1"] svg.highlightOutline.selected`
);

await page.waitForSelector(`${sel} .editToolbar button.colorPicker`);
await page.click(`${sel} .editToolbar button.colorPicker`);
await page.waitForSelector(
`${sel} .editToolbar button[title = "Red"]`
);
await page.mouse.click(x, y - rect.height);
await page.waitForSelector(
`${sel} .editToolbar button.colorPicker .dropdown.hidden`
);
})
);
});
});
});
4 changes: 4 additions & 0 deletions web/annotation_editor_layer_builder.css
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,10 @@

&:has(.dropdown:not(.hidden)) {
background-color: var(--editor-toolbar-hover-bg-color);

&::after {
scale: -1;
}
}

.dropdown {
Expand Down

0 comments on commit a1bf125

Please sign in to comment.