@heycys/gallery 0.1.0 → 0.1.2

package/browser/editor/components/table/page.mjs

@@ -35,7 +35,7 @@ export function sharedWidths(wrap, count, share = 1) {
  * `numbers` is false (识别数字列: index.mjs NUMBERS). `looks`, `widths` and `spans` as tableData
  * describes them: each cell's look classes, each column's width, each cell's [rowspan, colspan]
  * (a cell merged makes a row hold fewer cells); where `looks` is given the cells have just those,
- * where not a header cell takes the header's look. `chart`: the key a chart drawn from it reads it
+ * where not a header row's cell takes the header's look (a header column's none). `chart`: the key a chart drawn from it reads it
  * by (its frame's data-doc-chart-source), when it has one.
  */
 export function newTable(doc, { rows, header = false, column = false, numbers = true, looks, widths, spans, chart }) {
@@ -55,7 +55,7 @@ export function newTable(doc, { rows, header = false, column = false, numbers =
       const first = at[r][index] === 0;
       const cell = newCell(doc, head || (column && first) ? "th" : "td", !head && column && first ? "row" : null);
       if (looks) cell.classList.add(...(looks[r][index] ?? "").split(" ").filter(Boolean));
-      else if (cell.localName === "th") headerLook(cell, true);
+      else if (head) headerLook(cell, true);
       const [down, across] = spans?.[r]?.[index] ?? [1, 1];
       setSpan(cell, down, across);
       if (Array.isArray(html)) cell.append(...html);
@@ -120,7 +120,7 @@ function cellNodes(doc, html, inline) {
  * row, its names' column a header column, its numeric columns read (the page's own copy as it was).
  */
 export function build({ doc, block, inline }) {
-  const rows = block.rows.map((row) => row.map((html) => cellNodes(doc, html, inline)));
+  const rows = block.rows.map((row) => row.map((html) => cellNodes(doc, html, (text) => inline(text, { pictures: true })))); // a cell's pictures its own
   const table = newTable(doc, { rows, header: Boolean(block.header), column: Boolean(block.column), numbers: block.numbers !== false, looks: block.looks, widths: block.widths, spans: block.spans, chart: block.chart });
   if (block.outside) optimizeTable(table);
   return table;
@@ -139,7 +139,7 @@ export function build({ doc, block, inline }) {
 /**
  * A table standing for an empty block (its type's `create`): three columns, a header row and two rows
  * (the plan's D6), the caret in its first cell (notion-lite's). It is two fifths as wide as the text
- * it stands in, its columns equal and fixed (typing does not move them); 一键调整列宽 is the reader's
+ * it stands in, its columns equal and fixed (typing does not move them); 自动调整列宽 is the reader's
  * to choose (a pasted table has the kit's widths). Its numeric columns are not read (识别数字列 off):
  * typing numbers does not center or sort them.
  */
@@ -164,8 +164,8 @@ export function create({ tables }) {
 
 /**
  * A new cell: a text block made on the page (td, or th with its scope). A header cell made in a
- * header row or column takes the look of the header cell beside it (`model`: lookLike), one of a
- * new table the header's (newTable).
+ * header row takes the look of the header cell beside it (`model`: lookLike), one of a new table
+ * the header's (newTable); a header column's cell is made plain.
  */
 export function newCell(doc, tag = "td", scope = null, model = null) {
   const cell = doc.createElement(tag);
@@ -175,9 +175,15 @@ export function newCell(doc, tag = "td", scope = null, model = null) {
   return cell;
 }
 
-// A cell that becomes a header cell takes the header's look (index.mjs HEADER_LOOK: bold, and the
-// gray fill unless it has a color of its own); one that stops being one loses it. These are looks
-// as any other: the reader may change them.
+// Whether a cell of `tag` and `scope` wears the header row's look (index.mjs HEADER_LOOK): a th that is
+// no row's header. A header column's th (scope="row") has no look of its own: 标题列 only makes the
+// column stay at the left when the frame scrolls sideways (the user's, 2026-11-06).
+const wearsHeaderLook = (tag, scope) => tag === "th" && (scope ?? "").trim().toLowerCase() !== "row";
+
+// A cell that becomes a header row's cell (wearsHeaderLook) takes the header's look (index.mjs
+// HEADER_LOOK: bold, and the gray fill unless it has a color of its own); one that stops being one
+// loses it; a header column's cell has none (标题列 only sticks). These are looks as any other: the
+// reader may change them.
 function headerLook(cell, on) {
   const [bold, fill] = HEADER_LOOK;
   if (!on) return cell.classList.remove(bold, fill);
@@ -185,7 +191,7 @@ function headerLook(cell, on) {
   if (!BLOCK_COLORS.some((name) => cell.classList.contains(name))) cell.classList.add(fill);
 }
 
-// A header cell made beside another of its header row or column: its color and bold as that one's
+// A header cell made beside another of its header row: its color and bold as that one's
 // (a header the reader made plain, or the Agent wrote plain, stays so).
 function lookLike(cell, model) {
   const [bold] = HEADER_LOOK;
@@ -253,10 +259,10 @@ export function columnRange(unit, from, to = from) {
 }
 
 // The cell a new row has in column `c`: as the row it is made beside has it there (a header
-// column's th), never a header row's th.
+// column's th, plain), never a header row's th.
 const cellLike = (doc, slots, r, c) => {
   const model = r === null ? null : slots.matrix[r]?.[c];
-  return model?.localName === "th" && model.getAttribute("scope") === "row" && c === 0 ? newCell(doc, "th", "row", model) : newCell(doc);
+  return model?.localName === "th" && model.getAttribute("scope") === "row" && c === 0 ? newCell(doc, "th", "row") : newCell(doc);
 };
 
 /** A new row at `at` (0 … rows): in the tbody (in the thead only between its rows). Returns it. */
@@ -304,7 +310,7 @@ export function insertColumn(unit, at) {
     const head = row.parentElement.localName === "thead";
     const first = slots.matrix[r][0];
     const beside = slots.matrix[r][Math.max(0, at - 1)];
-    const cell = head ? newCell(doc, "th", null, beside) : at === 0 && headerColumn ? newCell(doc, "th", "row", first) : newCell(doc);
+    const cell = head ? newCell(doc, "th", null, beside) : at === 0 && headerColumn ? newCell(doc, "th", "row") : newCell(doc);
     row.insertBefore(cell, cellFrom(slots, row, at));
     made.push(cell);
     // A header column stays the first: the cell that was first is a plain one now.
@@ -464,7 +470,7 @@ export function labelColumn(unit) {
 
 /**
  * 一键优化 (the table's block menu; a table pasted from elsewhere comes in so): the kit's column
- * widths (一键调整列宽: many columns scroll sideways in the frame), a header row, the first column a
+ * widths (自动调整列宽: many columns scroll sideways in the frame), a header row, the first column a
  * header column when its words are the rows' names, its numeric columns read (识别数字列: centered,
  * sorted by their header), and a frame shown whole (显示全部行) that is taller than the kit's scroll
  * height scrolling again (one that scrolls already stays as it is). Inside one undo step (the
@@ -491,7 +497,7 @@ export function optimizeTable(unit) {
   return changed;
 }
 
-/** The header column on (each body row's cell in the first column th scope="row") or off (td). */
+/** The header column on (each body row's cell in the first column th scope="row") or off (td); its cells' looks untouched either way (the header column only sticks). */
 export function setHeaderColumn(unit, on) {
   const { rows, body, headerColumn, slots } = tableState(unit);
   if (on === headerColumn) return false;
@@ -596,7 +602,7 @@ export function splitCell(unit, cell) {
       const before = cellFrom(slots, rows[r], place.c + place.cols);
       for (let c = place.c; c < place.c + place.cols; c++) {
         if (r === place.r && c === place.c) continue;
-        const piece = rowHeader ? (c === 0 ? newCell(doc, "th", "row", cell) : newCell(doc)) : newCell(doc, cell.localName, null, cell);
+        const piece = rowHeader ? (c === 0 ? newCell(doc, "th", "row") : newCell(doc)) : newCell(doc, cell.localName, null, cell);
         rows[r].insertBefore(piece, before);
         made.push(piece);
       }
@@ -647,11 +653,16 @@ function keepWidths(unit, mutate) {
 /**
  * A cell as a td or th (`scope`: a th's, null for none): a new element of that tag in its place,
  * taking its attributes, a copy of its content (the old cell keeps its own, for undo to put back)
- * and its identity (it stays the same cell to the commits); the header's look taken or lost with it.
+ * and its identity (it stays the same cell to the commits); the header row's look taken or lost when
+ * the cell comes into or leaves the kind that wears it (wearsHeaderLook): a header column's th wears
+ * none, and a cell switched between td and it keeps its looks. A th only given another scope stays
+ * itself unless its look changes (a new element then too, so undo puts its classes back).
  */
 export function retagCell(cell, tag, scope = null) {
   if (!cell) return cell;
-  if (cell.localName === tag) {
+  const look = wearsHeaderLook(tag, tag === "th" ? scope : null);
+  const changes = wearsHeaderLook(cell.localName, cell.getAttribute("scope")) !== look;
+  if (cell.localName === tag && !changes) {
     if (tag === "th" && scope) cell.setAttribute("scope", scope);
     else cell.removeAttribute("scope");
     return cell;
@@ -659,7 +670,7 @@ export function retagCell(cell, tag, scope = null) {
   const next = cell.ownerDocument.createElement(tag);
   for (const { name, value } of [...cell.attributes]) if (name !== "scope") next.setAttribute(name, value);
   if (tag === "th" && scope) next.setAttribute("scope", scope);
-  headerLook(next, tag === "th");
+  if (changes) headerLook(next, look);
   next.append(...[...cell.childNodes].map((node) => node.cloneNode(true)));
   cell.replaceWith(next);
   return next;

package/browser/editor/page/annotate/anchors.mjs

@@ -26,9 +26,10 @@ const unitOf = (node) => {
 /**
  * The text of `elements` (in page order) as the server reads a block, a line between them: { text,
  * at }, `at[i]` where character `i` comes from ({ node, offset } in a text node, { element } for a
- * formula's TeX, null for a line's end).
+ * formula's TeX, null for a line's end). `skip(child)`: an element of theirs read past (a list item's
+ * blocks, when its own words alone are read: changes/).
  */
-export function readText(elements) {
+export function readText(elements, { skip = null } = {}) {
   let text = "";
   const at = [];
   const put = (char, place) => { text += char; at.push(place); };
@@ -59,7 +60,7 @@ export function readText(elements) {
         space({ element: child });
         continue;
       }
-      if (child.matches(SKIP)) continue;
+      if (child.matches(SKIP) || skip?.(child)) continue;
       const words = isMention(child) ? sourceWords(child) : null;
       if (words !== null) {
         for (const char of words) (/\s/.test(char) ? space : (place) => put(char, place))({ element: child });

package/browser/editor/page/annotate/card.mjs

@@ -32,8 +32,7 @@ export const STYLE = `
   .ge-note-marker { width: ${RAIL.marker}px; height: ${RAIL.marker}px; box-sizing: border-box; margin: 0; padding: 0; border: 0; border-radius: 6px; background: transparent; display: grid; place-items: center; color: var(--ge-ico2); cursor: pointer; pointer-events: auto; }
   .ge-note-marker svg { width: 18px; height: 18px; fill: currentColor; stroke: none; }
   .ge-note-marker[hidden], .ge-note-card[hidden] { display: none; }
-  .ge-note-marker:hover, .ge-note-marker[data-hot] { background: var(--ge-hover); color: var(--ge-ico); }
-  .ge-note-marker:active { background: var(--ge-press); }
+  .ge-note-marker[data-hot] { background: var(--ge-hover); color: var(--ge-ico); }
   .ge-note-marker:focus-visible { outline: 2px solid var(--ge-focus); outline-offset: -2px; }
   /* The card, where the format bar would stand: a popover as the bar is, as wide as ${RAIL.card}px or the column. Its face is what shows; the card itself stands still, so a face going left under the pointer keeps it. */
   .ge-note-card { z-index: 1; width: ${RAIL.card}px; box-sizing: border-box; color: var(--ge-tx); pointer-events: auto; cursor: text; }
@@ -60,8 +59,6 @@ export const STYLE = `
   .ge-note-card[data-long][data-top] textarea { --top: 28px; }
   /* Its delete button, on the field's first line, in the room the field leaves it. */
   .ge-note-delete { position: absolute; top: 7px; right: 7px; width: 24px; height: 24px; box-sizing: border-box; margin: 0; padding: 0; border: 0; border-radius: 6px; background: transparent; display: grid; place-items: center; color: var(--ge-ico3); cursor: pointer; }
-  .ge-note-delete:hover { background: var(--ge-hover); }
-  .ge-note-delete:active { background: var(--ge-press); }
   .ge-note-delete svg { width: 18px; height: 18px; pointer-events: none; }
   .ge-note-bar { width: 2px; border-radius: 1px; background: var(--ge-note-line); }
   .ge-note-bar[data-hot] { background: var(--ge-note-hot-line); }
@@ -74,13 +71,13 @@ export const STYLE = `
 export const layerNode = () => element("div", { class: "ge-note-layer", "data-doc-dev": "" });
 
 export function markerNode(id) {
-  return element("button", { type: "button", class: "ge-note-marker", "data-note": id, "aria-label": t("批注"), tabindex: "-1", html: MARKER_ICON });
+  return element("button", { type: "button", class: "ge-note-marker ge-icon-btn", "data-note": id, "aria-label": t("批注"), tabindex: "-1", html: MARKER_ICON });
 }
 
 /** A card: a plain-text field, and the button that deletes what it holds, on its face. */
 export function cardNode() {
   const field = element("textarea", { rows: "1", spellcheck: "false", maxlength: TEXT_MOST, placeholder: t("写下建议…"), "aria-label": t("批注") });
-  const erase = element("button", { type: "button", class: "ge-note-delete", "aria-label": t("删除批注"), tabindex: "-1", html: ICONS.trash });
+  const erase = element("button", { type: "button", class: "ge-note-delete ge-icon-btn", "aria-label": t("删除批注"), tabindex: "-1", html: ICONS.trash });
   tooltip(erase, t("删除批注"));
   return { node: element("div", { class: "ge-note-card", role: "group" }, element("div", { class: "ge-note-face" }, field, erase)), field, erase };
 }

package/browser/editor/page/annotate/index.mjs

@@ -5,6 +5,7 @@ import { caretAt, editable, select } from "../caret.mjs";
 import { ordered } from "../block-info.mjs";
 import { firstHost, isHost, unitElement } from "../core.mjs";
 import { createFills } from "../fills.mjs";
+import { reveal } from "../folded.mjs";
 import { FOLLOW, task } from "../frames.mjs";
 import { BAR } from "../handle-sizes.mjs";
 import { MARGIN, margin, onMargin, rightRoom, setMargin } from "../margin.mjs";
@@ -44,17 +45,17 @@ import { HOT, MARK, STYLE, barNode, cardNode, fitField, layerNode, markerNode }
 // mark (blocks, the fill selected blocks have, in a warm colour: fills.mjs): words have it where the
 // format bar stood (below their last line, by their last character), blocks at the last one's bottom
 // right (at the window's bottom where that is below it), always inside the column. It exists once
-// it is left or something is typed in it, words or none: one with no words is a plain mark of its place
-// (Esc on a new one that never held words takes it back); typing saves it (500ms after the last key, at
-// once when it closes); a press elsewhere, Esc, Enter, Tab or Ctrl+Alt+M close it into a marker
+// something is typed in it (white space is nothing): a card left with none leaves nothing, and a saved
+// one emptied goes as its card closes, offered back as its delete button's is (an annotation has words:
+// the user's, 2026-11-06); typing saves it (500ms after the last key, at once when it closes; a text
+// with no words never: the file keeps its last words while the card is open); a press elsewhere, Esc, Enter, Tab or Ctrl+Alt+M close it into a marker
 // in the column's right gutter, at its first line or the middle of its several blocks (right of a
 // section's strip for what is in that section; the place the button beside a block stands on:
 // markerSpot(), which says no where a marker stands already). Closed
 // by a key the caret goes back to its words, or to its blocks where the keys opened it; a card of
 // blocks the pointer opened places none. Resting on a marker (or clicking it) shows its card again
 // where it was written, by its words, which light up, and it stays while the pointer goes over to it.
-// The button at a card's right deletes it, and that alone does, or its words or blocks going: a card
-// emptied stays, with no words. One card shows at a time, and starting on the words of an annotation already there shows its
+// The button at a card's right deletes it, and so does emptying it, or its words or blocks going. One card shows at a time, and starting on the words of an annotation already there shows its
 // card rather than a second one. The workbench's list asks for the page's annotations (rows()) and
 // goes to one (goTo()): what hides it opened, the page scrolled to it, its card shown as resting on its
 // marker shows it, until a press elsewhere or the words leave the window. Markers stack without
@@ -109,6 +110,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   let reading = null; // the first read from the server, under way or done (taken back when it failed)
   let counted = false; // that read is in and what it brought found: the page can say how many it has
   let items = new Map(); // id -> { id, created, updated, text, anchor } in page order, as the server last said, with the page's own changes
+  let filed = new Map(); // id -> its text as the file last held it (the server's last answer): what 撤销 brings back of one emptied in its card
   let version = null; // the file's, as last read or written
   const lost = new Map(); // id -> an annotation a check deleted this visit (its words gone): back when an undo brings them back
   const timers = new Map(); // id -> the timer of its save (typed, not saved yet)
@@ -132,9 +134,9 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   let remeasure = true; // all of them to measure again (what may move them: the page's size, its structure), else those in `stale`
   const stale = new Set(); // ids found again since they were measured
   // The annotation whose card shows, or stands in front: { id, focus, hover, keys, located, side, begun,
-  // held, opening, within }: `keys`, opened by the keys, which give the caret back; `located`, shown by
+  // opening, within }: `keys`, opened by the keys, which give the caret back; `located`, shown by
   // the workbench's list; `side`, by its words, "below" or "above" them, kept while it is written;
-  // `begun`, new, and `held`, having held words; `opening`, opened for writing and not laid out yet in
+  // `begun`, new; `opening`, opened for writing and not laid out yet in
   // the margin; `within`, what it is laid out by there instead of its anchor, which is out of the window.
   let shown = null;
   let hot = null; // the id whose words are under the pointer
@@ -198,6 +200,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     heard = true;
     version = answer.version;
     const dropped = new Set(answer.dropped ?? []);
+    filed = new Map((answer.items ?? []).map((item) => [item.id, item.text]));
     const next = new Map();
     for (const item of answer.items ?? []) {
       const mine = items.get(item.id);
@@ -298,12 +301,13 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     return answer;
   }
 
-  // Save it now: made (its first save) or changed, with words or with none (a plain mark of its place).
+  // Save it now: made (its first save) or changed; never with no words (left so, it goes: close).
   async function save(id) {
     clearTimeout(timers.get(id));
     timers.delete(id);
     const item = items.get(id);
     if (!item) return;
+    if (!item.text.trim()) return; // no words: nothing to save, the file keeps its last words
     if (!item.anchor) {
       if (!made.has(id)) return;
       item.anchor = anchorOf(id);
@@ -366,14 +370,16 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
 
   /** Save what is typed and not saved yet, now (Ctrl+S, the workbench's save, the page closing: `keepalive`). */
   function flush({ keepalive = false } = {}) {
-    const ids = [...new Set([...timers.keys(), ...[...made.keys()].filter((id) => !sending.has(id))])]; // one begun and not saved yet counts, typed in or not
+    // What was typed, and one begun and not saved yet; one with no words saves nothing (save), and one
+    // the file has keeps its last words (the page going, no 撤销 could be offered for its going).
+    const ids = [...new Set([...timers.keys(), ...[...made.keys()].filter((id) => !sending.has(id))])];
     if (keepalive) {
       sync({ keepalive: true });
       for (const id of ids) {
         clearTimeout(timers.get(id));
         timers.delete(id);
         const item = items.get(id);
-        if (!item) continue;
+        if (!item?.text.trim()) continue;
         if (!item.anchor && made.has(id)) item.anchor = anchorOf(id);
         postJson(ROUTE, token, { slug, put: wire(item) }, { keepalive: true }).catch(() => {});
       }
@@ -460,9 +466,9 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   // A card's field has the focus (a card being written); `shown.focus` follows it.
   const focused = () => Boolean(document.activeElement?.closest?.(".ge-note-card"));
   const writing = () => Boolean(shown) && focused();
-  // A new one that has held no words yet (`begun`, not `held`): no annotation until it is left, Esc
-  // taking it back.
-  const drafted = (id) => shown?.id === id && shown.begun && !shown.held;
+  // A new one with no words (made on the page, not saved yet, nothing typed but white space): no
+  // annotation yet: no marker, no count, no row; left so, it leaves nothing (close).
+  const drafted = (id) => made.has(id) && !(items.get(id)?.text ?? "").trim();
 
   // The annotation already on `selection` (the same words or blocks), or undefined.
   function sameAs(selection) {
@@ -533,7 +539,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
       if (closing) {
         event.preventDefault();
         event.stopPropagation();
-        backToText({ drop: event.key === "Escape" && drafted(id) });
+        backToText();
       }
     });
     // A press in a card edits it, the caret where pressed (at the end of its text for a press beside the
@@ -604,7 +610,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     if (!focus) return true;
     card.field.focus({ preventScroll: true });
     if (document.activeElement !== card.field) {
-      if (made.has(id) && !item.text) {
+      if (drafted(id)) {
         items.delete(id);
         made.delete(id);
         dropView(id);
@@ -627,6 +633,15 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     wake();
   }
 
+  // What 撤销 puts back of one going at the reader's word (its delete button, emptied and closed): as
+  // it is, or, emptied in its card, with the words the file last held; null when the file never had it.
+  function backOf(id) {
+    const item = items.get(id);
+    if (!item?.anchor) return null;
+    const text = item.text.trim() ? item.text : filed.get(id);
+    return text ? { ...wire(item), text } : null;
+  }
+
   // An annotation gone at the reader's word, from the page and the file (one never saved leaves nothing).
   function forget(id) {
     const item = items.get(id);
@@ -640,26 +655,30 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     dropView(id);
   }
 
-  // The card closes into its marker: what was typed saved at once, one with no words saved as it is
-  // (a plain mark of its place). `drop`: it goes instead (its delete button, Esc on a new one). With
-  // room it goes back among the others.
+  // The card closes into its marker: what was typed saved at once. One left with no words is none: it
+  // goes, from the page and the file, and one the file had is offered back as its delete button's is
+  // (`removed`, with its last words). `drop`: it goes whatever it says (its delete button, which offers
+  // it back itself). With room it goes back among the others.
   function close({ drop = false } = {}) {
     if (!shown) return;
     const { id } = shown;
     shown = null;
     const item = items.get(id);
-    if (drop) forget(id);
-    else if (item && (timers.has(id) || !item.anchor)) save(id);
+    if (item && (drop || !item.text.trim())) {
+      const back = drop ? null : backOf(id);
+      forget(id);
+      if (back) removed([back]);
+    } else if (item && (timers.has(id) || !item.anchor)) save(id);
     changed();
     wake();
   }
 
-  // A card's delete button: its annotation goes at once, and the workbench offers it back. One never
-  // saved leaves nothing to bring back.
+  // A card's delete button: its annotation goes at once, and the workbench offers it back (emptied in
+  // its card, with the words the file last held). One never saved leaves nothing to bring back.
   function erase(id) {
     const item = items.get(id);
     if (!item) return;
-    const was = item.anchor ? wire(item) : null;
+    const was = backOf(id);
     if (shown?.id !== id) {
       forget(id);
       changed();
@@ -699,7 +718,6 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     const was = drafted(id);
     item.text = field.value;
     item.updated = new Date().toISOString();
-    if (item.text.trim() && shown?.id === id) shown.held = true;
     schedule(id);
     changed();
     if (!standing || was !== drafted(id)) wake();
@@ -824,7 +842,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     const view = views.get(id);
     if (!view || drafted(id)) return false;
     const start = view.range?.startContainer ?? view.units[0];
-    globalThis.DocKit.reveal(start.nodeType === 1 ? start : start.parentElement);
+    reveal(start.nodeType === 1 ? start : start.parentElement); // a folded heading's section too (fold/)
     remeasure = true; // what was hidden stands now, before the observer says so
     const line = lineOf(view);
     if (!line) return false;
@@ -896,7 +914,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
       const view = known ?? {};
       if (!found || (found.units?.length ?? 0) === 0) {
         // A new one with no words, not saved yet, is about nothing now: it goes with them, for no save to keep.
-        if (made.has(id) && !item.anchor && !item.text) {
+        if (drafted(id) && !item.anchor) {
           forget(id);
           if (shown?.id === id) shown = null;
           continue;
@@ -946,16 +964,25 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   }
 
   // The outermost closed disclosure `node` is hidden in (in its content, not its title, nor `node`
-  // itself: it shows, as its title), or null.
+  // itself: it shows, as its title), or the folded heading whose section hides it (fold/: the
+  // outermost, the heading its own title), whichever holds the other; null where neither hides it.
   function closedAround(node) {
     const element = node?.nodeType === 1 ? node : node?.parentElement;
     let found = null;
     for (let details = element?.closest("details:not([open])"); details; details = details.parentElement?.closest("details:not([open])")) {
       if (details !== node && !details.querySelector(":scope > summary")?.contains(element)) found = details;
     }
-    return found;
+    let marked = null;
+    for (let at = element?.closest("[data-ge-folded]"); at; at = at.parentElement?.closest("[data-ge-folded]")) marked = at;
+    const heading = marked && document.querySelector(`[data-ge-id="${CSS.escape(marked.getAttribute("data-ge-folded"))}"]`);
+    if (!heading) return found;
+    return found && found.contains(heading) ? found : heading;
   }
 
+  // What stands for a closed disclosure or a folded section (closedAround): the disclosure's title, or
+  // the heading itself, which has none.
+  const titleOf = (closed) => closed.querySelector(":scope > summary") ?? closed;
+
   // The first line of `node` (window coordinates): { top, height, left }: of its first words; where a
   // picture standing as a block comes before them, the picture's top (as the handle's first line,
   // handle/: not its caption, far from there); its box's top where it holds neither.
@@ -987,13 +1014,13 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   // holds), box (what it stands for as shown) }, or null when it does not show: its first line, or all
   // of them for several blocks, from the first's top to the last's bottom, the marker at their middle.
   // In a closed disclosure (laid out though hidden), its title's line: checked first, as the hidden
-  // text still has boxes.
+  // text still has boxes; in a folded heading's section (fold/), the heading's.
   function lineOf(view) {
     const start = view.range?.startContainer ?? view.units?.find((unit) => unit.isConnected);
     if (!start?.isConnected) return null;
     const closed = closedAround(start);
     if (closed) {
-      const summary = closed.querySelector(":scope > summary");
+      const summary = titleOf(closed);
       if (!summary?.getClientRects().length) return null;
       const box = summary.getBoundingClientRect();
       return { ...firstLine(summary), folded: true, box, bottom: box.bottom };
@@ -1074,13 +1101,13 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
   // What a card stands by (window coordinates), or null when it does not show: words, their box and
   // where their last line ends ({ words, top, left, right: the last character's, bottom: the last
   // line's }); blocks, theirs ({ top, bottom and right: the last one's }); in a closed disclosure (laid
-  // out though hidden), its title as a block.
+  // out though hidden), its title as a block; in a folded heading's section, the heading.
   function anchorBox(target) {
     const start = target.range?.startContainer ?? target.units?.find((unit) => unit.isConnected);
     if (!start?.isConnected) return null;
     const closed = closedAround(start);
     if (closed) {
-      const summary = closed.querySelector(":scope > summary");
+      const summary = titleOf(closed);
       if (!summary?.getClientRects().length) return null;
       const box = summary.getBoundingClientRect();
       return { top: box.top, bottom: box.bottom, right: box.right };
@@ -1379,7 +1406,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     quiet = false;
 
     // A block anchor's blocks filled while it is shown, or its card in the margin is under the pointer;
-    // those in a closed disclosure, the disclosure.
+    // those in a closed disclosure, the disclosure; in a folded section, its heading.
     const filled = views.get(shown?.id ?? (standing ? hot : null));
     fills.paint(filled && !filled.range && !filled.hidden ? ordered(filled.units.filter((unit) => unit.isConnected).map((unit) => closedAround(unit) ?? unit)) : []);
     paintMarks();
@@ -1562,7 +1589,7 @@ export function createAnnotate({ slug, token, isEditing, picked, unpick = () =>
     },
   };
 
-  /** How many annotations the page has (their words or blocks still there; a new one once left, or once it has words). */
+  /** How many annotations the page has (their words or blocks still there; a new one once it has words). */
   const count = () => [...items.keys()].filter((id) => views.has(id) && !drafted(id)).length;
 
   provide("annotations", () => ({