From 9b139b632098e6741b10fa87ff6224dcb5045947 Mon Sep 17 00:00:00 2001
From: f0x52 <f0x@cthu.lu>
Date: Wed, 18 Jan 2023 14:45:14 +0100
Subject: [frogend] Settings refactor (#1318)

* yakshave new form field structure

* fully refactor user profile settings form

* use rtk query api for profile settings

* refactor user post settings

* refactor password change form

* refactor admin settings

* FormWithData structure for user forms

* admin actions refactor

* whitespace

* fix user settings data prop

* remove superfluous logging

* cleanup old code

* refactor federation/suspend (overview, detail)

* mostly abstracted (emoji) checkbox list

* refactor parse-from-toot

* refactor custom-emoji, progress on federation bulk

* loading icon styling to prevent big spinny

* refactor federation import-export interface

* cleanup old files

* [chore] Update/add license headers for 2023

* redux fixes

* text-field exports

* appease the linter

* refactor authentication with RTK Query

* fix login/logout state transition weirdness

* fixes/cleanup

* small linter-related fixes

* add eslint license header check, fix existing files

* remove old code, clarify comment

* clarify suspend on subdomains

* collapse if/else

* fa-fw width info comment
---
 web/source/settings/components/combo-box.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'web/source/settings/components/combo-box.jsx')

diff --git a/web/source/settings/components/combo-box.jsx b/web/source/settings/components/combo-box.jsx
index 07d4abb6c..aaa56daac 100644
--- a/web/source/settings/components/combo-box.jsx
+++ b/web/source/settings/components/combo-box.jsx
@@ -26,21 +26,21 @@ const {
 	ComboboxPopover,
 } = require("ariakit/combobox");
 
-module.exports = function ComboBox({state, items, label, placeHolder, children}) {
+module.exports = function ComboBox({ field, items, label, children, ...inputProps }) {
 	return (
 		<div className="form-field combobox-wrapper">
 			<label>
 				{label}
 				<div className="row">
 					<Combobox
-						state={state}
-						placeholder={placeHolder}
+						state={field.state}
 						className="combobox input"
+						{...inputProps}
 					/>
 					{children}
 				</div>
 			</label>
-			<ComboboxPopover state={state} className="popover">
+			<ComboboxPopover state={field.state} className="popover">
 				{items.map(([key, value]) => (
 					<ComboboxItem className="combobox-item" key={key} value={key}>
 						{value}
-- 
cgit v1.2.3