diff options
| author | 2023-02-03 12:07:40 +0100 | |
|---|---|---|
| committer | 2023-02-03 12:07:40 +0100 | |
| commit | a59dc855d94b332ca01b4a2477ef94ee68da9fe6 (patch) | |
| tree | 0f8397b591927d317a2400e6f2d7f6ef1ef527db /web/source/settings/components | |
| parent | [chore] Text formatting overhaul (#1406) (diff) | |
| download | gotosocial-a59dc855d94b332ca01b4a2477ef94ee68da9fe6.tar.xz | |
[feature/frogend] (Mastodon) domain block CSV import (#1390)
* checkbox-list styling with taller <p> element
* CSV import/export, UI/UX improvements to import-export interface
* minor styling tweaks
* csv export, clean up export type branching
* abstract domain block entry validation
* foundation for PSL check + suggestions
* Squashed commit of the following:
commit e3655ba4fbea1d55738b2f9e407d3378af26afe6
Author: f0x <f0x@cthu.lu>
Date:   Tue Jan 31 15:19:10 2023 +0100
    let debug depend on env (prod/debug) again
commit 79c792b832a2b59e472dcdff646bad6d71b42cc9
Author: f0x <f0x@cthu.lu>
Date:   Tue Jan 31 00:34:01 2023 +0100
    update checklist components
commit 4367960fe4be4e3978077af06e63a729d64e32fb
Author: f0x <f0x@cthu.lu>
Date:   Mon Jan 30 23:46:20 2023 +0100
    checklist performance improvements
commit 204a4c02d16ffad189a6e8a6001d5bf4ff95fc4e
Author: f0x <f0x@cthu.lu>
Date:   Mon Jan 30 20:05:34 2023 +0100
    checklist field: use reducer for state
* remove debug logging
* show and use domain block suggestion
* restructure import/export buttons
* updating suggestions
* suggestion overview
* restructure check-list behavior, domain import/export
Diffstat (limited to 'web/source/settings/components')
| -rw-r--r-- | web/source/settings/components/check-list.jsx | 82 | ||||
| -rw-r--r-- | web/source/settings/components/form/inputs.jsx | 3 | 
2 files changed, 59 insertions, 26 deletions
diff --git a/web/source/settings/components/check-list.jsx b/web/source/settings/components/check-list.jsx index 1276d5dbf..569cd7470 100644 --- a/web/source/settings/components/check-list.jsx +++ b/web/source/settings/components/check-list.jsx @@ -20,39 +20,71 @@  const React = require("react"); -module.exports = function CheckList({ field, Component, header = " All", ...componentProps }) { +module.exports = function CheckList({ field, header = "All", EntryComponent, getExtraProps }) {  	return (  		<div className="checkbox-list list"> -			<label className="header"> -				<input -					ref={field.toggleAll.ref} -					type="checkbox" -					onChange={field.toggleAll.onChange} -					checked={field.toggleAll.value === 1} -				/> {header} -			</label> -			{Object.values(field.value).map((entry) => ( -				<CheckListEntry -					key={entry.key} -					onChange={(value) => field.onChange(entry.key, value)} -					entry={entry} -					Component={Component} -					componentProps={componentProps} -				/> -			))} +			<CheckListHeader toggleAll={field.toggleAll}>	{header}</CheckListHeader> +			<CheckListEntries +				entries={field.value} +				updateValue={field.onChange} +				EntryComponent={EntryComponent} +				getExtraProps={getExtraProps} +			/>  		</div>  	);  }; -function CheckListEntry({ entry, onChange, Component, componentProps }) { +function CheckListHeader({ toggleAll, children }) {  	return ( -		<label className="entry"> +		<label className="header entry">  			<input +				ref={toggleAll.ref}  				type="checkbox" -				onChange={(e) => onChange({ checked: e.target.checked })} -				checked={entry.checked} -			/> -			<Component entry={entry} onChange={onChange} {...componentProps} /> +				onChange={toggleAll.onChange} +			/> {children}  		</label>  	); -}
\ No newline at end of file +} + +const CheckListEntries = React.memo( +	function CheckListEntries({ entries, updateValue, EntryComponent, getExtraProps }) { +		const deferredEntries = React.useDeferredValue(entries); + +		return Object.values(deferredEntries).map((entry) => ( +			<CheckListEntry +				key={entry.key} +				entry={entry} +				updateValue={updateValue} +				EntryComponent={EntryComponent} +				getExtraProps={getExtraProps} +			/> +		)); +	} +); + +/* +	React.memo is a performance optimization that only re-renders a CheckListEntry +	when it's props actually change, instead of every time anything +	in the list (CheckListEntries) updates +*/ +const CheckListEntry = React.memo( +	function CheckListEntry({ entry, updateValue, getExtraProps, EntryComponent }) { +		const onChange = React.useCallback( +			(value) => updateValue(entry.key, value), +			[updateValue, entry.key] +		); + +		const extraProps = React.useMemo(() => getExtraProps?.(entry), [getExtraProps, entry]); + +		return ( +			<label className="entry"> +				<input +					type="checkbox" +					onChange={(e) => onChange({ checked: e.target.checked })} +					checked={entry.checked} +				/> +				<EntryComponent entry={entry} onChange={onChange} extraProps={extraProps} /> +			</label> +		); +	} +);
\ No newline at end of file diff --git a/web/source/settings/components/form/inputs.jsx b/web/source/settings/components/form/inputs.jsx index eef375ee8..19386b6f2 100644 --- a/web/source/settings/components/form/inputs.jsx +++ b/web/source/settings/components/form/inputs.jsx @@ -22,9 +22,10 @@ const React = require("react");  function TextInput({ label, field, ...inputProps }) {  	const { onChange, value, ref } = field; +	console.log(field.name, field.valid, field.value);  	return ( -		<div className="form-field text"> +		<div className={`form-field text${field.valid ? "" : " invalid"}`}>  			<label>  				{label}  				<input  | 
