Takes the flat module count from 66 to 42, continuing what admin/ and
calendar/ started.
lib/mailbox/ archiveDate, emptyFolder, folderMove, labelTree,
mailboxName, mailboxRoute
lib/sieve/ sieve, sieveApply, sieveFolders
lib/input/ keyboard, swipe, touch, listSelection, dropUpload
lib/notify/ notify, webpush, webpushEnable
lib/sw/ swCache, swFacts, staleBuild
lib/text/ html, markdown, text, emlName
FOUR THINGS THE FILENAMES GET WRONG, each checked by reading the file
rather than trusting what it is called:
- appFolder is not a mailbox. It is the `ihasmail` folder in JMAP
*Files*, where the client keeps signature images and synced settings.
It stays flat.
- format holds no formatting of text. It re-exports the date and clock
formatters, so it belongs with dates/datetime, not with text/.
- preview is the file viewer deciding what it can show without
downloading, and source is where to point someone asking for this
instance's AGPL source. Neither is about text.
- notify is not Web Push. It is the tab title, the favicon badge and
the new-mail sound -- in-app notification, which is why it sits with
webpush rather than under sw/ with the service worker's own concerns.
threadScroll stays flat too: it decides where a conversation opens, which
is view state rather than a gesture, and input/ is honest only if
everything in it interprets something the reader did.
No behavior change. Almost every reference was on the @/ alias; eight
relative imports in files that did not move, or that moved away from a
sibling, needed rewriting by hand.
95 lines
3.1 KiB
TypeScript
95 lines
3.1 KiB
TypeScript
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
import { isTextEntry, keyboard } from "@/lib/input/keyboard";
|
|
|
|
/*
|
|
* Shortcuts after a click on a checkbox (#260).
|
|
*
|
|
* The guard that stops "a" archiving while you are typing into the search box
|
|
* tested `tagName === "INPUT"`, which is also true of a checkbox. A checkbox
|
|
* keeps focus after a click, so ticking "select all" disabled every shortcut
|
|
* until the reader clicked somewhere else — and nothing about a checkbox
|
|
* swallows a keystroke in the first place.
|
|
*/
|
|
|
|
const pressFrom = (el: Element, key: string) => {
|
|
const e = new KeyboardEvent("keydown", { key, bubbles: true, cancelable: true });
|
|
el.dispatchEvent(e);
|
|
return e;
|
|
};
|
|
|
|
let pop: (() => void) | null = null;
|
|
afterEach(() => {
|
|
pop?.();
|
|
pop = null;
|
|
document.body.innerHTML = "";
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
describe("isTextEntry", () => {
|
|
const input = (type?: string) => {
|
|
const el = document.createElement("input");
|
|
if (type) el.setAttribute("type", type);
|
|
return el;
|
|
};
|
|
|
|
it("is false for the inputs you cannot type into", () => {
|
|
for (const type of ["checkbox", "radio", "button", "submit", "reset", "file", "color", "range"]) {
|
|
expect(isTextEntry(input(type)), type).toBe(false);
|
|
}
|
|
});
|
|
|
|
it("is true for the ones you can", () => {
|
|
for (const type of ["text", "search", "email", "url", "tel", "password", "number", "date", "time"]) {
|
|
expect(isTextEntry(input(type)), type).toBe(true);
|
|
}
|
|
});
|
|
|
|
it("treats an input with no type as text, which is what the browser does", () => {
|
|
expect(isTextEntry(input())).toBe(true);
|
|
});
|
|
|
|
it("covers textarea, select and contenteditable", () => {
|
|
expect(isTextEntry(document.createElement("textarea"))).toBe(true);
|
|
// A select takes letters too: typing jumps to the matching option, and a
|
|
// shortcut would steal that.
|
|
expect(isTextEntry(document.createElement("select"))).toBe(true);
|
|
const div = document.createElement("div");
|
|
div.contentEditable = "true";
|
|
Object.defineProperty(div, "isContentEditable", { value: true });
|
|
expect(isTextEntry(div)).toBe(true);
|
|
});
|
|
|
|
it("is false for a button and for nothing at all", () => {
|
|
expect(isTextEntry(document.createElement("button"))).toBe(false);
|
|
expect(isTextEntry(null)).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe("shortcuts with a checkbox focused", () => {
|
|
it("still fire — the reported bug", () => {
|
|
const handler = vi.fn();
|
|
pop = keyboard.pushScope("test", [{ keys: "e", description: "Archive", group: "Mail", handler }]);
|
|
|
|
const box = document.createElement("input");
|
|
box.type = "checkbox";
|
|
document.body.appendChild(box);
|
|
box.focus();
|
|
|
|
pressFrom(box, "e");
|
|
expect(handler).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("still do not fire from a text field", () => {
|
|
const handler = vi.fn();
|
|
pop = keyboard.pushScope("test", [{ keys: "e", description: "Archive", group: "Mail", handler }]);
|
|
|
|
const field = document.createElement("input");
|
|
field.type = "search";
|
|
document.body.appendChild(field);
|
|
field.focus();
|
|
|
|
pressFrom(field, "e");
|
|
expect(handler).not.toHaveBeenCalled();
|
|
});
|
|
});
|