@loadbare/app 0.25.0 → 0.27.0

package/dist/hub/lb-apply.d.ts

@@ -36,11 +36,6 @@ export declare function gatherInto(values: Record<string, ParmValue>, column: st
  * showing.
  */
 export declare function within(root: Element, selector: string): Element[];
-/**
- * Tick or clear an `lb-select` checkbox, and stamp the live row it selects
- * to match.
- */
-export declare function select(box: Element, on: boolean): void;
 /**
  * Fill from one row: every `lb-column` and `lb-show` in root's query.
  *
@@ -88,12 +83,12 @@ export declare function addUnentered(el: Element): boolean;
 export declare function discardUnentered(row: Element): boolean;
 /** How a list of rows lands: in what order, and whether a request asked. */
 export interface RowsOptions {
-    /** The order the server declared, as an order's text. */
+    /** The query's resolved order, from its row of `lb-sort`. */
     order?: string;
     /** The column types the server declared. */
     types?: ColumnTypes;
-    /** The user's choices: the row of `lb-choices`. */
-    choices?: Row;
+    /** The query's row of `lb-filters`. */
+    filters?: Row;
     /**
      * The landing answers a request from this page, so a side the list
      * places by hand leaves its rows where they stand.
@@ -113,29 +108,10 @@ export interface RowsOptions {
     doc?: Document;
 }
 /**
- * Land rows through a row template.
- *
- * Two loops do the work, on rows in no document. The creation loop makes a
- * live row for each key not yet shown, with its key and no values. The
- * landing loop lands each arriving row's values on its live row, as a `row`
- * lands, passing over a column that already shows its value. Then every live
- * row is placed by the order in one fragment, and the browser styles once.
- *
- * All rows decide membership: a row whose key did not arrive leaves. A patch
- * disturbs only what it names — a row it did not mention keeps its contents,
- * and keeps its place unless a row the patch named now sorts around it.
- *
- * With no order, all rows show in the order they arrived, and a patch's new
- * rows go last. A row that stands where it stood is not touched, so landing
- * the same rows again moves nothing. A row a filter the user chose does not
- * pass is `hidden`.
- *
- * A landing that answers a request leaves alone each side `lb-manual` names
- * on the element, whole or a patch. Under `order`, nothing already showing
- * moves, and a new row goes last in its group. Under `filter`, a row the
- * answer changed or created stays showing. A row left where the order or
- * the filter would not leave it is stamped unplaced until the rows are next
- * placed.
+ * Land rows through a row template: a live row per key, placed by the order,
+ * with groups built from the markup's group templates where the order breaks.
+ * A patch disturbs only what it names — rows it leaves out keep their
+ * contents and their place.
  */
 export declare function applyRows(el: Element, template: HTMLTemplateElement, keyColumn: string, result: RowsResult, options?: RowsOptions): void;
 /** The answer kept for a query, as all of its rows. */
@@ -160,9 +136,9 @@ export interface LandOptions {
 /**
  * Land response items. Every answer arrives through here, and is kept for
  * `root`, so that what arrives after it is filled from it — see forget().
- * An answer to `lb-choices` places again the rows its choices change. Once
- * everything has landed, each custom element placed since the last landing
- * is attached.
+ * An answer to `lb-sort` or `lb-filters` places again the rows it changes.
+ * Once everything has landed, each custom element placed since the last
+ * landing is attached.
  */
 export declare function applyResponse(root: ParentNode, items: ResponseItem[], options?: LandOptions): void;
 /**

package/dist/hub/lb-apply.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lb-apply.d.ts","sourceRoot":"","sources":["../../hub/lb-apply.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lb-apply.d.ts","sourceRoot":"","sources":["../../hub/lb-apply.ts"],"names":[],"mappings":"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"}

package/dist/hub/lb-apply.js

@@ -1,45 +1,10 @@
 /// <reference lib="dom" />
 /**
- * Landing — see docs/reference/data-binding.md.
- *
- * The hub lands a response item's rows on every element whose `lb-query`
- * names its query. The item says the query's kind and key, so the markup
- * says neither:
- *
- *   kind   row template   the hub
- *   row    no             lands the row on the element itself
- *   row    yes            lands one live row
- *   rows   yes            lands one live row per row
- *   rows   no             lands nothing
- *
- * Filling a live row and filling an element a `row` lands on are the same
- * operation, and the only difference is how much of the page the root
- * covers.
- *
- * An answer is kept after it lands. An element that names a query and
- * arrives after that query's answer — a picker in a new live row, a ghost
- * row a custom element built — is filled from the kept answer at the end of
- * the next landing, so a query need not land again, and need not land after
- * the one whose rows hold it, just to fill what is new.
- *
- * Every custom element landing places is told so once the landing is done,
- * and every one it removes is told so once it is gone — see lb-lifecycle.
- *
- * A `rows` query is placed by its order: the user's, from the choice its
- * element's `lb-order` names, or the one the server declared, or, with
- * neither, the order its rows arrived in. Groups are built from the markup's
- * group templates as the order breaks, and every change to a list — a row
- * created, changed, moved or leaving, a group appearing or leaving — is one
- * a stylesheet can see. A row a filter the user chose does not pass is
- * hidden.
- *
- * A condition is the one other thing landing moves. An element whose
- * `lb-show` column is off stands in the document inside a template, and
- * landing reaches in there as it reaches everywhere else, so a branch that
- * returns is already current. Nothing but landing reaches in.
+ * Landing: rows from response items onto the elements that name their query.
+ * `applyRows` fills a row template; `applyRow` fills one element.
  */
-import { AGGREGATES, ATTR_COLUMN, ATTR_FILTER, ATTR_ORDER, CHOICES_QUERY, LB_RESERVED_PREFIX, ATTR_COLUMN_VALUE, ATTR_COUNT, ATTR_GROUP, ATTR_GROUP_COLUMN, ATTR_GROUP_LEAVING, ATTR_GROUP_LIVE, ATTR_GROUP_VALUE, ATTR_KEY_VALUE, ATTR_MAX, ATTR_MIN, ATTR_QUERY, ATTR_QUERY_ORDER, ATTR_QUERY_ROW_COUNT, ATTR_MANUAL, MANUAL_FILTER, MANUAL_ORDER, ATTR_QUERY_UNPLACED_COUNT, ATTR_ROW_CHANGED, ATTR_ROW_CREATED, ATTR_ROW_LEAVING, ATTR_ROW_LIVE, ATTR_ROW_MOVED, ATTR_ROW_REQUESTED, ATTR_ROW_UNPLACED, ATTR_SHOW, ATTR_SUM, ATTR_URL_PARM, KIND_ROW, LIVE_GROUP, LIVE_ROW, ORDER_DESCENDING, REQUESTED_CHANGED, REQUESTED_CREATED, REQUESTED_MOVED, SHOW_NOT, ATTR_SELECT, ATTR_ROW_SELECTED, } from "../core/lb-constants.js";
-import { compareRows, compareValues, isPatch, parseFilter, parseOrder, passes, readAs, } from "../core/lb-types.js";
+import { AGGREGATE_COUNT, AGGREGATE_MAX, AGGREGATE_MIN, AGGREGATE_SUM, ATTR_AGGREGATE, ATTR_COLUMN, ATTR_FILTER, FILTERS_COLUMN_QUERY, FILTERS_QUERY, SORT_COLUMN_ORDER, SORT_COLUMN_QUERY, SORT_QUERY, LB_RESERVED_PREFIX, ATTR_COLUMN_VALUE, ATTR_GROUP, ATTR_GROUP_COLUMN, ATTR_GROUP_LEAVING, ATTR_GROUP_LIVE, ATTR_GROUP_VALUE, ATTR_KEY_VALUE, ATTR_QUERY, ATTR_QUERY_ORDER, ATTR_QUERY_ROW_COUNT, ATTR_MANUAL, MANUAL_FILTER, MANUAL_ORDER, ATTR_QUERY_UNPLACED_COUNT, ATTR_ROW_CHANGED, ATTR_ROW_CREATED, ATTR_ROW_LEAVING, ATTR_ROW_LIVE, ATTR_ROW_MOVED, ATTR_ROW_REQUESTED, ATTR_ROW_UNPLACED, ATTR_SHOW, ATTR_URL_PARM, KIND_ROW, LIVE_GROUP, LIVE_ROW, ORDER_DESCENDING, REQUESTED_CHANGED, REQUESTED_CREATED, REQUESTED_MOVED, SHOW_NOT, } from "../core/lb-constants.js";
+import { compareRows, compareValues, isPatch, parseFilter, parseOrder, passes, readAs, oneRow, } from "../core/lb-types.js";
 import { attachPlaced, detachRemoved, LEAVING, PARKED, placed, upgradeAbsent, } from "./lb-lifecycle.js";
 /** A DocumentFragment's nodeType. Tier 3 has no `Node` global to read it from. */
 const FRAGMENT_NODE = 11;
@@ -317,14 +282,6 @@ function everywhere(root, selector) {
     }
     return found;
 }
-/**
- * Tick or clear an `lb-select` checkbox, and stamp the live row it selects
- * to match.
- */
-export function select(box, on) {
-    box.checked = on;
-    box.closest(LIVE_ROW)?.toggleAttribute(ATTR_ROW_SELECTED, on);
-}
 /**
  * Put an element in the document or take it out, as its `lb-show` column
  * says.
@@ -347,12 +304,6 @@ function present(el, on) {
     }
     if (on || el.parentNode?.nodeType === FRAGMENT_NODE)
         return;
-    // A selection hidden is a selection abandoned: a tick kept out of sight
-    // would come back stale, and nothing else could clear it.
-    for (const box of [el, ...el.querySelectorAll(`[${ATTR_SELECT}]`)]) {
-        if (box.hasAttribute(ATTR_SELECT))
-            select(box, false);
-    }
     const parked = el.ownerDocument.createElement("template");
     parked.setAttribute(ATTR_SHOW, el.getAttribute(ATTR_SHOW));
     el.replaceWith(parked);
@@ -386,8 +337,10 @@ function addPlace(map, name, el) {
  */
 function note(places, el) {
     const column = el.getAttribute(ATTR_COLUMN);
-    if (column !== null)
+    // An aggregate's column is the one it totals, which no row lands on.
+    if (column !== null && !el.hasAttribute(ATTR_AGGREGATE)) {
         addPlace(places.columns, column, el);
+    }
     if (el.hasAttribute(ATTR_URL_PARM))
         places.links.push(el);
     const show = el.getAttribute(ATTR_SHOW);
@@ -411,7 +364,7 @@ const PLACE = `[${ATTR_COLUMN}], [${ATTR_SHOW}], [${ATTR_URL_PARM}]`;
  * count, as the row is its own. Its own `lb-show` never does.
  */
 function noteRoot(places, root) {
-    if (root.hasAttribute(ATTR_COLUMN)) {
+    if (root.hasAttribute(ATTR_COLUMN) && !root.hasAttribute(ATTR_AGGREGATE)) {
         addPlace(places.columns, root.getAttribute(ATTR_COLUMN), root);
     }
     if (root.hasAttribute(ATTR_URL_PARM))
@@ -592,7 +545,7 @@ function link(places, row) {
  */
 export function blankRow(root) {
     const row = {};
-    for (const el of below(root, `[${ATTR_COLUMN}]`)) {
+    for (const el of below(root, `[${ATTR_COLUMN}]:not([${ATTR_AGGREGATE}])`)) {
         row[el.getAttribute(ATTR_COLUMN)] = null;
     }
     for (const el of below(root, `[${ATTR_SHOW}]`)) {
@@ -644,7 +597,7 @@ const warned = new WeakSet();
  */
 const SCAFFOLD_STOP = `${LIVE_ROW}, ${LIVE_GROUP}, ${LEAVING}`;
 /** An element carrying any aggregate. */
-const AGGREGATE = AGGREGATES.map((name) => `[${name}]`).join(", ");
+const AGGREGATE = `[${ATTR_AGGREGATE}]`;
 /**
  * The template a group's contents go in front of: the first `<template>` in
  * the content outside any nested `lb-query`, and not one holding an absent
@@ -737,6 +690,7 @@ function rowsUnder(group) {
         ? group.children.flatMap(rowsUnder)
         : group.rows;
 }
+/**
 /**
  * A new live row for a key, copied from the row template: upgraded, stamped
  * with its key, its places found by the template's paths, and no values yet.
@@ -956,6 +910,12 @@ function arrange(list, doc, order, terms) {
     visit(list.root, 0, order);
     return retired;
 }
+/**
+ * The rows that moved: rows whose values changed, and which now stand
+ * somewhere else among the rows whose values did not. A neighbour a moved
+ * row passed did not move, and neither did a row whose new values left it
+ * where it was.
+
 /**
  * The rows that moved: rows whose values changed, and which now stand
  * somewhere else among the rows whose values did not. A neighbour a moved
@@ -1093,15 +1053,18 @@ const reported = new Set();
  * leaves them out; a value that is not a number is left out and reported.
  */
 function aggregateOf(name, column, rows, type) {
-    if (name === ATTR_COUNT)
+    if (name === AGGREGATE_COUNT && column === "")
         return rows.length;
     const values = rows
         .map((row) => row[column])
         .filter((v) => v !== null && v !== undefined && v !== "");
+    // As SQL's count(column): the values that are not null.
+    if (name === AGGREGATE_COUNT)
+        return values.length;
     if (values.length === 0)
         return null;
-    if (name === ATTR_MIN || name === ATTR_MAX) {
-        const sign = name === ATTR_MIN ? 1 : -1;
+    if (name === AGGREGATE_MIN || name === AGGREGATE_MAX) {
+        const sign = name === AGGREGATE_MIN ? 1 : -1;
         return values.reduce((a, b) => sign * compareValues(readAs(b, type), readAs(a, type)) < 0 ? b : a);
     }
     const decimals = [];
@@ -1111,7 +1074,8 @@ function aggregateOf(name, column, rows, type) {
             decimals.push(d);
         else if (!reported.has(`${name}:${column}`)) {
             reported.add(`${name}:${column}`);
-            console.warn(`lb-hub: ${name}="${column}" left out ${JSON.stringify(value)}, ` +
+            console.warn(`lb-hub: ${ATTR_AGGREGATE}="${name}" ${ATTR_COLUMN}="${column}" ` +
+                `left out ${JSON.stringify(value)}, ` +
                 `which is not a number`);
         }
     }
@@ -1119,7 +1083,7 @@ function aggregateOf(name, column, rows, type) {
         return null;
     const scale = Math.max(...decimals.map((d) => d.scale));
     const sum = decimals.reduce((total, d) => total + rescale(d, scale), 0n);
-    if (name === ATTR_SUM)
+    if (name === AGGREGATE_SUM)
         return decimalText(sum, scale);
     // An average, rounded half away from zero at two places past the values',
     // which are then dropped while they are zeros.
@@ -1134,8 +1098,8 @@ function aggregateOf(name, column, rows, type) {
 /** Set each aggregate element from rows, each column read as its type. */
 function aggregate(elements, rows, types) {
     for (const el of elements) {
-        const name = AGGREGATES.find((a) => el.hasAttribute(a));
-        const column = el.getAttribute(name) ?? "";
+        const name = el.getAttribute(ATTR_AGGREGATE) ?? "";
+        const column = el.getAttribute(ATTR_COLUMN) ?? "";
         land(el, aggregateOf(name, column, rows, types[column]));
     }
 }
@@ -1190,7 +1154,7 @@ function orderText(terms) {
         .map((term) => (term.descending ? ORDER_DESCENDING : "") + term.column)
         .join(",");
 }
-/** The user's choice in a column of `lb-choices`, when one is made. */
+/** The filter in a column of the query's `lb-filters` row, when one is made. */
 function choiceIn(choices, column) {
     const value = choices?.[column];
     return value === null || value === undefined || value === ""
@@ -1205,73 +1169,47 @@ function filtered(el) {
         .filter((column) => column !== "");
 }
 /**
- * The order an element's rows are placed by: the user's, from the column of
- * `lb-choices` its `lb-order` names, else the one the server declared.
+ * The order an element's rows are placed by: its query's row of `lb-sort`.
  */
-function orderFor(el, options) {
-    const column = el.getAttribute(ATTR_ORDER);
-    const chosen = column ? choiceIn(options.choices, column) : undefined;
-    return chosen ?? options.order;
+function sortOf(state, query) {
+    const row = state.answers.get(SORT_QUERY)?.rows?.find((r) => r[SORT_COLUMN_QUERY] === query);
+    const order = row?.[SORT_COLUMN_ORDER];
+    return typeof order === "string" && order !== "" ? order : undefined;
+}
+/** The query's row of `lb-filters`, when it has one. */
+function filtersOf(state, query) {
+    return state.answers.get(FILTERS_QUERY)?.rows?.find((r) => r[FILTERS_COLUMN_QUERY] === query);
 }
 /**
  * Whether a row passes every filter the user chose for the element: for each
- * column its `lb-filter` names, the filter in the column of `lb-choices` of
- * the same name.
+ * column its `lb-filter` names, the filter in the query's row of
+ * `lb-filters` of the same name.
  */
-function filterFor(el, choices, types) {
-    const filters = [];
+function filterFor(el, filters, types) {
+    const terms = [];
     for (const column of filtered(el)) {
-        const text = choiceIn(choices, column);
-        const terms = text === undefined ? [] : parseFilter(text);
-        if (terms.length > 0)
-            filters.push([column, terms]);
+        const text = choiceIn(filters, column);
+        const parsed = text === undefined ? [] : parseFilter(text);
+        if (parsed.length > 0)
+            terms.push([column, parsed]);
     }
-    return (row) => filters.every(([column, terms]) => passes(row[column], terms, types[column]));
+    return (row) => terms.every(([column, parsed]) => passes(row[column], parsed, types[column]));
 }
-/**
- * Hide or show a row for a filter. A selection hidden is a selection
- * abandoned, as it is for `lb-show`.
- */
 function filterRow(entry, hidden) {
     if (entry.hidden === hidden)
         return;
     entry.hidden = hidden;
     hide(entry.el, hidden);
-    if (!hidden)
-        return;
-    for (const box of [entry.el, ...entry.el.querySelectorAll(`[${ATTR_SELECT}]`)]) {
-        if (box.hasAttribute(ATTR_SELECT))
-            select(box, false);
-    }
 }
 /** Whether a row's columns as landed differ from what they were. */
 function differs(before, after) {
     return Object.entries(after).some(([column, value]) => !same(before[column], value));
 }
 /**
- * Land rows through a row template.
- *
- * Two loops do the work, on rows in no document. The creation loop makes a
- * live row for each key not yet shown, with its key and no values. The
- * landing loop lands each arriving row's values on its live row, as a `row`
- * lands, passing over a column that already shows its value. Then every live
- * row is placed by the order in one fragment, and the browser styles once.
- *
- * All rows decide membership: a row whose key did not arrive leaves. A patch
- * disturbs only what it names — a row it did not mention keeps its contents,
- * and keeps its place unless a row the patch named now sorts around it.
- *
- * With no order, all rows show in the order they arrived, and a patch's new
- * rows go last. A row that stands where it stood is not touched, so landing
- * the same rows again moves nothing. A row a filter the user chose does not
- * pass is `hidden`.
- *
- * A landing that answers a request leaves alone each side `lb-manual` names
- * on the element, whole or a patch. Under `order`, nothing already showing
- * moves, and a new row goes last in its group. Under `filter`, a row the
- * answer changed or created stays showing. A row left where the order or
- * the filter would not leave it is stamped unplaced until the rows are next
- * placed.
+ * Land rows through a row template: a live row per key, placed by the order,
+ * with groups built from the markup's group templates where the order breaks.
+ * A patch disturbs only what it names — rows it leaves out keep their
+ * contents and their place.
  */
 export function applyRows(el, template, keyColumn, result, options = {}) {
     const list = listFor(el, template);
@@ -1285,7 +1223,6 @@ export function applyRows(el, template, keyColumn, result, options = {}) {
     // What a request did is said by this landing alone.
     for (const entry of shown)
         entry.el.removeAttribute(ATTR_ROW_REQUESTED);
-    // The rows arriving, by key.
     const arriving = new Map();
     for (const data of whole ? result : (result.rows ?? [])) {
         if (data[keyColumn] === undefined) {
@@ -1310,7 +1247,6 @@ export function applyRows(el, template, keyColumn, result, options = {}) {
     const gone = whole
         ? shown.filter((entry) => !arriving.has(entry.key))
         : dropped.flatMap((key) => list.byKey.get(key) ?? []);
-    // The creation loop.
     const created = new Set();
     for (const key of arriving.keys()) {
         if (!list.byKey.has(key))
@@ -1341,7 +1277,7 @@ export function applyRows(el, template, keyColumn, result, options = {}) {
     // already showing with what is new after it. A sort keeps rows that
     // compare equal in this order.
     const stayed = shown.filter((entry) => list.byKey.get(entry.key) === entry);
-    const terms = termsOf(el, orderFor(el, options));
+    const terms = termsOf(el, options.order);
     if (list.levels.length > terms.length && !warned.has(el)) {
         warned.add(el);
         console.warn(`lb-hub: <${el.localName}> has ${list.levels.length} group ` +
@@ -1355,7 +1291,7 @@ export function applyRows(el, template, keyColumn, result, options = {}) {
             .sort((a, b) => compareRows(a.entry.data, b.entry.data, terms, options.types) ||
             a.i - b.i)
             .map(({ entry }) => entry);
-    const passing = filterFor(el, options.choices, options.types ?? {});
+    const passing = filterFor(el, options.filters, options.types ?? {});
     const manual = options.requested ? manualOf(el) : NO_MANUAL;
     const touched = new Set([...changed, ...created]);
     // A row left out of place stays touched until the rows are placed again.
@@ -1511,7 +1447,7 @@ function refocus(list, focused) {
 function landItem(el, item, options = {}) {
     const template = lists.get(el)?.top ?? templateIn(el);
     if (item.kind === KIND_ROW) {
-        const row = item.row;
+        const row = oneRow(item);
         if (template) {
             applyRows(el, template, item.key, row ? [row] : [], options);
             return;
@@ -1523,8 +1459,8 @@ function landItem(el, item, options = {}) {
             el.removeAttribute(ATTR_KEY_VALUE);
             return;
         }
-        applyRow(el, row);
         const key = row[item.key];
+        applyRow(el, row);
         if (key !== undefined && key !== null) {
             setStamp(el, ATTR_KEY_VALUE, String(key));
         }
@@ -1563,9 +1499,9 @@ export function keptAnswer(root, query) {
 function rowsOptions(state, item) {
     const declared = state.answers.get(item.query) ?? item;
     return {
-        order: declared.order,
+        order: sortOf(state, item.query) ?? declared.order,
         types: declared.types,
-        choices: state.answers.get(CHOICES_QUERY)?.row ?? undefined,
+        filters: filtersOf(state, item.query),
         doc: state.doc,
     };
 }
@@ -1619,38 +1555,41 @@ function keep(answers, item) {
         rows: patched(before.rows ?? [], item.key, item.patch),
     });
 }
-/** The columns of `lb-choices` an answer to it changes. */
-function chosen(state, item) {
-    const before = state.answers.get(CHOICES_QUERY)?.row ?? {};
-    const after = item.row ?? {};
-    const columns = new Set();
-    for (const column of new Set([...Object.keys(before), ...Object.keys(after)])) {
-        if (choiceIn(before, column) !== choiceIn(after, column))
-            columns.add(column);
+/** The queries whose sort or filters an answer changes. */
+function changedQueries(state, item) {
+    const rowsOf = (answer) => {
+        const map = new Map();
+        for (const row of answer?.rows ?? []) {
+            const query = row[SORT_COLUMN_QUERY];
+            if (typeof query === "string")
+                map.set(query, row);
+        }
+        return map;
+    };
+    const before = rowsOf(state.answers.get(item.query));
+    const after = rowsOf(item);
+    const queries = new Set();
+    for (const query of new Set([...before.keys(), ...after.keys()])) {
+        if (JSON.stringify(before.get(query)) !== JSON.stringify(after.get(query))) {
+            queries.add(query);
+        }
     }
-    return columns;
-}
-/** Whether an element's order or filter reads any of the columns. */
-function reads(el, columns) {
-    const order = el.getAttribute(ATTR_ORDER);
-    return ((order !== null && columns.has(order)) ||
-        filtered(el).some((column) => columns.has(column)));
+    return queries;
 }
 /**
- * Place again the rows of every element whose order or filter reads a choice
- * that changed. Each lands its query's kept answer again, whole, so it shows
- * what a round trip carrying the choice would have, and the server is asked
- * for nothing.
+ * Place again the rows of every query whose sort or filters changed. Each
+ * lands its query's kept answer again, whole, so it shows what a round trip
+ * carrying the change would have, and the server is asked for nothing.
  */
-function rechoose(root, state, columns) {
-    for (const [query, item] of state.answers) {
-        if (item.kind === KIND_ROW)
+function rechoose(root, state, queries) {
+    for (const query of queries) {
+        const item = state.answers.get(query);
+        if (!item || item.kind === KIND_ROW)
             continue;
         for (const el of everywhere(root, `[${ATTR_QUERY}="${query}"]`)) {
             if (!state.landed.has(el) || el.closest(LEAVING))
                 continue;
-            if (reads(el, columns))
-                landItem(el, item, rowsOptions(state, item));
+            landItem(el, item, rowsOptions(state, item));
         }
     }
 }
@@ -1677,14 +1616,16 @@ function fillArrivals(root, state) {
 /**
  * Land response items. Every answer arrives through here, and is kept for
  * `root`, so that what arrives after it is filled from it — see forget().
- * An answer to `lb-choices` places again the rows its choices change. Once
- * everything has landed, each custom element placed since the last landing
- * is attached.
+ * An answer to `lb-sort` or `lb-filters` places again the rows it changes.
+ * Once everything has landed, each custom element placed since the last
+ * landing is attached.
  */
 export function applyResponse(root, items, options = {}) {
     const state = keptFor(root);
     for (const item of items) {
-        const choices = item.query === CHOICES_QUERY ? chosen(state, item) : new Set();
+        const changed = item.query === SORT_QUERY || item.query === FILTERS_QUERY
+            ? changedQueries(state, item)
+            : new Set();
         keep(state.answers, item);
         const targets = everywhere(root, `[${ATTR_QUERY}="${item.query}"]`).filter((el) => !el.closest(LEAVING));
         if (targets.length === 0 &&
@@ -1699,8 +1640,8 @@ export function applyResponse(root, items, options = {}) {
                 requested: options.requested,
             });
         }
-        if (choices.size > 0)
-            rechoose(root, state, choices);
+        if (changed.size > 0)
+            rechoose(root, state, changed);
     }
     fillArrivals(root, state);
     attachPlaced();