Skip to main content

max / makeover-webview

18.1 KB · 483 lines History Blame Raw
1 //! Column layout and row structure for lists and tables.
2 //!
3 //! The other half of phase B. [`form`](crate::form) renders a field; this
4 //! renders the frame a list of rows sits in: which columns exist, how wide they
5 //! are, which ones survive a narrow viewport, and the cell containers a row is
6 //! made of.
7 //!
8 //! # What this does not do
9 //!
10 //! It does not render a cell's contents. That is the crate's own limit, stated
11 //! in `makeover_layout`'s "Where the description stops": generate the boring
12 //! 80% so the bespoke 20% gets the attention. A goingson task row carries
13 //! delegated action hooks with argument substitution, four nested sub-renderers,
14 //! conditional state classes and aria labels built from data. A description
15 //! expressive enough to emit that is a templating language wearing a
16 //! description's name.
17 //!
18 //! So the split is the one [`Markup`] already draws for forms: this owns the
19 //! structure and the app owns what goes in it. What that removes from an app is
20 //! not small — cell order, cell classes, the grid tracks, and above all the
21 //! narrowing rules, which is where addressing columns by position goes wrong.
22 //!
23 //! # Why positions are the bug
24 //!
25 //! goingson hides its mobile columns with `nth-child(n+5)` against a
26 //! seven-column table, plus a separate `nth-child(3)`, plus two class-based
27 //! rules — the same fact said three ways, two of them positional. Insert a
28 //! column anywhere left of the cut and the wrong one disappears, silently,
29 //! because nothing in the stylesheet knows what column five *is*.
30 //! [`Priority`] is the fix: a renderer narrows by raising a cutoff, and never
31 //! by counting.
32
33 use crate::form::Markup;
34 use crate::{Emit, class};
35 use makeover_layout::{Column, Priority, RowPart, Width};
36 use std::fmt::Write as _;
37
38 /// The lengths the description deferred.
39 ///
40 /// [`Width`] says `Content`, `Fixed` or `Fill` and deliberately carries no
41 /// magnitude, because a magnitude is a CSS answer and the description is read
42 /// by renderers that have no pixels. So the numbers arrive here instead, the
43 /// way a field's value arrives in [`Filling`](crate::form::Filling) rather than
44 /// in `Field`.
45 ///
46 /// Looked up by column name, because an app's columns are not all one size:
47 /// goingson's task table has six distinct fixed widths.
48 #[derive(Debug, Clone, Copy, Default)]
49 pub struct Sizing<'a> {
50 /// `(column name, CSS length)`. The length is the track for a
51 /// [`Width::Fixed`] column and the floor for a [`Width::Fill`] one.
52 pub lengths: &'a [(&'a str, &'a str)],
53 /// Used for a column with no entry above. Empty means `auto`.
54 pub fallback: &'a str,
55 }
56
57 impl Sizing<'_> {
58 /// The length for a named column.
59 fn length_for(&self, name: &str) -> &str {
60 self.lengths
61 .iter()
62 .find(|(column, _)| *column == name)
63 .map_or_else(
64 || {
65 if self.fallback.is_empty() {
66 "auto"
67 } else {
68 self.fallback
69 }
70 },
71 |(_, length)| *length,
72 )
73 }
74
75 /// The grid track for one column.
76 fn track(&self, column: &Column<'_>) -> String {
77 match column.width {
78 Width::Content => "max-content".to_owned(),
79 Width::Fixed => self.length_for(column.name).to_owned(),
80 Width::Fill => format!("minmax({}, 1fr)", self.length_for(column.name)),
81 // A width added to the description since this renderer was built.
82 // `auto` is the track that makes no claim, which is the honest
83 // answer to a claim this renderer cannot read.
84 _ => "auto".to_owned(),
85 }
86 }
87 }
88
89 /// The class a cell of this column carries.
90 ///
91 /// Derived from the column's own name, which is what makes the narrowing rules
92 /// addressable. `data-column` would do as well; a class is what both webview
93 /// apps already key their cell styling on.
94 #[must_use]
95 pub fn column_class(column: &Column<'_>, opts: &Emit) -> String {
96 class(&format!("col-{}", column.name), opts)
97 }
98
99 /// The class saying how wide a cell of this column asks to be.
100 ///
101 /// A bounded vocabulary, unlike [`column_class`], which is why the stylesheet
102 /// can carry the rule. [`Width`] is `#[non_exhaustive]`, and a member added
103 /// upstream lands on the fill class: a column that takes the slack is the
104 /// behaviour that makes no claim, matching the `auto` track
105 /// [`Sizing::track`] falls back to for the same reason.
106 fn width_class(width: Width) -> &'static str {
107 match width {
108 Width::Content => "cell-content",
109 Width::Fixed => "cell-fixed",
110 _ => "cell-fill",
111 }
112 }
113
114 /// The class saying when a cell of this column drops.
115 ///
116 /// [`Priority`] said as a class rather than as a cutoff, so the hiding can live
117 /// in the stylesheet instead of being generated per table. That is what a
118 /// [`display: table`](crate::table_rules) frame needs and a grid one cannot use:
119 /// a grid also has to shorten its track list, which only the columns themselves
120 /// can say.
121 fn drop_class(priority: Priority) -> &'static str {
122 match priority {
123 Priority::Optional => "cell-drops-first",
124 Priority::Secondary => "cell-drops-next",
125 // A priority added upstream keeps its column. `Priority` is
126 // `#[non_exhaustive]`, and of the two ways to be wrong about one this
127 // renderer has not learned, showing a column that should have dropped
128 // is the one the user can see and work around.
129 _ => "cell-keeps",
130 }
131 }
132
133 /// Every class a cell of this column carries.
134 ///
135 /// The column's own name, how wide it asks to be, and when it drops. A header
136 /// cell has to carry the same three or the header and the body disagree about
137 /// which column just disappeared, and a renderer emitting its own header row
138 /// should call this rather than assemble the list a second time.
139 #[must_use]
140 pub fn column_classes(column: &Column<'_>, opts: &Emit) -> String {
141 format!(
142 "{} {} {}",
143 column_class(column, opts),
144 class(width_class(column.width), opts),
145 class(drop_class(column.priority), opts)
146 )
147 }
148
149 /// The `grid-template-columns` value for the columns kept at `cutoff`.
150 ///
151 /// Emitting only the surviving tracks is what keeps the track list and the
152 /// hiding in agreement. An app that hides a cell with `display: none` but
153 /// leaves its track in place gets a column of empty space, which is the other
154 /// half of goingson's mobile bug: its narrow rule drops to four tracks by hand
155 /// and has to be edited in step with the `nth-child` cut.
156 #[must_use]
157 pub fn grid_template_columns(
158 columns: &[Column<'_>],
159 sizing: &Sizing<'_>,
160 cutoff: Priority,
161 ) -> String {
162 columns
163 .iter()
164 .filter(|column| column.kept_at(cutoff))
165 .map(|column| sizing.track(column))
166 .collect::<Vec<_>>()
167 .join(" ")
168 }
169
170 /// The rules that narrow `selector` to the columns kept at `cutoff`.
171 ///
172 /// Both halves together: the shortened track list, and `display: none` on each
173 /// dropped column *by its own class*. Nothing counts positions, so inserting a
174 /// column changes what is emitted rather than changing which column vanishes.
175 ///
176 /// `selector` may be a selector list. A descendant is appended to each part
177 /// rather than to the whole, because appending to the whole changes what the
178 /// earlier parts match: `.head, .row > .col-x` reads as "`.head`, or a `.col-x`
179 /// inside `.row`", so `.head` itself would be hidden.
180 #[must_use]
181 pub fn narrowing_css(
182 columns: &[Column<'_>],
183 selector: &str,
184 sizing: &Sizing<'_>,
185 cutoff: Priority,
186 opts: &Emit,
187 ) -> String {
188 let parts: Vec<&str> = selector.split(',').map(str::trim).collect();
189
190 let mut css = format!(
191 "{} {{\n grid-template-columns: {};\n}}\n",
192 parts.join(", "),
193 grid_template_columns(columns, sizing, cutoff)
194 );
195
196 for column in columns.iter().filter(|c| !c.kept_at(cutoff)) {
197 let class = column_class(column, opts);
198 let targets: Vec<String> = parts
199 .iter()
200 .map(|part| format!("{part} > .{class}"))
201 .collect();
202 let _ = write!(css, "{} {{\n display: none;\n}}\n", targets.join(",\n"));
203 }
204 css
205 }
206
207 /// One cell of a row.
208 ///
209 /// The contents are [`Markup`] rather than text, and that is the whole shape of
210 /// this module: a cell holds whatever the app builds, and the app says so by
211 /// naming it. Escaping a cell here would be wrong as well as impossible — a
212 /// task row's description cell is five nested spans and a badge.
213 #[derive(Debug, Clone, Copy)]
214 pub struct Cell<'a> {
215 /// Which column this fills, by name.
216 pub column: &'a str,
217 /// What kind of text it is, when it is text.
218 ///
219 /// Carries the row-part class the stylesheet half already emits, so a
220 /// secondary cell says it is secondary in the description's own words
221 /// rather than in the app's.
222 pub part: Option<RowPart>,
223 /// The contents. Trusted app markup.
224 pub content: Markup<'a>,
225 }
226
227 impl<'a> Cell<'a> {
228 /// A cell with no row part.
229 #[must_use]
230 pub const fn new(column: &'a str, content: Markup<'a>) -> Self {
231 Self {
232 column,
233 part: None,
234 content,
235 }
236 }
237 }
238
239 /// The class for a row part.
240 ///
241 /// This comment used to say `RowPart` was the one closed enum left here, and
242 /// that gaining a member would stop this compiling — "the same lockstep break
243 /// `non_exhaustive` was added elsewhere to end". makeover-layout 0.9.0 ended
244 /// it: the enum gained [`RowPart::Tokens`] and `#[non_exhaustive]` in the same
245 /// release, so the prediction was paid off rather than waited for.
246 ///
247 /// The fallback is what that costs. A member added upstream lands here as a
248 /// bare `row-part` with no rule of its own, which is a thing rendering plainly
249 /// rather than a build that stops. Grep this function when adopting a new
250 /// makeover-layout.
251 pub(crate) fn part_class(part: RowPart) -> &'static str {
252 match part {
253 RowPart::Primary => "row-primary",
254 RowPart::Secondary => "row-secondary",
255 RowPart::Meta => "row-meta",
256 RowPart::Actions => "row-actions",
257 RowPart::Tokens => "row-tokens",
258 RowPart::Proportion => "row-proportion",
259 _ => "row-part",
260 }
261 }
262
263 /// A row's cells, in column order.
264 ///
265 /// Ordered by the columns and not by the cells, so a row cannot silently
266 /// disagree with its table about what comes where. A column with no cell gets
267 /// an empty container, which keeps the grid aligned; a cell naming no column is
268 /// dropped, because there is nowhere to put it.
269 ///
270 /// Emits the cells alone, not the row element. The row carries the app's
271 /// identity and hooks — `data-id`, a context-menu binding, a tabindex, its
272 /// state classes — and none of that is describable here.
273 ///
274 /// # Not for a webview's scroll path
275 ///
276 /// This has no consumer in either webview app, deliberately, and wiring one in
277 /// would be a mistake worth naming. goingson renders rows through a virtual
278 /// scroller whose `_render` calls its row builder **synchronously** while
279 /// scrolling; the code's own comment says scroll events fire at 60Hz+ and that
280 /// this is the hot path. Reaching Rust from there means an IPC round trip and
281 /// an `await` in that loop, per visible range, during a drag.
282 ///
283 /// So this is for the hosts where rendering already happens in Rust: an axum
284 /// route, and the router when it lands. There the objection does not apply,
285 /// because nothing crosses a process boundary to reach it. A webview app should
286 /// take [`narrowing_css`] and [`column_class`] and keep building its own rows.
287 #[must_use]
288 pub fn cells_html(columns: &[Column<'_>], cells: &[Cell<'_>], opts: &Emit) -> String {
289 let cell_class = class("cell", opts);
290 let mut html = String::new();
291
292 for column in columns {
293 let found = cells.iter().find(|cell| cell.column == column.name);
294 let mut classes = format!("{cell_class} {}", column_classes(column, opts));
295 if let Some(part) = found.and_then(|cell| cell.part) {
296 let _ = write!(classes, " {}", class(part_class(part), opts));
297 }
298 let _ = write!(
299 html,
300 "<div class=\"{classes}\">{}</div>",
301 found.map_or("", |cell| cell.content.0)
302 );
303 }
304 html
305 }
306
307 #[cfg(test)]
308 mod tests {
309 use super::*;
310
311 fn columns() -> Vec<Column<'static>> {
312 vec![
313 Column {
314 width: Width::Fill,
315 priority: Priority::Essential,
316 ..Column::new("description")
317 },
318 Column {
319 width: Width::Fixed,
320 priority: Priority::Secondary,
321 ..Column::new("due")
322 },
323 Column {
324 width: Width::Fixed,
325 priority: Priority::Optional,
326 ..Column::new("progress")
327 },
328 ]
329 }
330
331 fn sizing() -> Sizing<'static> {
332 Sizing {
333 lengths: &[
334 ("description", "200px"),
335 ("due", "110px"),
336 ("progress", "100px"),
337 ],
338 fallback: "",
339 }
340 }
341
342 #[test]
343 fn a_fill_column_gets_a_floor_and_the_slack() {
344 let tracks = grid_template_columns(&columns(), &sizing(), Priority::Optional);
345 assert_eq!(tracks, "minmax(200px, 1fr) 110px 100px");
346 }
347
348 #[test]
349 fn a_column_with_no_length_makes_no_claim() {
350 let sizing = Sizing::default();
351 let tracks = grid_template_columns(&columns(), &sizing, Priority::Optional);
352 assert_eq!(tracks, "minmax(auto, 1fr) auto auto");
353 }
354
355 /// The point of the module. Raising the cutoff drops columns by what they
356 /// are worth, and the track list shortens to match, so the two cannot
357 /// disagree the way a hand-written `nth-child` cut and a hand-written
358 /// track list can.
359 #[test]
360 fn raising_the_cutoff_drops_columns_and_their_tracks_together() {
361 let columns = columns();
362
363 let wide = grid_template_columns(&columns, &sizing(), Priority::Optional);
364 assert_eq!(wide.split(' ').count(), 4); // minmax(200px, + 1fr) + 2
365
366 let narrow = grid_template_columns(&columns, &sizing(), Priority::Secondary);
367 assert_eq!(narrow, "minmax(200px, 1fr) 110px");
368
369 let narrowest = grid_template_columns(&columns, &sizing(), Priority::Essential);
370 assert_eq!(narrowest, "minmax(200px, 1fr)");
371 }
372
373 #[test]
374 fn narrowing_hides_a_dropped_column_by_its_own_class_not_its_position() {
375 let css = narrowing_css(
376 &columns(),
377 ".ui-mode-mobile .task-row",
378 &sizing(),
379 Priority::Secondary,
380 &Emit::default(),
381 );
382 assert!(
383 css.contains("grid-template-columns: minmax(200px, 1fr) 110px;"),
384 "{css}"
385 );
386 assert!(
387 css.contains(".ui-mode-mobile .task-row > .col-progress {"),
388 "{css}"
389 );
390 assert!(!css.contains("nth-child"), "{css}");
391 // The kept columns are not mentioned as hidden.
392 assert!(!css.contains(".col-due {\n display: none"), "{css}");
393 }
394
395 /// A selector list has to distribute, or the earlier parts of it get the
396 /// child combinator appended to the whole and start matching things they
397 /// never named. This hid an entire table header the first time it ran.
398 #[test]
399 fn a_selector_list_distributes_the_hidden_column() {
400 let css = narrowing_css(
401 &columns(),
402 ".task-header-row, .task-row",
403 &sizing(),
404 Priority::Secondary,
405 &Emit::default(),
406 );
407 assert!(
408 css.contains(".task-header-row > .col-progress,\n.task-row > .col-progress {"),
409 "{css}"
410 );
411 // The bare header selector must never appear as a hiding target.
412 assert!(
413 !css.contains(".task-header-row {\n display: none"),
414 "{css}"
415 );
416 assert!(
417 css.contains(".task-header-row, .task-row {\n grid-template-columns:"),
418 "{css}"
419 );
420 }
421
422 #[test]
423 fn cells_follow_the_columns_and_carry_their_column_class() {
424 let cells = [
425 Cell {
426 column: "due",
427 part: Some(RowPart::Meta),
428 content: Markup("tomorrow"),
429 },
430 Cell::new("description", Markup("<span>Ship it</span>")),
431 ];
432 let html = cells_html(&columns(), &cells, &Emit::default());
433
434 // Column order, not cell order: description was passed second.
435 let description = html.find("Ship it").expect("description cell");
436 let due = html.find("tomorrow").expect("due cell");
437 assert!(description < due, "{html}");
438
439 // Three classes, not one: the column's own name, how wide it asks to
440 // be, and when it drops. The last two are what lets the stylesheet
441 // carry rules a described table cannot generate per table.
442 assert!(
443 html.contains(r#"<div class="cell col-description cell-fill cell-keeps">"#),
444 "{html}"
445 );
446 assert!(
447 html.contains(r#"<div class="cell col-due cell-fixed cell-drops-next row-meta">"#),
448 "{html}"
449 );
450 // progress had no cell, so it is present and empty rather than absent,
451 // or the grid would shift left by one.
452 assert!(
453 html.contains(r#"<div class="cell col-progress cell-fixed cell-drops-first"></div>"#),
454 "{html}"
455 );
456 }
457
458 #[test]
459 fn a_cell_naming_no_column_is_dropped() {
460 let cells = [Cell::new("nonexistent", Markup("nowhere"))];
461 let html = cells_html(&columns(), &cells, &Emit::default());
462 assert!(!html.contains("nowhere"), "{html}");
463 }
464
465 #[test]
466 fn the_class_prefix_reaches_the_cells_and_the_narrowing() {
467 let opts = Emit {
468 class_prefix: "mk-",
469 ..Emit::default()
470 };
471 let cells = [Cell::new("due", Markup("x"))];
472 assert!(
473 cells_html(&columns(), &cells, &opts).contains("mk-cell mk-col-due"),
474 "prefix missing"
475 );
476 assert!(
477 narrowing_css(&columns(), ".t", &sizing(), Priority::Secondary, &opts)
478 .contains(".mk-col-progress"),
479 "prefix missing"
480 );
481 }
482 }
483