mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 19:01:39 -04:00
* review: the 375px phone this fix had not been measured on Answers the five findings on #660. * Recurring's four fixed columns wanted 416px between them, so at 375px the URL column got exactly 0 and the table overflowed again -- the same bug as before, moved down from 540px. Widths are phone-first now, in col-* classes, widening at the tablet breakpoint. * The in-progress button in Completed At carried "5 MBps / 3m44s" -- 169-188px measured, against 124px of column. It shows the percent; the modal it opens already lists speed, ETA and bytes, and the full text is on the button's title. * The select column was 2.5em: 16.5px of content for a 22px checkbox, which hung into the URL column. 3em holds the checkbox and its padding. * The Cypress fixtures were a raw <table>, so tableLayout would read 'fixed' even with the selector that loses to Mantine -- the test could not fail for the reason it claimed. They mount SortableTable, Table.HeaderCell onSort and a real Checkbox now, and the header check measures the text rather than skipping cells with no element child. * Comments trimmed to what cannot be recovered from the code. Fixing the first surfaced one more: once URL became the small column, its own header overran -- "URL" and its arrow need 72px against 58 -- and a single word cannot wrap. A header is clipped by its column as a last resort. Measured at 375px: once 46/58/123/146, recurring 44/100/104/57/69, nothing overflowing. 69 suites / 1214 jest tests pass. The Cypress tests here are NOT verified: the component runner does not start in this repo (see the separate cypress investigation), so every layout claim above rests on direct measurement in Chrome, not on that suite. * review: the 375px phone this fix had not been measured on Answers the five findings on #660, and now runs against a component suite that can actually execute (#661). * Recurring's four fixed columns wanted 416px between them, so at 375px the URL got exactly 0 and the table overflowed -- the same bug as before, moved down from 540px. Widths are phone-first now, in col-* classes, widening at the tablet breakpoint. * The in-progress button in Completed At carried "5 MBps / 3m44s", 169-188px against 124px of column. It shows the percent; the modal it opens already lists speed, ETA and bytes, and the full text is on the button's title. * The select column was 2.5em: 16.5px of content for a 22px checkbox, which hung into the URL column. 3em holds the checkbox and its padding. * The fixtures were a raw <table>, so tableLayout read 'fixed' even with the selector that loses to Mantine -- the test could not fail for the reason it claimed. They mount SortableTable, Table.HeaderCell onSort and a real Checkbox now. * Comments trimmed to what cannot be recovered from the code. Two defects the restored suite caught, neither of them findable before it ran: * The elastic URL column ends up narrower than its own header -- "URL" and its arrow need 72px against 58 -- and one word cannot wrap, so the column clips. A sized column must fit its label; only the elastic one may clip. That is what the header test asserts, per kind of column, rather than measuring text and calling it the label: the first version measured the text alone, missed the sort arrow, and passed while the button overran by 14px. * Recurring's Control column was 4.5em, 70px of content for a 78px "Control". Sized for the word rather than the button it holds: 5.2em. At 375px: once 46/58/123/146, recurring 33/100/104/57/80, nothing overflowing and no sized header clipped. The URL column there is 33px -- the accepted trade for keeping every column on a phone. 336 component tests pass, 69 suites / 1214 jest tests pass, npm run build is clean. * review: a header assertion that stopped at the padding box Three findings on #662. * The sized-header check compared scrollWidth to clientWidth, which is the padding box, so a label could overflow its content box into the padding and pass -- the same class of miss the 4.5em Control failure was meant to close. It measures the label's longest word (plus the sort arrow, where there is one) against the content box now. That found two more columns tuned to their exact limit and clipping by a pixel: Download Frequency wanted 79.4px of a 78.1px box, Completed At 82.3 of 81.9. Every sized column now has margin over its own label. * SortableTable stopped applying `width`, leaving dead keys at the Tags and Zim call sites. Removed, so a column is sized one way. CollectionTable's `width` is NOT dead -- it converts sixteenths to percentages -- so Channels, Docs, Playlists and Archive keep theirs. * Comments trimmed again: the percent button, the header clip, the ButtonGroup rule and the Cypress helper. 336 component tests pass, 69 suites / 1214 jest tests pass. * ui: a phone header short enough to leave room for the URL Five full-length headers do not fit a phone. Sized so each held its own label, the recurring URL column came out 20px -- narrower than one character and its ellipsis, a column present but carrying nothing. A long header carries both forms and `.label-*` shows one: Freq and Done below the tablet breakpoint, Download Frequency and Completed At above it, where there is room. The mobile widths are sized for the short word. At 375px the URL column goes from 20px to 105px on the recurring table and 54px to 97px on the once table. Nothing overflows, nothing clips, and every column stays. 336 component tests pass, 69 suites / 1214 jest tests pass, npm run build is clean.
91 lines
3.3 KiB
JavaScript
91 lines
3.3 KiB
JavaScript
import React from "react";
|
|
import _ from "lodash";
|
|
import {Table} from "./ui";
|
|
import {TextPlaceholder} from "./Placeholder";
|
|
|
|
export class SortableTable extends React.Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.state = {
|
|
sortColumn: props.defaultSortColumn || null,
|
|
direction: props.defaultDirection || 'ascending',
|
|
};
|
|
}
|
|
|
|
changeSort = (key) => {
|
|
const {sortColumn, direction} = this.state;
|
|
if (key === sortColumn) {
|
|
this.setState({direction: direction === 'ascending' ? 'descending' : 'ascending'});
|
|
} else {
|
|
this.setState({sortColumn: key, direction: 'ascending'});
|
|
}
|
|
}
|
|
|
|
sortData = (data) => {
|
|
let {tableHeaders, defaultSortColumn} = this.props;
|
|
let {sortColumn, direction} = this.state;
|
|
|
|
const sortKey = sortColumn || defaultSortColumn;
|
|
const sortHeader = _.find(tableHeaders, {key: sortKey});
|
|
if (sortHeader === undefined) {
|
|
// No sort header, probably no default defined.
|
|
return data;
|
|
}
|
|
data = _.sortBy(data, sortHeader['sortBy']);
|
|
data = direction === 'descending' ? data.reverse() : data;
|
|
return data;
|
|
}
|
|
|
|
render() {
|
|
let {rowFunc, tableHeaders, rowKey} = this.props;
|
|
let {direction, sortColumn} = this.state;
|
|
rowKey = rowKey || 'key';
|
|
|
|
const data = this.props['data'] ? this.sortData(this.props['data']) : null;
|
|
|
|
const tableHeader = (spec) => {
|
|
// Under `table-layout: fixed` the header cell is where a column's width is
|
|
// declared; a column that names none divides what is left. `className` rather
|
|
// than a width so the value can change at a breakpoint.
|
|
const {key, text, sortBy, className} = spec;
|
|
if (sortBy) {
|
|
const active = sortColumn === key;
|
|
return <Table.HeaderCell
|
|
key={key}
|
|
className={className}
|
|
sorted={active ? direction : null}
|
|
onSort={() => this.changeSort(key)}
|
|
>
|
|
{text}
|
|
</Table.HeaderCell>;
|
|
} else {
|
|
return <Table.HeaderCell key={key} className={className}>{text}</Table.HeaderCell>
|
|
}
|
|
}
|
|
|
|
// Use placeholder while data is null.
|
|
let rows = <Table.Row><Table.Cell colSpan={tableHeaders.length}><TextPlaceholder/></Table.Cell></Table.Row>;
|
|
if (data !== null) {
|
|
if (data.length > 0) {
|
|
// Convert data to table rows.
|
|
rows = data.map(i => <React.Fragment key={i[rowKey]}>{rowFunc(i, this.sortData)}</React.Fragment>);
|
|
} else {
|
|
// No results in data.
|
|
rows = this.props.emptyRow
|
|
|| <Table.Row><Table.Cell colSpan={tableHeaders.length}>No results</Table.Cell></Table.Row>;
|
|
}
|
|
}
|
|
|
|
return <Table {...this.props.tableProps}>
|
|
<Table.Header>
|
|
<Table.Row>
|
|
{tableHeaders.map(tableHeader)}
|
|
</Table.Row>
|
|
</Table.Header>
|
|
<Table.Body>
|
|
{rows}
|
|
</Table.Body>
|
|
{this.props.footer}
|
|
</Table>
|
|
}
|
|
}
|