Skip to content

fix: Image popover steals cursor focus #148

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.

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 19 additions & 14 deletions src/rich-text/node-views/image.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,9 @@ export class ImageView implements NodeView {
this.preventClose(event)
);
}
/**
* We want to trigger Stacks' showing and hiding of popovers whenever an image is considered
* "selected" by prosemirror. This can happen by mouse-clicking or arrowing through the editor
*/

selectNode(): void {
this.img.classList.add("bs-ring");
this.selectionActive = true;
// tell Stacks to hide the popover
this.img.dispatchEvent(new Event("image-popover-show"));

const inputFields = this.form.querySelectorAll("input");
if (inputFields.length > 0) {
inputFields[0].focus({
preventScroll: true,
});
}
}

deselectNode(): void {
Expand Down Expand Up @@ -87,6 +74,8 @@ export class ImageView implements NodeView {
if (node.attrs.alt) img.alt = node.attrs.alt as string;
if (node.attrs.title) img.title = node.attrs.title as string;

img.onclick = () => this.handleClick();

return img;
}

Expand Down Expand Up @@ -158,4 +147,20 @@ export class ImageView implements NodeView {
event.preventDefault();
}
}

/**
* We want to trigger Stacks' showing and hiding of popovers whenever an image is clicked
*/
private handleClick(): void {
this.selectionActive = true;
// tell Stacks to hide the popover
this.img.dispatchEvent(new Event("image-popover-show"));

const inputFields = this.form.querySelectorAll("input");
if (inputFields.length > 0) {
inputFields[0].focus({
preventScroll: true,
});
}
}
}
27 changes: 27 additions & 0 deletions test/rich-text/node-views/image.e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,31 @@ test.describe.serial("rich-text image nodeview", () => {
)
).toBe(false);
});

test("should not show image popover when navigating with left/right arrow keys", async () => {
await enterTextAsMarkdown(
page,
"![an image](https://localhost/some-image)"
);

// move over the image from the left side
await page.keyboard.press("ArrowRight");
await page.keyboard.press("ArrowRight");

expect(
await page.$eval(imagePopoverSelector, (el) =>
el.classList.contains("is-visible")
)
).toBe(false);

// move over the image from the right side
await page.keyboard.press("ArrowLeft");
await page.keyboard.press("ArrowLeft");

expect(
await page.$eval(imagePopoverSelector, (el) =>
el.classList.contains("is-visible")
)
).toBe(false);
});
});