mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-22 07:56:18 -05:00
ui: thirty-five files off Semantic, leaving fifteen
Phase 2, part 4. Baseline 50 -> 15.
Migrated: all eight calculators, the rest of inventory and collections, the
Map/Zim/Docs cluster, Videos, Files, Search, Archive, DashboardPage,
DatesSelector, HelpModal, Events, Tags, Flasher's neighbours, admin Settings
and Status, Download, and App.
Also the three shared modules everything imports: api.js and customHooks.js
swap the Semantic toast library for the library's shim (same call shape), and
useForm.js renders the library's Message. useForm accepts both the old
`{content, header, positive|negative}` shape and the new `{kind, title}`,
because the pages building those objects migrate separately.
Two library gaps closed, both found by call sites needing them:
ActionInput is a forwardRef now. Its ref reaches the input rather than the
wrapper, because callers use it to focus or select the field -- a ref to the
surrounding div would do neither, which is why one call site had resorted to
hand-copying the component's markup.
Header takes a `color` token name. Three separate call sites had reached for
an inline style to colour a heading that carries meaning ("3 items to add"
against "2 to remove"), which is how a hex ends up in markup.
Two files needed repair after being interrupted mid-edit: MapViewer had a
Segment left in its error branch, and VideoPlayer had lost the useContext
import its own code still used. Neither jest nor tsc noticed; only
`npm run build` did, which is the whole reason that check exists.
Fifteen files remain: Archive, BulkTagModal, Channels, Docs, FileBrowser,
FilePreview, Flasher, Nav, Playlists, Theme.tsx, Upload, VideoPlayer, Zim,
ControllerPage, admin/Downloads. Theme.tsx is deliberately last -- the
unmigrated files still import its Semantic-backed wrappers, so it can only go
once they have.
This commit is contained in:
parent
16bdffbac7
commit
906705e5b4
48 changed files with 3273 additions and 3877 deletions
|
|
@ -1,4 +1,4 @@
|
|||
import React from 'react';
|
||||
import React, {forwardRef} from 'react';
|
||||
import {
|
||||
Checkbox as MCheckbox,
|
||||
MultiSelect,
|
||||
|
|
@ -71,13 +71,18 @@ export interface ActionInputProps extends React.ComponentProps<typeof MTextInput
|
|||
* as a single control — the input's own right border is dropped and the button
|
||||
* supplies the edge.
|
||||
*/
|
||||
export function ActionInput({action, className, ...props}: ActionInputProps) {
|
||||
if (!action) return <MTextInput className={className} {...props}/>
|
||||
export const ActionInput = forwardRef<HTMLInputElement, ActionInputProps>((
|
||||
{action, className, ...props}, ref
|
||||
) => {
|
||||
// The ref reaches the input, not the wrapper: callers use it to focus or select the
|
||||
// field, and a ref to the surrounding div would do neither.
|
||||
if (!action) return <MTextInput ref={ref} className={className} {...props}/>
|
||||
return <div className={['wrolpi-action-input', className].filter(Boolean).join(' ')}>
|
||||
<MTextInput {...props}/>
|
||||
<MTextInput ref={ref} {...props}/>
|
||||
{action}
|
||||
</div>
|
||||
}
|
||||
});
|
||||
ActionInput.displayName = 'ActionInput';
|
||||
|
||||
export {
|
||||
MTextInput as TextInput,
|
||||
|
|
|
|||
|
|
@ -21,6 +21,12 @@ export interface HeaderProps extends Omit<React.HTMLAttributes<HTMLHeadingElemen
|
|||
subheader?: React.ReactNode;
|
||||
/** Hairline rule underneath, separating the section from what follows. */
|
||||
dividing?: boolean;
|
||||
/**
|
||||
* A token colour name (`green`, `red`, ...) for a heading that carries meaning —
|
||||
* "3 items to add" against "2 items to remove". Call sites kept reaching for an
|
||||
* inline style to do this, which is how a hex ends up in the markup.
|
||||
*/
|
||||
color?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -30,11 +36,17 @@ export interface HeaderProps extends Omit<React.HTMLAttributes<HTMLHeadingElemen
|
|||
* Sizes come from ui.css, keyed on the level, rather than each call site
|
||||
* choosing — that is what keeps the type scale a scale.
|
||||
*/
|
||||
export function Header({as = 'h3', icon, subheader, dividing, className, children, ...props}: HeaderProps) {
|
||||
export function Header({
|
||||
as = 'h3', icon, subheader, dividing, color, className, style, children, ...props
|
||||
}: HeaderProps) {
|
||||
const Tag = as;
|
||||
return <div className={['wrolpi-header', dividing ? 'wrolpi-header-dividing' : '', className]
|
||||
.filter(Boolean).join(' ')}>
|
||||
<Tag className={`wrolpi-header-text wrolpi-header-${as}`} {...props}>
|
||||
<Tag
|
||||
className={`wrolpi-header-text wrolpi-header-${as}`}
|
||||
style={color ? {color: `var(--${color})`, ...style} : style}
|
||||
{...props}
|
||||
>
|
||||
{icon && (typeof icon === 'string'
|
||||
? <Icon name={icon} size='medium'/>
|
||||
: <Icon component={icon} size='medium'/>)}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue