Skip to content

Build your personal knowledge base with Trilium Notes

fix(mobile): ignore a long press on a checklist checkbox

Elian Doraned3a0abcabb2
diff --git a/apps/client/src/widgets/type_widgets/text/utils.spec.ts b/apps/client/src/widgets/type_widgets/text/utils.spec.ts
index eac765e9b0..b659d8a6c8 100644
--- a/apps/client/src/widgets/type_widgets/text/utils.spec.ts
+++ b/apps/client/src/widgets/type_widgets/text/utils.spec.ts
@@ -639,7 +639,7 @@ describe("setupTodoCheckboxTaps", () => {
expect(document.activeElement).not.toBe(editable);
});
- it("leaves taps away from a checkbox and drags alone", () => {
+ it("leaves taps away from a checkbox, drags and long presses alone", () => {
const [ first ] = checkboxes();
const text = container.querySelector("li");
expect(text).not.toBeNull();
@@ -654,5 +654,11 @@ describe("setupTodoCheckboxTaps", () => {
touch(first, "touchmove", 23, 140);
touch(first, "touchend", 23, 140);
expect(first.checked).toBe(false);
+
+ // A long press.
+ touch(first, "touchstart", 23, 108);
+ first.dispatchEvent(new MouseEvent("contextmenu", { bubbles: true }));
+ touch(first, "touchend", 23, 108);
+ expect(first.checked).toBe(false);
});
});
diff --git a/apps/client/src/widgets/type_widgets/text/utils.ts b/apps/client/src/widgets/type_widgets/text/utils.ts
index c393f5bbc3..86b478ce01 100644
--- a/apps/client/src/widgets/type_widgets/text/utils.ts
+++ b/apps/client/src/widgets/type_widgets/text/utils.ts
@@ -387,6 +387,11 @@ export function setupTodoCheckboxTaps(container: HTMLElement) {
}
};
+ // A long press is no tap.
+ const onContextMenu = () => {
+ tapped = null;
+ };
+
const onTouchEnd = (e: TouchEvent) => {
if (!tapped) return;
const checkbox = tapped;
@@ -407,10 +412,12 @@ export function setupTodoCheckboxTaps(container: HTMLElement) {
container.addEventListener("touchstart", onTouchStart, { passive: false });
container.addEventListener("touchmove", onTouchMove, { passive: true });
container.addEventListener("touchend", onTouchEnd, { passive: false });
+ container.addEventListener("contextmenu", onContextMenu);
return () => {
container.removeEventListener("touchstart", onTouchStart);
container.removeEventListener("touchmove", onTouchMove);
container.removeEventListener("touchend", onTouchEnd);
+ container.removeEventListener("contextmenu", onContextMenu);
};
}
diff --git a/packages/ckeditor5/src/plugins/context_toolbar.spec.ts b/packages/ckeditor5/src/plugins/context_toolbar.spec.ts
index 1dcf301671..f86479523c 100644
--- a/packages/ckeditor5/src/plugins/context_toolbar.spec.ts
+++ b/packages/ckeditor5/src/plugins/context_toolbar.spec.ts
@@ -14,6 +14,7 @@ import ImagePosition from "./image_position.js";
import LinkEmbedToolbar from "./link_embed/link_embed_toolbar.js";
import MobileToolbarItems from "./mobile_toolbar_items.js";
import { getActiveTaskStates } from "./todo_list_multistate/todo_list_multistate_editing.js";
+import TodoListMultistateToolbar from "./todo_list_multistate/todo_list_multistate_toolbar.js";
import TodoListMultistateUI from "./todo_list_multistate/todo_list_multistate_ui.js";
import ToolbarGroupMenu, { type ToolbarGroupMenuRequest } from "./toolbar_group_menu.js";
@@ -291,6 +292,34 @@ describe("ContextToolbar", () => {
expect(editTaskStates).toHaveBeenCalledOnce();
});
+ it("keeps the balloon of task states closed on a long press of a checkbox", async () => {
+ const editor = await createTestEditor([Essentials, Paragraph, List, ListProperties, TodoListMultistateToolbar, MobileToolbarItems, ContextToolbar], {
+ toolbar: ["contextToolbar"],
+ listToolbar: ["listTypeMenu"]
+ });
+ const plugin = editor.plugins.get(ContextToolbar);
+ setModelData(editor.model, "<paragraph>[]Intro</paragraph>"
+ + "<paragraph listIndent=\"0\" listItemId=\"a\" listType=\"todo\">a</paragraph>"
+ + "<paragraph listIndent=\"0\" listItemId=\"b\" listType=\"todo\">b</paragraph>");
+ const checkboxes = editor.editing.view.getDomRoot()
+ ?.querySelectorAll<HTMLInputElement>(".todo-list__label input[type=\"checkbox\"]");
+ const checkbox = checkboxes?.[1];
+ expect(checkbox).toBeDefined();
+ if (!checkbox) return;
+
+ const onText = new MouseEvent("contextmenu", { bubbles: true, cancelable: true });
+ editor.editing.view.getDomRoot()?.querySelector("p")?.dispatchEvent(onText);
+ expect([onText.defaultPrevented, plugin.isActive]).toStrictEqual([false, false]);
+
+ const event = new MouseEvent("contextmenu", { bubbles: true, cancelable: true });
+ checkbox.dispatchEvent(event);
+ expect(event.defaultPrevented).toBe(true);
+ expect(editor.plugins.get(ContextualBalloon).visibleView).toBeNull();
+ expect(plugin.isActive).toBe(false);
+ expect(editor.model.document.selection.getFirstPosition()?.parent)
+ .toBe(editor.model.document.getRoot()?.getChild(0));
+ });
+
describe("for a link", () => {
async function createLinkEditor(toolbar = ["undo", "contextToolbar"], decorators = {}) {
const editor = await createTestEditor([Essentials, Paragraph, Link, ContextToolbar], {
diff --git a/packages/ckeditor5/src/plugins/context_toolbar.ts b/packages/ckeditor5/src/plugins/context_toolbar.ts
index dfa80cad29..347ec97429 100644
--- a/packages/ckeditor5/src/plugins/context_toolbar.ts
+++ b/packages/ckeditor5/src/plugins/context_toolbar.ts
@@ -144,6 +144,16 @@ export default class ContextToolbar extends Plugin {
});
}
+ // The row of a to-do list holds the task states, so a long press of a checkbox opens neither
+ // the balloon of `TodoListMultistateToolbar` nor the browser's menu.
+ this.listenTo(editor.editing.view.document, "contextmenu", (evt, data: { target: ViewNode; preventDefault(): void }) => {
+ const target = data.target;
+ if (target.is("element", "input") && target.findAncestor({ classes: "todo-list__label" })) {
+ data.preventDefault();
+ evt.stop();
+ }
+ }, { priority: "high" });
+
// A list command runs as a list is started from the block type menu or by autoformat. Ahead
// of the command, whose change renders and so updates the UI before it returns.
for (const name of LIST_COMMANDS) {