@tristan2828/ui-foundation 4.12.0 → 4.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -934,15 +934,26 @@ row`), every editable cell is an editable value, exactly as on a view.
|
|
|
934
934
|
one is open, "Saving…" and a refusal in the cell. There's no pencil
|
|
935
935
|
column and no edit route.
|
|
936
936
|
|
|
937
|
-
- **A cell
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
937
|
+
- **A cell is one of the package's three row-edit cells**, or an
|
|
938
|
+
`<EditableValue label="<Column> of <name>" layout="inline"
|
|
939
|
+
edit={editInPlace({ ... })}>` for anything else. The label names the
|
|
940
|
+
column and the row, so its pencil reads "Edit Colour of Work" and its
|
|
941
|
+
control "Colour of Work".
|
|
942
|
+
- **`NameCell`**: one line; Enter saves, the form's rule (`schema`)
|
|
943
|
+
runs first, a taken name's 422 shows in the cell. `children` is how
|
|
944
|
+
the name shows at rest (an icon beside it).
|
|
945
|
+
- **`ChoiceCell<T>`** (`options`, `render`): the list opens with the
|
|
946
|
+
cell, non-modal; a pick saves, closing it with no pick gives up.
|
|
947
|
+
`render` draws a value at rest, on the trigger and in the list.
|
|
948
|
+
- **`LinkCell`** (`linkText`, `emptyLabel`, `save(link | null)`): a
|
|
949
|
+
link opening in a new tab (said to screen readers), or the not-set
|
|
950
|
+
label; edited as one line. A bare `example.com` gains `https://`,
|
|
951
|
+
another scheme (`javascript:`) is refused in the cell, and a blank
|
|
952
|
+
box saves `null`. Clicking the link follows it; the pencil edits.
|
|
943
953
|
- **A cell is a component** (`<Entity><Field>Cell`) that calls
|
|
944
954
|
`useEdit<Entity>Field(row.id)` for its save, the view's single-field
|
|
945
|
-
save. A hook can't be called
|
|
955
|
+
save, and renders the package's cell with it. A hook can't be called
|
|
956
|
+
inside a column definition.
|
|
946
957
|
- **Stable columns and row ids.** Make the column definitions once
|
|
947
958
|
(at module level, or `useMemo`) and give
|
|
948
959
|
`DataTable` a `getRowId`: new definitions every render, or rows keyed
|
|
@@ -958,24 +969,29 @@ column and no edit route.
|
|
|
958
969
|
and its delete together on a wide screen.
|
|
959
970
|
|
|
960
971
|
```tsx
|
|
961
|
-
|
|
972
|
+
import { ChoiceCell, InlineCreate, LinkCell, NameCell } from '@tristan2828/ui-foundation'
|
|
973
|
+
|
|
974
|
+
// Each cell is its own component, so it can call the record's save hook.
|
|
962
975
|
function CategoryColourCell({ category }: { category: Category }) {
|
|
963
976
|
const editField = useEditCategoryField(category.id) // optimistic: false, toastOnError: false
|
|
964
977
|
return (
|
|
965
|
-
<
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
978
|
+
<ChoiceCell label={`Colour of ${category.name}`} value={category.colour} options={CATEGORY_COLOURS}
|
|
979
|
+
render={(colour) => <ColourSwatch colour={colour} />}
|
|
980
|
+
save={(colour) => editField.mutateAsync({ colour })} />
|
|
981
|
+
)
|
|
982
|
+
}
|
|
983
|
+
function CategoryNameCell({ category }: { category: Category }) {
|
|
984
|
+
const editField = useEditCategoryField(category.id)
|
|
985
|
+
return (
|
|
986
|
+
<NameCell label={`Name of ${category.name}`} value={category.name} schema={categoryFormSchema.shape.name}
|
|
987
|
+
save={(name) => editField.mutateAsync({ name })} />
|
|
988
|
+
)
|
|
989
|
+
}
|
|
990
|
+
function CategoryWebsiteCell({ category }: { category: Category }) {
|
|
991
|
+
const editField = useEditCategoryField(category.id)
|
|
992
|
+
return (
|
|
993
|
+
<LinkCell label={`Website of ${category.name}`} value={category.website} emptyLabel="No website"
|
|
994
|
+
save={(website) => editField.mutateAsync({ website })} />
|
|
979
995
|
)
|
|
980
996
|
}
|
|
981
997
|
|
|
@@ -983,6 +999,7 @@ function CategoryColourCell({ category }: { category: Category }) {
|
|
|
983
999
|
const CATEGORY_COLUMNS: LegacyColumnDef<Category, unknown>[] = [
|
|
984
1000
|
{ id: 'name', header: 'Name', cell: ({ row }) => <CategoryNameCell category={row.original} /> },
|
|
985
1001
|
{ id: 'colour', header: 'Colour', cell: ({ row }) => <CategoryColourCell category={row.original} /> },
|
|
1002
|
+
{ id: 'website', header: 'Website', cell: ({ row }) => <CategoryWebsiteCell category={row.original} /> },
|
|
986
1003
|
{ id: 'actions', header: () => <span className="sr-only">Actions</span>, cell: ({ row }) => <DeleteCategoryAction category={row.original} /> },
|
|
987
1004
|
]
|
|
988
1005
|
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import type { ReactNode } from 'react';
|
|
2
|
+
import { type EditInPlaceOptions } from './edit-in-place.js';
|
|
3
|
+
type Schema<TValue> = EditInPlaceOptions<unknown, TValue>['schema'];
|
|
4
|
+
export type NameCellProps = {
|
|
5
|
+
/** The cell's name, column and row: "Name of Home". */
|
|
6
|
+
label: string;
|
|
7
|
+
/** The saved name. */
|
|
8
|
+
value: string;
|
|
9
|
+
/** Saves the new name (already checked by `schema`). Rejects with the AppError. */
|
|
10
|
+
save: (name: string) => Promise<unknown>;
|
|
11
|
+
/** The form's rule for the name (`schema.shape.name`): checked before anything is sent. */
|
|
12
|
+
schema?: Schema<string>;
|
|
13
|
+
/** How the name shows at rest (an icon beside it). Defaults to the name. */
|
|
14
|
+
children?: ReactNode;
|
|
15
|
+
/** The input's width class. Defaults to `w-48`. */
|
|
16
|
+
inputClassName?: string;
|
|
17
|
+
};
|
|
18
|
+
/** A name in one line: Enter saves, the form's rule runs first, a taken name's 422 shows in the cell. */
|
|
19
|
+
export declare function NameCell({ label, value, save, schema, children, inputClassName }: NameCellProps): import("react").JSX.Element;
|
|
20
|
+
export type ChoiceCellProps<T extends string> = {
|
|
21
|
+
/** The cell's name, column and row: "Colour of Home". */
|
|
22
|
+
label: string;
|
|
23
|
+
/** The saved value. */
|
|
24
|
+
value: T;
|
|
25
|
+
/** Every value, in the order the list shows them. */
|
|
26
|
+
options: readonly T[];
|
|
27
|
+
/** How a value shows: at rest, on the open trigger and in the list (a swatch and its word). */
|
|
28
|
+
render: (value: T) => ReactNode;
|
|
29
|
+
/** Saves the picked value. Rejects with the AppError. */
|
|
30
|
+
save: (value: T) => Promise<unknown>;
|
|
31
|
+
/** The trigger's width class. Defaults to `w-40`. */
|
|
32
|
+
triggerClassName?: string;
|
|
33
|
+
};
|
|
34
|
+
/** A single choice: its list opens with the cell, a pick saves, closing it with no pick gives up. */
|
|
35
|
+
export declare function ChoiceCell<T extends string>({ label, value, options, render, save, triggerClassName, }: ChoiceCellProps<T>): import("react").JSX.Element;
|
|
36
|
+
export type LinkCellProps = {
|
|
37
|
+
/** The cell's name, column and row: "Website of Home". */
|
|
38
|
+
label: string;
|
|
39
|
+
/** The saved address, or null when there's none. */
|
|
40
|
+
value: string | null;
|
|
41
|
+
/** Saves the address, or null to clear it (the box left blank). Rejects with the AppError. */
|
|
42
|
+
save: (link: string | null) => Promise<unknown>;
|
|
43
|
+
/** The link's text at rest. Defaults to the address without its scheme. */
|
|
44
|
+
linkText?: string | ((href: string) => ReactNode);
|
|
45
|
+
/** What the cell says with no address. Defaults to "Not set". */
|
|
46
|
+
emptyLabel?: string;
|
|
47
|
+
/** The input's width class. Defaults to `w-64`. */
|
|
48
|
+
inputClassName?: string;
|
|
49
|
+
};
|
|
50
|
+
/** An optional link: shown as a link out (or the not-set label), edited as one line; blank clears it. */
|
|
51
|
+
export declare function LinkCell({ label, value, save, linkText, emptyLabel, inputClassName }: LinkCellProps): import("react").JSX.Element;
|
|
52
|
+
export {};
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { ExternalLinkIcon } from 'lucide-react';
|
|
3
|
+
import { Input } from '../ui/input.js';
|
|
4
|
+
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../ui/select.js';
|
|
5
|
+
import { linkHref } from '../../lib/link-href.js';
|
|
6
|
+
import { editInPlace } from './edit-in-place.js';
|
|
7
|
+
import { EditableValue } from './editable-value.js';
|
|
8
|
+
/** A name in one line: Enter saves, the form's rule runs first, a taken name's 422 shows in the cell. */
|
|
9
|
+
export function NameCell({ label, value, save, schema, children, inputClassName = 'w-48' }) {
|
|
10
|
+
return (_jsx(EditableValue, { label: label, layout: "inline", edit: editInPlace({
|
|
11
|
+
kind: 'text',
|
|
12
|
+
value,
|
|
13
|
+
schema,
|
|
14
|
+
save,
|
|
15
|
+
control: (props) => (_jsx(Input, { id: props.id, className: inputClassName, value: props.value, readOnly: props.disabled, "aria-invalid": props.invalid || undefined, "aria-label": props.label, "aria-describedby": props.describedBy, onChange: (event) => props.onChange(event.target.value) })),
|
|
16
|
+
}), children: children ?? value }));
|
|
17
|
+
}
|
|
18
|
+
/** A single choice: its list opens with the cell, a pick saves, closing it with no pick gives up. */
|
|
19
|
+
export function ChoiceCell({ label, value, options, render, save, triggerClassName = 'w-40', }) {
|
|
20
|
+
return (_jsx(EditableValue, { label: label, layout: "inline", edit: editInPlace({
|
|
21
|
+
kind: 'choice',
|
|
22
|
+
value,
|
|
23
|
+
save,
|
|
24
|
+
control: (props) => (_jsxs(Select, { value: props.value, onValueChange: (next) => {
|
|
25
|
+
if (next)
|
|
26
|
+
props.commit(next);
|
|
27
|
+
}, disabled: props.disabled, defaultOpen: true, modal: false, onOpenChange: (open) => {
|
|
28
|
+
if (!open)
|
|
29
|
+
props.cancel();
|
|
30
|
+
}, children: [_jsx(SelectTrigger, { id: props.id, className: triggerClassName, "aria-invalid": props.invalid || undefined, "aria-label": props.label, "aria-describedby": props.describedBy, children: _jsx(SelectValue, { children: (shown) => render(shown) }) }), _jsx(SelectContent, { children: options.map((option) => (_jsx(SelectItem, { value: option, children: render(option) }, option))) })] })),
|
|
31
|
+
}), children: render(value) }));
|
|
32
|
+
}
|
|
33
|
+
// A web or email address (`example.com` gains https://), blank for none.
|
|
34
|
+
// Another scheme (`javascript:`) is refused before anything is sent.
|
|
35
|
+
const LINK_RULE = {
|
|
36
|
+
safeParse: (value) => {
|
|
37
|
+
const href = linkHref(String(value ?? ''));
|
|
38
|
+
if (href === '')
|
|
39
|
+
return { success: true, data: null };
|
|
40
|
+
if (href === null) {
|
|
41
|
+
return { success: false, error: { issues: [{ message: 'Use a web or email address' }] } };
|
|
42
|
+
}
|
|
43
|
+
return { success: true, data: href };
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
function shownLinkText(href, linkText) {
|
|
47
|
+
if (typeof linkText === 'function')
|
|
48
|
+
return linkText(href);
|
|
49
|
+
return linkText ?? href.replace(/^(https?:\/\/|mailto:)/i, '').replace(/\/$/, '');
|
|
50
|
+
}
|
|
51
|
+
/** An optional link: shown as a link out (or the not-set label), edited as one line; blank clears it. */
|
|
52
|
+
export function LinkCell({ label, value, save, linkText, emptyLabel = 'Not set', inputClassName = 'w-64' }) {
|
|
53
|
+
// Only an address the editor would have saved is shown as a link: a
|
|
54
|
+
// stored `javascript:` reads as text, never as something to click.
|
|
55
|
+
const href = value ? linkHref(value) : null;
|
|
56
|
+
return (_jsx(EditableValue, { label: label, layout: "inline", edit: editInPlace({
|
|
57
|
+
kind: 'text',
|
|
58
|
+
value: value ?? '',
|
|
59
|
+
schema: LINK_RULE,
|
|
60
|
+
save,
|
|
61
|
+
control: (props) => (_jsx(Input, { id: props.id, type: "url", inputMode: "url", className: inputClassName, value: props.value, placeholder: "https://", readOnly: props.disabled, "aria-invalid": props.invalid || undefined, "aria-label": props.label, "aria-describedby": props.describedBy, onChange: (event) => props.onChange(event.target.value) })),
|
|
62
|
+
}), children: !value ? (_jsx("span", { className: "text-muted-foreground", children: emptyLabel })) : href ? (_jsxs("a", { href: href, target: "_blank", rel: "noreferrer", className: "rounded-sm text-link underline underline-offset-4 outline-none focus-visible:ring-3 focus-visible:ring-ring/50", children: [shownLinkText(href, linkText), _jsx(ExternalLinkIcon, { "aria-hidden": "true", className: "ml-0.5 inline size-3 align-baseline" }), _jsx("span", { className: "sr-only", children: " (opens in a new tab)" })] })) : (value) }));
|
|
63
|
+
}
|
package/dist/index.d.ts
CHANGED
|
@@ -29,6 +29,7 @@ export { StepBar, type StepBarProps } from './components/app/step-bar.js';
|
|
|
29
29
|
export { RatingStar, type RatingStarProps, type RatingStarValue } from './components/app/rating-star.js';
|
|
30
30
|
export { DateField, type DateFieldProps } from './components/app/date-field.js';
|
|
31
31
|
export { formatPlainDate, type PlainDate } from './lib/plain-date.js';
|
|
32
|
+
export { ChoiceCell, LinkCell, NameCell, type ChoiceCellProps, type LinkCellProps, type NameCellProps, } from './components/app/row-edit-cells.js';
|
|
32
33
|
export { WidgetCard, WidgetList, WidgetListItem, type WidgetCardProps, type WidgetListItemProps, } from './components/app/widget-card.js';
|
|
33
34
|
export { ThemeProvider } from './components/theme-provider.js';
|
|
34
35
|
export { LoginRoute, type LoginRouteProps } from './routes/login.js';
|
package/dist/index.js
CHANGED
|
@@ -34,6 +34,7 @@ export { StepBar } from './components/app/step-bar.js';
|
|
|
34
34
|
export { RatingStar } from './components/app/rating-star.js';
|
|
35
35
|
export { DateField } from './components/app/date-field.js';
|
|
36
36
|
export { formatPlainDate } from './lib/plain-date.js';
|
|
37
|
+
export { ChoiceCell, LinkCell, NameCell, } from './components/app/row-edit-cells.js';
|
|
37
38
|
export { WidgetCard, WidgetList, WidgetListItem, } from './components/app/widget-card.js';
|
|
38
39
|
export { ThemeProvider } from './components/theme-provider.js';
|
|
39
40
|
// Screens outside the app shell
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tristan2828/ui-foundation",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.13.0",
|
|
4
4
|
"description": "Shared UI foundation for contract-first, database-backed React apps: shadcn primitives, DataTable/EntityForm composites, auth, the gateway error seam, design tokens, lint rules and the AI playbook.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|