X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/7b57440781029bab8be76950847e36e7a2303cf6..997d8d55032aba314fa674c19ce25463af30c972:/vopamoi.ts diff --git a/vopamoi.ts b/vopamoi.ts index 151a9e4..5f759d0 100644 --- a/vopamoi.ts +++ b/vopamoi.ts @@ -13,31 +13,77 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER return at === -1 ? [str] : [str.substring(0, at)].concat(splitN(str.substring(at + delimiter.length), delimiter, limit - 1)); } +// A clock that never goes backwards; monotonic. +function Clock() { + var previousNow = Date.now(); + return { + now: function (): number { + const now = Date.now(); + if (now > previousNow) { + previousNow = now; + return now; + } + return ++previousNow; + }, + }; +} +const clock = Clock(); + +// Returns a promise for a hue based on a hash of the string +function hashHue(str: string) { + // Using crypto for this is overkill + return crypto.subtle.digest("SHA-256", new TextEncoder().encode(str)).then((buf) => (new Uint16Array(buf)[0] * 360) / 2 ** 16); +} + const Model = { addTask: function (timestamp: string, description: string): Element { const task = document.createElement("div"); - task.appendChild(document.createTextNode(description)); - task.setAttribute("class", "task"); + const desc = document.createElement("span"); + desc.textContent = description; + desc.classList.add("desc"); + task.appendChild(desc); + task.classList.add("task"); task.setAttribute("tabindex", "0"); task.setAttribute("data-created", timestamp); - document.getElementById("tasks")!.appendChild(task); + task.setAttribute("data-state", "todo"); + const tasks = document.getElementById("tasks")!; + tasks.insertBefore(task, tasks.firstElementChild); return task; }, + addTag: function (createTimestamp: string, tagName: string): Element | null { + const task = this.getTask(createTimestamp); + if (!task) return null; + const existingTag = this.hasTag(task, tagName); + if (existingTag) return existingTag; + const tag = document.createElement("span"); + tag.appendChild(document.createTextNode(tagName)); + tag.classList.add("tag"); + tag.setAttribute("tabindex", "0"); + hashHue(tagName).then((hue) => (tag.style.backgroundColor = `hsl(${hue},90%,45%)`)); + for (const child of task.getElementsByClassName("tag")) { + if (tagName > child.textContent!) { + task.insertBefore(tag, child); + return tag; + } + } + task.insertBefore(tag, task.getElementsByClassName("desc")[0]!); + return tag; + }, + edit: function (createTimestamp: string, newDescription: string): Element | null { const target = this.getTask(createTimestamp); if (!target) return null; if (target.hasAttribute("data-description")) { // Oh no: An edit has arrived from a replica while a local edit is in progress. - const input = target.children[0] as HTMLInputElement; + const input = target.getElementsByTagName("input")[0]!; if ( input.value === target.getAttribute("data-description") && - input.selectionStart === 0 && + input.selectionStart === input.value.length && input.selectionEnd === input.value.length ) { // No local changes have actually been made yet. Change the contents of the edit box! input.value = newDescription; - input.select(); } else { // No great options. // Prefer not to interrupt the local user's edit. @@ -45,11 +91,20 @@ const Model = { target.setAttribute("data-description", newDescription); } } else { - target.textContent = newDescription; + target.getElementsByClassName("desc")[0].textContent = newDescription; } return target; }, + hasTag: function (task: Element, tag: string): Element | null { + for (const child of task.getElementsByClassName("tag")) { + if (child.textContent === tag) { + return child; + } + } + return null; + }, + getPriority: function (task: Element): number { if (task.hasAttribute("data-priority")) { return parseFloat(task.getAttribute("data-priority")!); @@ -57,10 +112,6 @@ const Model = { return parseFloat(task.getAttribute("data-created")!); }, - getState: function (task: Element): string { - return task.getAttribute("data-state") ?? "todo"; - }, - getTask: function (createTimestamp: string) { for (const task of document.getElementsByClassName("task")) { if (task.getAttribute("data-created") === createTimestamp) { @@ -69,28 +120,50 @@ const Model = { } }, + insertInPriorityOrder: function (task: Element, dest: Element) { + const priority = this.getPriority(task); + for (const t of dest.children) { + if (t !== task && this.getPriority(t) < priority) { + dest.insertBefore(task, t); + return; + } + } + dest.appendChild(task); + }, + + removeTag: function (createTimestamp: string, tagName: string) { + const task = this.getTask(createTimestamp); + if (!task) return null; + const tag = this.hasTag(task, tagName); + if (!tag) return; + task.removeChild(tag); + if (task instanceof HTMLElement) task.focus(); + }, + setPriority: function (createTimestamp: string, priority: number): Element | null { const target = this.getTask(createTimestamp); if (!target) return null; target.setAttribute("data-priority", `${priority}`); - for (const task of document.getElementsByClassName("task")) { - if (task !== target && this.getPriority(task) > priority) { - task.parentElement!.insertBefore(target, task); - return target; - } - } - document.getElementById("tasks")!.appendChild(target); + this.insertInPriorityOrder(target, target.parentElement!); return target; }, setState: function (stateTimestamp: string, createTimestamp: string, state: string) { const task = this.getTask(createTimestamp); - if (task) { - task.setAttribute("data-state", state); - if (task instanceof HTMLElement) { - task.style.display = state == "todo" ? "block" : "none"; // Until view filtering - } + if (!task) return; + task.setAttribute("data-state", state); + var date = task.getElementsByClassName("statedate")[0]; + if (state === "todo") { + task.removeChild(date); + return; + } + if (!date) { + date = document.createElement("span"); + date.classList.add("statedate"); + task.insertBefore(date, task.firstChild); } + const d = new Date(parseInt(stateTimestamp)); + date.textContent = `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, "0")}-${`${d.getDate()}`.padStart(2, "0")}`; }, }; @@ -106,13 +179,21 @@ function Log(prefix: string = "vp-") { const [createTimestamp, description] = splitN(data, " ", 1); return Model.edit(createTimestamp, description); } + if (command == "Priority") { + const [createTimestamp, newPriority] = splitN(data, " ", 1); + return Model.setPriority(createTimestamp, parseFloat(newPriority)); + } if (command == "State") { const [createTimestamp, state] = splitN(data, " ", 1); return Model.setState(timestamp, createTimestamp, state); } - if (command == "Priority") { - const [createTimestamp, newPriority] = splitN(data, " ", 1); - return Model.setPriority(createTimestamp, parseFloat(newPriority)); + if (command == "Tag") { + const [createTimestamp, tag] = splitN(data, " ", 1); + return Model.addTag(createTimestamp, tag); + } + if (command == "Untag") { + const [createTimestamp, tag] = splitN(data, " ", 1); + return Model.removeTag(createTimestamp, tag); } }, @@ -139,186 +220,490 @@ function Log(prefix: string = "vp-") { } const log = Log(); -const undoLog: string[] = []; +function UI() { + const undoLog: string[][] = []; + const redoLog: string[][] = []; + function perform(forward: string, reverse: string) { + undoLog.push([reverse, forward]); + return log.recordAndApply(`${clock.now()} ${forward}`); + } + return { + addTask: function (description: string): Element { + const now = clock.now(); + undoLog.push([`State ${now} deleted`, `State ${now} todo`]); + return log.recordAndApply(`${now} Create ${description}`); + }, + addTag: function (createTimestamp: string, tag: string) { + return perform(`Tag ${createTimestamp} ${tag}`, `Untag ${createTimestamp} ${tag}`); + }, + edit: function (createTimestamp: string, newDescription: string, oldDescription: string) { + return perform(`Edit ${createTimestamp} ${newDescription}`, `Edit ${createTimestamp} ${oldDescription}`); + }, + removeTag: function (createTimestamp: string, tag: string) { + return perform(`Untag ${createTimestamp} ${tag}`, `Tag ${createTimestamp} ${tag}`); + }, + setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) { + return perform(`Priority ${createTimestamp} ${newPriority}`, `Priority ${createTimestamp} ${oldPriority}`); + }, + setState: function (createTimestamp: string, newState: string, oldState: string) { + return perform(`State ${createTimestamp} ${newState}`, `State ${createTimestamp} ${oldState}`); + }, + undo: function () { + const entry = undoLog.pop(); + if (entry) { + redoLog.push(entry); + return log.recordAndApply(`${clock.now()} ${entry[0]}`); + } + }, + redo: function () { + const entry = redoLog.pop(); + if (entry) { + undoLog.push(entry); + return log.recordAndApply(`${clock.now()} ${entry[1]}`); + } + }, + }; +} +const ui = UI(); -const UI = { - addTask: function (description: string): Element { - const now = Date.now(); - undoLog.push(`State ${now} deleted`); - return log.recordAndApply(`${now} Create ${description}`); - }, - edit: function (createTimestamp: string, newDescription: string, oldDescription: string) { - undoLog.push(`Edit ${createTimestamp} ${oldDescription}`); - return log.recordAndApply(`${Date.now()} Edit ${createTimestamp} ${newDescription}`); - }, - setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) { - undoLog.push(`Priority ${createTimestamp} ${oldPriority}`); - return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`); - }, - setState: function (createTimestamp: string, newState: string, oldState: string) { - undoLog.push(`State ${createTimestamp} ${oldState}`); - return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${newState}`); - }, - undo: function () { - if (undoLog.length > 0) { - return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`); - } - }, -}; +enum CommitOrAbort { + Commit, + Abort, +} -const BrowserUI = { - addTask: function (event: KeyboardEvent) { - const input = document.getElementById("taskName"); - if (input.value) { - const task = UI.addTask(input.value); - if (task && task instanceof HTMLElement) task.focus(); +function BrowserUI() { + const viewColors: { [key: string]: string } = { + all: "Gold", + cancelled: "Red", + deleted: "Black", + done: "LawnGreen", + "someday-maybe": "DeepSkyBlue", + todo: "White", + waiting: "MediumOrchid", + }; + var currentTagView: string | null = null; + var currentViewState = "todo"; + var taskFocusedBeforeJumpingToInput: HTMLElement | null = null; + var lastTagNameEntered = ""; + return { + addTask: function (event: KeyboardEvent) { + const input = document.getElementById("taskName"); + if (input.value.match(/^ *$/)) return; + const task = ui.addTask(input.value); + if (currentViewState === "todo" || currentViewState === "all") { + task instanceof HTMLElement && task.focus(); + } else if (this.returnFocusAfterInput()) { + } else { + this.firstVisibleTask()?.focus(); + } input.value = ""; if (event.getModifierState("Control")) { - this.setPriority(task, null, document.getElementsByClassName("task")[0]); + this.makeBottomPriority(task); } - } - }, + }, - beginEdit: function (event: Event) { - const task = document.activeElement; - if (!task) return; - const input = document.createElement("input"); - const oldDescription = task.textContent!; - task.setAttribute("data-description", oldDescription); - input.value = oldDescription; - input.addEventListener("blur", BrowserUI.completeEdit, { once: true }); - task.textContent = ""; - task.appendChild(input); - input.focus(); - input.select(); - event.preventDefault(); - }, + beginEdit: function (event: Event) { + const task = this.currentTask(); + if (!task) return; + const input = document.createElement("input"); + const desc = task.getElementsByClassName("desc")[0]; + const oldDescription = desc.textContent!; + task.setAttribute("data-description", oldDescription); + input.value = oldDescription; + input.addEventListener("blur", this.completeEdit, { once: true }); + desc.textContent = ""; + task.insertBefore(input, task.firstChild); + input.focus(); + event.preventDefault(); + }, - completeEdit: function (event: Event) { - const input = event.target as HTMLInputElement; - const task = input.parentElement!; - const oldDescription = task.getAttribute("data-description")!; - const newDescription = input.value; - task.removeChild(task.children[0]); - task.removeAttribute("data-description"); - task.focus(); - if (newDescription === oldDescription) { - task.textContent = oldDescription; - } else { - UI.edit(task.getAttribute("data-created")!, newDescription, oldDescription); - } - }, + beginTagEdit: function (event: Event) { + const task = this.currentTask(); + if (!task) return; + const input = document.createElement("input"); + input.classList.add("tag"); + input.addEventListener("blur", this.completeTagEdit, { once: true }); + input.value = lastTagNameEntered; + task.appendChild(input); + input.focus(); + input.select(); + event.preventDefault(); + }, - firstVisibleTask: function () { - for (const task of document.getElementsByClassName("task")) { - if (task instanceof HTMLElement && task.style.display !== "none") { - return task; + completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { + const input = event.target as HTMLInputElement; + const task = input.parentElement!; + const desc = task.getElementsByClassName("desc")[0]; + const oldDescription = task.getAttribute("data-description")!; + const newDescription = input.value; + input.removeEventListener("blur", this.completeEdit); + task.removeChild(input); + task.removeAttribute("data-description"); + task.focus(); + if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) { + desc.textContent = oldDescription; + } else { + ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription); } - } - }, + }, - focusTaskNameInput: function (event: Event) { - document.getElementById("taskName")!.focus(); - event.preventDefault(); - }, + completeTagEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) { + const input = event.target as HTMLInputElement; + const task = input.parentElement!; + const newTagName = input.value; + input.removeEventListener("blur", this.completeTagEdit); + task.removeChild(input); + task.focus(); + if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) { + ui.addTag(task.getAttribute("data-created")!, newTagName); + lastTagNameEntered = newTagName; + } + }, - visibleTaskAtOffset(task: Element, offset: number): Element { - var cursor: Element | null = task; - var valid_cursor = cursor; - const increment = offset / Math.abs(offset); - while (true) { - cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling; - if (!cursor || !(cursor instanceof HTMLElement)) break; - if (cursor.style.display !== "none") { - offset -= increment; - valid_cursor = cursor; - } - if (Math.abs(offset) < 0.5) break; - } - return valid_cursor; - }, + currentTag: function (): Element | null { + var target = document.activeElement; + if (!target) return null; + if (target.classList.contains("task")) { + const tags = target.getElementsByClassName("tag"); + target = tags[tags.length - 1]; + } + if (!target || !target.classList.contains("tag")) return null; + return target; + }, - moveCursor: function (offset: number): boolean { - const active = document.activeElement; - if (!active) return false; - const dest = this.visibleTaskAtOffset(active, offset); - if (dest !== active && dest instanceof HTMLElement) { - dest.focus(); - return true; - } - return false; - }, + currentTask: function (): HTMLElement | null { + var target = document.activeElement; + if (!target) return null; + if (target.classList.contains("tag")) target = target.parentElement!; + return target as HTMLElement; + }, - moveTask: function (offset: number) { - const active = document.activeElement; - if (!active) return; - const dest = this.visibleTaskAtOffset(active, offset); - if (dest === active) return; // Already extremal - var onePastDest: Element | null = this.visibleTaskAtOffset(dest, offset / Math.abs(offset)); - if (onePastDest == dest) onePastDest = null; // Will become extremal - if (offset > 0) { - this.setPriority(active, dest, onePastDest); - } else { - this.setPriority(active, onePastDest, dest); - } - }, + firstVisibleTask: function () { + for (const task of document.getElementsByClassName("task")) { + const state = task.getAttribute("data-state"); + if ( + task instanceof HTMLElement && + (state === currentViewState || (currentViewState === "all" && state !== "deleted")) && + !task.classList.contains("hide") + ) { + return task; + } + } + }, - // Change task's priority to be between other tasks a and b. - setPriority: function (task: Element, a: Element | null, b: Element | null) { - const aPriority = a === null ? 0 : Model.getPriority(a); - const bPriority = b === null ? Date.now() : Model.getPriority(b); - console.assert(aPriority < bPriority, aPriority, "<", bPriority); - const span = bPriority - aPriority; - const newPriority = aPriority + 0.1 * span + 0.8 * span * Math.random(); - console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority); - const newPriorityRounded = Math.round(newPriority); - const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority; - UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task)); - task instanceof HTMLElement && task.focus(); - }, + focusTaskNameInput: function (event: Event) { + taskFocusedBeforeJumpingToInput = this.currentTask(); + document.getElementById("taskName")!.focus(); + window.scroll(0, 0); + event.preventDefault(); + }, - setState: function (newState: string) { - const task = document.activeElement; - if (!task) return; - const oldState = Model.getState(task); - if (newState === oldState) return; - const createTimestamp = task.getAttribute("data-created")!; - this.moveCursor(1) || this.moveCursor(-1); - return UI.setState(createTimestamp, newState, oldState); - }, + visibleTaskAtOffset(task: Element, offset: number): Element { + var cursor: Element | null = task; + var valid_cursor = cursor; + const increment = offset / Math.abs(offset); + while (true) { + cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling; + if (!cursor || !(cursor instanceof HTMLElement)) break; + const state = cursor.getAttribute("data-state")!; + if ( + (state === currentViewState || (currentViewState === "all" && state !== "deleted")) && + !cursor.classList.contains("hide") + ) { + offset -= increment; + valid_cursor = cursor; + } + if (Math.abs(offset) < 0.5) break; + } + return valid_cursor; + }, - undo: function () { - const ret = UI.undo(); - if (ret && ret instanceof HTMLElement) ret.focus(); - }, -}; + jumpCursor: function (position: number) { + const first = this.firstVisibleTask(); + if (!first) return; + const dest = this.visibleTaskAtOffset(first, position - 1); + if (dest instanceof HTMLElement) dest.focus(); + }, + + makeBottomPriority: function (task: Element | null = null) { + if (!task) task = this.currentTask(); + if (!task) return; + this.setPriority(task, document.getElementById("tasks")!.lastElementChild, null); + }, + + makeTopPriority: function (task: Element | null = null) { + if (!task) task = this.currentTask(); + if (!task) return; + ui.setPriority(task.getAttribute("data-created")!, clock.now(), Model.getPriority(task)); + task instanceof HTMLElement && task.focus(); + }, + + moveCursorLeft: function () { + const active = this.currentTask(); + if (!active) return false; + if (active.parentElement!.classList.contains("task")) { + active.parentElement!.focus(); + } + }, + + moveCursorRight: function () { + (this.currentTask()?.getElementsByClassName("task")[0] as HTMLElement)?.focus(); + }, + + moveCursorVertically: function (offset: number): boolean { + const active = this.currentTask(); + if (!active) return false; + const dest = this.visibleTaskAtOffset(active, offset); + if (dest !== active && dest instanceof HTMLElement) { + dest.focus(); + return true; + } + return false; + }, + + moveTask: function (offset: number) { + const active = this.currentTask(); + if (!active) return; + const dest = this.visibleTaskAtOffset(active, offset); + if (dest === active) return; // Already extremal + var onePastDest: Element | null = this.visibleTaskAtOffset(dest, offset / Math.abs(offset)); + if (onePastDest == dest) onePastDest = null; // Will become extremal + if (offset > 0) { + this.setPriority(active, dest, onePastDest); + } else { + this.setPriority(active, onePastDest, dest); + } + }, + + removeTag: function () { + const target = this.currentTag(); + if (!target) return; + ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!); + }, + + resetTagView: function () { + currentTagView = null; + const taskList = document.getElementById("tasks")!; + for (const task of Array.from(document.getElementsByClassName("task"))) { + task.classList.remove("hide"); + if (task.parentElement !== taskList) { + Model.insertInPriorityOrder(task, taskList); + } + } + }, + + resetView: function () { + this.setView("todo"); + this.resetTagView(); + }, + + returnFocusAfterInput: function (): boolean { + if (taskFocusedBeforeJumpingToInput) { + taskFocusedBeforeJumpingToInput.focus(); + return true; + } + return false; + }, + + // Change task's priority to be between other tasks a and b. + setPriority: function (task: Element, a: Element | null, b: Element | null) { + const aPriority = a === null ? clock.now() : Model.getPriority(a); + const bPriority = b === null ? 0 : Model.getPriority(b); + console.assert(aPriority > bPriority, aPriority, ">", bPriority); + const span = aPriority - bPriority; + const newPriority = bPriority + 0.1 * span + 0.8 * span * Math.random(); + console.assert(aPriority > newPriority && newPriority > bPriority, aPriority, ">", newPriority, ">", bPriority); + const newPriorityRounded = Math.round(newPriority); + const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority; + ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task)); + task instanceof HTMLElement && task.focus(); + }, + + setState: function (newState: string) { + const task = this.currentTask(); + if (!task) return; + const oldState = task.getAttribute("data-state")!; + if (newState === oldState) return; + const createTimestamp = task.getAttribute("data-created")!; + if (currentViewState !== "all" || newState == "deleted") { + this.moveCursorVertically(1) || this.moveCursorVertically(-1); + } + return ui.setState(createTimestamp, newState, oldState); + }, + + setTagView: function (tag: string | null = null) { + if (tag === null) { + const target = this.currentTag(); + if (!target) return; + tag = target.textContent!; + } + + if (currentTagView !== null) { + this.resetTagView(); + } + + const tasksWithTag = new Map(); + for (const task of document.getElementsByClassName("task")) { + if (Model.hasTag(task, tag)) { + tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [Model.getPriority(task), task]); + } + } + + function highestPrioritySuperTask(t: Element) { + var maxPriority = -1; + var superTask = null; + for (const child of t.getElementsByClassName("tag")) { + const e = tasksWithTag.get(child.textContent); + if (e !== undefined && e[0] > maxPriority) { + maxPriority = e[0]; + superTask = e[1]; + } + } + return superTask; + } + + for (const task of Array.from(document.getElementsByClassName("task"))) { + if (Model.hasTag(task, tag)) { + task.classList.remove("hide"); + } else { + const superTask = highestPrioritySuperTask(task); + if (superTask !== null) { + Model.insertInPriorityOrder(task, superTask); + } else { + task.classList.add("hide"); + } + } + } + + currentTagView = tag; + }, + + setView: function (state: string) { + const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!; + if (state === "all") { + sheet.insertRule(`.task[data-state=deleted] { display: none }`); + } else { + sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`); + } + sheet.insertRule(`:root { --view-state-indicator-color: ${viewColors[state]}; }`); + sheet.removeRule(2); + sheet.removeRule(2); + currentViewState = state; + if (this.currentTask()?.getAttribute("data-state") !== state) { + this.firstVisibleTask()?.focus(); + } + }, + + setUntaggedView: function () { + if (currentTagView !== null) { + this.resetTagView(); + } + for (const task of document.getElementsByClassName("task")) { + if (task.getElementsByClassName("tag").length === 0) { + task.classList.remove("hide"); + } else { + task.classList.add("hide"); + } + } + }, + + undo: function () { + const ret = ui.undo(); + if (ret && ret instanceof HTMLElement) ret.focus(); + }, + redo: function () { + const ret = ui.redo(); + if (ret && ret instanceof HTMLElement) ret.focus(); + }, + }; +} +const browserUI = BrowserUI(); + +const scrollIncrement = 60; +enum InputState { + Root, + S, + V, + VS, +} +var inputState = InputState.Root; +var inputCount: number | null = null; function handleKey(event: any) { + if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return; if (event.target.tagName === "INPUT") { if (event.target.id === "taskName") { - if (event.key == "Enter") return BrowserUI.addTask(event); + if (event.key == "Enter") return browserUI.addTask(event); + if (event.key == "Escape") return browserUI.returnFocusAfterInput(); + } else if (event.target.classList.contains("tag")) { + if (event.key == "Enter") return browserUI.completeTagEdit(event); + if (event.key == "Escape") return browserUI.completeTagEdit(event, CommitOrAbort.Abort); } else { - if (event.key == "Enter") return BrowserUI.completeEdit(event); + if (event.key == "Enter") return browserUI.completeEdit(event); + if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort); } } else { - if (event.key == "j") return BrowserUI.moveCursor(1); - if (event.key == "k") return BrowserUI.moveCursor(-1); - if (event.key == "J") return BrowserUI.moveTask(1); - if (event.key == "K") return BrowserUI.moveTask(-1); - if (event.key == "n") return BrowserUI.focusTaskNameInput(event); - if (event.key == "s") return BrowserUI.setState("someday-maybe"); - if (event.key == "w") return BrowserUI.setState("waiting"); - if (event.key == "d") return BrowserUI.setState("done"); - if (event.key == "c") return BrowserUI.setState("cancelled"); - if (event.key == "t") return BrowserUI.setState("todo"); - if (event.key == "X") return BrowserUI.setState("deleted"); - if (event.key == "u") return BrowserUI.undo(); - if (event.key == "e") return BrowserUI.beginEdit(event); + if (inputState === InputState.Root) { + if ("0" <= event.key && event.key <= "9") { + return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key)); + } + try { + if (event.ctrlKey) { + if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement); + if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement); + } else { + if (event.key == "h") return browserUI.moveCursorLeft(); + if (event.key == "l") return browserUI.moveCursorRight(); + if (event.key == "j") return browserUI.moveCursorVertically(inputCount ?? 1); + if (event.key == "k") return browserUI.moveCursorVertically(-(inputCount ?? 1)); + if (event.key == "J") return browserUI.moveTask(inputCount ?? 1); + if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1)); + if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER); + if (event.key == "T") return browserUI.makeTopPriority(); + if (event.key == "n") return browserUI.focusTaskNameInput(event); + if (event.key == "c") return browserUI.setState("cancelled"); + if (event.key == "d") return browserUI.setState("done"); + if (event.key == "q") return browserUI.setState("todo"); + if (event.key == "s") return (inputState = InputState.S); + if (event.key == "w") return browserUI.setState("waiting"); + if (event.key == "X") return browserUI.setState("deleted"); + if (event.key == "x") return browserUI.removeTag(); + if (event.key == "u") return browserUI.undo(); + if (event.key == "r") return browserUI.redo(); + if (event.key == "e") return browserUI.beginEdit(event); + if (event.key == "t") return browserUI.beginTagEdit(event); + if (event.key == "v") return (inputState = InputState.V); + } + } finally { + inputCount = null; + } + } else if (inputState === InputState.S) { + inputState = InputState.Root; + if (event.key == "m") return browserUI.setState("someday-maybe"); + } else if (inputState === InputState.V) { + inputState = InputState.Root; + if (event.key == "a") return browserUI.setView("all"); + if (event.key == "c") return browserUI.setView("cancelled"); + if (event.key == "d") return browserUI.setView("done"); + if (event.key == "i") return browserUI.setUntaggedView(); + if (event.key == "p") return browserUI.setTagView("Project"); + if (event.key == "q") return browserUI.setView("todo"); + if (event.key == "s") return (inputState = InputState.VS); + if (event.key == "T") return browserUI.resetTagView(); + if (event.key == "t") return browserUI.setTagView(); + if (event.key == "u") return browserUI.setUntaggedView(); + if (event.key == "v") return browserUI.resetView(); + if (event.key == "w") return browserUI.setView("waiting"); + if (event.key == "x") return browserUI.setView("deleted"); + } else if (inputState === InputState.VS) { + inputState = InputState.Root; + if (event.key == "m") return browserUI.setView("someday-maybe"); + } } } function browserInit() { - document.body.addEventListener("keydown", handleKey, { capture: false }); log.replay(); - BrowserUI.firstVisibleTask()?.focus(); + browserUI.firstVisibleTask()?.focus(); + document.body.addEventListener("keydown", handleKey, { capture: false }); }