From f5039b9877cda9942ecf226960a1037743e82bc4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 5 May 2022 16:35:30 -0500
Subject: [PATCH] SoapboxConfig: refactor inputs

---
 app/soapbox/components/ui/input/input.tsx     |  6 +--
 app/soapbox/features/soapbox_config/index.tsx | 39 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/soapbox/components/ui/input/input.tsx b/app/soapbox/components/ui/input/input.tsx
index cab86e10e..75ab74601 100644
--- a/app/soapbox/components/ui/input/input.tsx
+++ b/app/soapbox/components/ui/input/input.tsx
@@ -11,7 +11,7 @@ const messages = defineMessages({
   hidePassword: { id: 'input.password.hide_password', defaultMessage: 'Hide password' },
 });
 
-interface IInput extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'maxLength' | 'onChange' | 'type' | 'autoComplete' | 'autoCorrect' | 'autoCapitalize' | 'required' | 'disabled' | 'onClick' | 'readOnly'> {
+interface IInput extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'maxLength' | 'onChange' | 'type' | 'autoComplete' | 'autoCorrect' | 'autoCapitalize' | 'required' | 'disabled' | 'onClick' | 'readOnly' | 'min' | 'pattern'> {
   /** Put the cursor into the input on mount. */
   autoFocus?: boolean,
   /** The initial text in the input. */
@@ -27,11 +27,11 @@ interface IInput extends Pick<React.InputHTMLAttributes<HTMLInputElement>, 'maxL
   /** Text to display before a value is entered. */
   placeholder?: string,
   /** Text in the input. */
-  value?: string,
+  value?: string | number,
   /** Change event handler for the input. */
   onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void,
   /** HTML input type. */
-  type: 'text' | 'email' | 'tel' | 'password',
+  type: 'text' | 'number' | 'email' | 'tel' | 'password',
 }
 
 /** Form input element. */
diff --git a/app/soapbox/features/soapbox_config/index.tsx b/app/soapbox/features/soapbox_config/index.tsx
index e44e4cbfd..9411212cb 100644
--- a/app/soapbox/features/soapbox_config/index.tsx
+++ b/app/soapbox/features/soapbox_config/index.tsx
@@ -5,12 +5,10 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 import { updateConfig } from 'soapbox/actions/admin';
 import { uploadMedia } from 'soapbox/actions/media';
 import snackbar from 'soapbox/actions/snackbar';
-import { Column, Form, FormActions, Button } from 'soapbox/components/ui';
+import { Column, Form, FormActions, FormGroup, Input, Button } from 'soapbox/components/ui';
 import Streamfield from 'soapbox/components/ui/streamfield/streamfield';
 import {
   FieldsGroup,
-  TextInput,
-  SimpleInput,
   SimpleTextarea,
   FileChooserLogo,
   Checkbox,
@@ -220,15 +218,16 @@ const SoapboxConfig: React.FC = () => {
               </div>
             </div>
           </FieldsGroup>
-          <FieldsGroup>
-            <TextInput
-              name='copyright'
-              label={intl.formatMessage(messages.copyrightFooterLabel)}
+
+          <FormGroup labelText={intl.formatMessage(messages.copyrightFooterLabel)}>
+            <Input
+              type='text'
               placeholder={intl.formatMessage(messages.copyrightFooterLabel)}
               value={soapbox.copyright}
               onChange={handleChange(['copyright'], (e) => e.target.value)}
             />
-          </FieldsGroup>
+          </FormGroup>
+
           <FieldsGroup>
             <Checkbox
               name='verifiedCanEditName'
@@ -263,13 +262,14 @@ const SoapboxConfig: React.FC = () => {
               onChange={handleChange(['singleUserMode'], (e) => e.target.checked)}
             />
             {soapbox.get('singleUserMode') && (
-              <TextInput
-                name='singleUserModeProfile'
-                label={intl.formatMessage(messages.singleUserModeProfileLabel)}
-                placeholder={intl.formatMessage(messages.singleUserModeProfileHint)}
-                value={soapbox.singleUserModeProfile}
-                onChange={handleChange(['singleUserModeProfile'], (e) => e.target.value)}
-              />
+              <FormGroup labelText={intl.formatMessage(messages.singleUserModeProfileLabel)}>
+                <Input
+                  type='text'
+                  placeholder={intl.formatMessage(messages.singleUserModeProfileHint)}
+                  value={soapbox.singleUserModeProfile}
+                  onChange={handleChange(['singleUserModeProfile'], (e) => e.target.value)}
+                />
+              </FormGroup>
             )}
           </FieldsGroup>
 
@@ -303,18 +303,17 @@ const SoapboxConfig: React.FC = () => {
             onRemoveItem={deleteStreamItem(['cryptoAddresses'])}
           />
 
-          <FieldsGroup>
-            <SimpleInput
+          <FormGroup labelText={intl.formatMessage(messages.cryptoDonatePanelLimitLabel)}>
+            <Input
               type='number'
               min={0}
               pattern='[0-9]+'
-              name='cryptoDonatePanelLimit'
-              label={intl.formatMessage(messages.cryptoDonatePanelLimitLabel)}
               placeholder={intl.formatMessage(messages.cryptoDonatePanelLimitLabel)}
               value={soapbox.cryptoDonatePanel.get('limit')}
               onChange={handleChange(['cryptoDonatePanel', 'limit'], (e) => Number(e.target.value))}
             />
-          </FieldsGroup>
+          </FormGroup>
+
           <Accordion
             headline={intl.formatMessage(messages.rawJSONLabel)}
             expanded={jsonEditorExpanded}