@panphora/clayjs 1.17.0 → 1.18.1

package/src/page/checklist.js

@@ -1,143 +1,18 @@
-import { state, view as pmView } from "../vendor/prosemirror.vendor.js";
-import { schema } from "./schema.js";
-import { asStep } from "./blocksel.js";
-import { el, cardFace } from "./board-face.js";
+// The checklist's keys: `Mod-Shift-o` and `Mod-Shift-d` open an item's owner and
+// due popovers. The controls are a decoration the view part draws and opens, so
+// this asks the parts it finds for a loaded editor and stays out of the rest.
+import { state } from "../vendor/prosemirror.vendor.js";
+import { viewHooks } from "./view-hooks.js";
 
-const { Plugin } = state;
-const { Decoration, DecorationSet } = pmView;
-
-function itemAt(view, id) {
-  let found = null;
-  view.state.doc.forEach((node, pos) => { if (node.attrs.id === id && node.type === schema.nodes.list_item && node.attrs.kind === "check") found = { node, pos }; });
-  return found;
-}
-
-function setItem(view, id, attr, value) {
-  const found = itemAt(view, id);
-  if (!found) return;
-  view.dispatch(asStep(view.state.tr.setNodeMarkup(found.pos, null, { ...found.node.attrs, [attr]: value || null })));
-}
-
-function chip(doc, label, aria, attr) {
-  const button = doc.createElement("button");
-  button.type = "button";
-  button.className = "page-check-chip";
-  button.dataset.check = attr;
-  button.textContent = label;
-  button.setAttribute("aria-label", aria);
-  return button;
-}
-
-// The same owner field a board card's panel shows: people as chips, "No owner",
-// then a name box for anyone not in the list.
-function ownerPicker(view, id, anchor) {
-  const doc = anchor.ownerDocument;
-  const current = itemAt(view, id)?.node.attrs.owner || "";
-  const popup = doc.createElement("span");
-  popup.className = "page-check-popup page-check-owner";
-  popup.contentEditable = "false";
-  const box = el(doc, "span", "page-board-owners");
-  const people = el(doc, "span", "page-board-people", { role: "group", "aria-label": "Owner" });
-  const input = el(doc, "input", "page-board-owner-input", { type: "text", "aria-label": "Owner name", placeholder: "Or type a name…" });
-  input.value = current;
-  const choose = (name) => setItem(view, id, "owner", name);
-  const person = (name, label, attr, pressed) => {
-    const button = el(doc, "button", `page-board-person${name ? "" : " is-none"}`, { type: "button", "aria-pressed": String(pressed), "data-check": attr });
-    if (name) button.append(cardFace(doc, name), el(doc, "span", null, {}, name));
-    else button.textContent = label;
-    button.addEventListener("click", () => choose(name));
-    return button;
-  };
-  const draw = (available) => {
-    const typed = input.value.trim().toLowerCase();
-    const shown = (available || []).filter((p) => !typed || typed === current.toLowerCase() || p.name.toLowerCase().includes(typed));
-    people.replaceChildren(...shown.map((p) => person(p.name, p.name, "owner-option", p.name === current)), person(null, "No owner", "clear-owner", !current));
-  };
-  input.addEventListener("keydown", (event) => {
-    if (event.key === "Enter") { event.preventDefault(); choose(input.value.trim()); }
-    if (event.key === "Escape") { event.preventDefault(); popup.remove(); anchor.focus(); }
-    event.stopPropagation();
-  });
-  box.append(people, input);
-  popup.append(box);
-  anchor.after(popup);
-  input.focus();
-  let available = [];
-  draw(available);
-  input.addEventListener("input", () => draw(available));
-  const source = globalThis.clay?.people?.available;
-  if (source) Promise.resolve().then(() => source()).then((list) => { if (popup.isConnected) { available = list || []; draw(available); } }).catch(() => {});
-}
-
-function datePicker(view, id, anchor) {
-  const doc = anchor.ownerDocument;
-  const popup = doc.createElement("span");
-  popup.className = "page-check-popup";
-  popup.contentEditable = "false";
-  const input = doc.createElement("input");
-  input.type = "date";
-  input.setAttribute("aria-label", "Due date");
-  input.value = itemAt(view, id)?.node.attrs.due || "";
-  input.addEventListener("change", () => setItem(view, id, "due", input.value));
-  input.addEventListener("keydown", (event) => event.stopPropagation());
-  const clear = chip(doc, "Clear", "Clear due date", "clear-date");
-  clear.addEventListener("click", () => setItem(view, id, "due", null));
-  popup.append(input, clear);
-  anchor.after(popup);
-  input.focus();
-}
-
-function controls(view, node) {
-  const doc = view.dom.ownerDocument;
-  const box = doc.createElement("span");
-  box.className = "page-check-controls";
-  box.contentEditable = "false";
-  box.dataset.empty = String(!node.attrs.owner && !node.attrs.due);
-  const owner = chip(doc, node.attrs.owner || "Assign", node.attrs.owner ? `Owner: ${node.attrs.owner}` : "Assign owner", "owner");
-  const dueLabel = node.attrs.due ? new Date(`${node.attrs.due}T00:00:00Z`).toLocaleDateString("en-US", { month: "short", day: "numeric", timeZone: "UTC" }) : "Date";
-  const date = chip(doc, dueLabel, node.attrs.due ? `Due ${dueLabel}` : "Set due date", "date");
-  owner.addEventListener("click", () => ownerPicker(view, node.attrs.id, owner));
-  date.addEventListener("click", () => datePicker(view, node.attrs.id, date));
-  box.append(owner, date);
-  return box;
-}
-
-function focusControl(view, name) {
-  const $pos = view.state.selection.$head;
-  if ($pos.depth !== 1 || $pos.parent.type !== schema.nodes.list_item || $pos.parent.attrs.kind !== "check") return false;
-  const id = $pos.parent.attrs.id;
-  const widget = [...view.dom.querySelectorAll(".page-check-controls")].find((el) => el.dataset.item === id);
-  const button = widget?.querySelector(`[data-check="${name}"]`);
-  if (!button) return false;
-  button.focus();
-  return true;
-}
-
-export const checklistKeys = new Plugin({
+export const checklistKeys = new state.Plugin({
   props: {
     handleKeyDown(view, event) {
       if (!(event.metaKey || event.ctrlKey) || !event.shiftKey || event.altKey) return false;
       const name = event.key.toLowerCase() === "o" ? "owner" : event.key.toLowerCase() === "d" ? "date" : null;
-      return name ? focusControl(view, name) : false;
+      if (!name) return false;
+      if (view.dom.getAttribute(name === "owner" ? "data-assignees" : "data-dates") === "false") return false;
+      for (const hook of viewHooks.get(view) ?? []) if (hook.focusControl?.(view, name)) return true;
+      return false;
     },
   },
 });
-
-export function checklistPlugin() {
-  return new Plugin({
-    props: {
-      decorations(st) {
-        const widgets = [];
-        st.doc.forEach((node, pos) => {
-          if (node.type !== schema.nodes.list_item || node.attrs.kind !== "check") return;
-          widgets.push(Decoration.widget(pos + node.nodeSize - 1, (view) => {
-            const box = controls(view, node);
-            box.dataset.item = node.attrs.id;
-            return box;
-          }, { key: `${node.attrs.id}:${node.attrs.owner}:${node.attrs.due}`, side: 1, stopEvent: () => true, ignoreSelection: true }));
-        });
-        return DecorationSet.create(st.doc, widgets);
-      },
-    },
-  });
-}

package/src/page/checkpoint-proof.js

@@ -140,6 +140,10 @@ export async function readPageState({ href, etag, fetch: doFetch = globalThis.fe
  * document, another generation, another version of the same document or another article
  * is refused rather than used, and the receipt names the pair the host persisted.
  *
+ * A host that gives the document no identity of its own answers null, and a page pinned
+ * by path accepts that answer as its own: there is no id it could have answered instead.
+ * Every other mismatch is still another document.
+ *
  * @param {Object} read - an answer from readPageState()
  * @param {Object} options
  * @param {{authority: Object, lineage: Object}} options.accepted
@@ -149,7 +153,9 @@ export async function readPageState({ href, etag, fetch: doFetch = globalThis.fe
  */
 export async function verifyPageState(read, { accepted, article, etag } = {}) {
   if (!read || read.ok !== true) return refused(read?.code ?? "unavailable", read?.message ?? "The page state was not read");
-  if (idKey(read.documentId) !== idKey(accepted?.authority?.documentId)) return refused("foreign-document", "The page state belongs to another document");
+  const authority = accepted?.authority;
+  const byPath = authority?.scope === "path" && read.documentId == null;
+  if (!byPath && idKey(read.documentId) !== idKey(authority?.documentId)) return refused("foreign-document", "The page state belongs to another document");
   if (typeof accepted?.lineage?.generation !== "string" || read.generation !== accepted.lineage.generation) return refused("foreign-generation", "The page state belongs to another generation");
   if (read.etag !== etag) return refused("etag-mismatch", "The page state belongs to another version of this document");
   let stateBytes, state;