fix: form fields

collective · Mar 12, 2021 · e69764c · e69764c
1 parent 58fd2d0
commit e69764c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/src/components/Field.jsx b/src/components/Field.jsx
@@ -55,6 +55,7 @@ const Field = ({
           description={description}
           required={required}
           onChange={onChange}
+          value={value}
           invalid={isInvalid().toString()}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />
@@ -67,6 +68,7 @@ const Field = ({
           description={description}
           required={required}
           onChange={onChange}
+          value={value}
           rows={10}
           invalid={isInvalid().toString()}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
@@ -80,9 +82,8 @@ const Field = ({
           description={description}
           getVocabulary={() => {}}
           getVocabularyTokenTitle={() => {}}
-          choices={[
-            ...(input_values?.map((v) => ({ value: v, label: v })) ?? []),
-          ]}
+          choices={[...(input_values?.map((v) => [v, v]) ?? [])]}
+          value={value}
           onChange={onChange}
           placeholder={intl.formatMessage(messages.select_a_value)}
           aria-label={intl.formatMessage(messages.select_a_value)}
@@ -101,6 +102,7 @@ const Field = ({
           valueList={[
             ...(input_values?.map((v) => ({ value: v, label: v })) ?? []),
           ]}
+          value={value}
           invalid={isInvalid().toString()}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />
@@ -114,6 +116,7 @@ const Field = ({
           required={required}
           onChange={onChange}
           invalid={isInvalid().toString()}
+          value={value}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />
       )}
@@ -125,7 +128,9 @@ const Field = ({
           description={description}
           dateOnly={true}
           noPastDates={false}
+          resettable={false}
           onChange={onChange}
+          value={value}
           invalid={isInvalid().toString()}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />
@@ -134,10 +139,10 @@ const Field = ({
         <FileWidget
           id={name}
           name={name}
-          label={getLabel()}
+          title={getLabel()}
+          description={description}
           type="file"
           required={required}
-          infoText={description}
           invalid={isInvalid().toString()}
           onChange={onChange}
           onEdit={isOnEdit}
@@ -152,6 +157,7 @@ const Field = ({
           description={description}
           required={required}
           onChange={onChange}
+          value={value}
           invalid={isInvalid().toString()}
           {...(isInvalid() ? { className: 'is-invalid' } : {})}
         />

diff --git a/src/components/FormView.jsx b/src/components/FormView.jsx
@@ -62,7 +62,7 @@ const FormView = ({
   return (
     <div className="block form">
       <div className="public-ui">
-        <Segment>
+        <Segment style={{ margin: '2rem 0' }} padded>
           {formState.error ? (
             <Message error role="alert">
               <Message.Header as="h4">
@@ -121,7 +121,7 @@ const FormView = ({
                   </Message>
                 )}
 
-                <Grid.Row centered>
+                <Grid.Row centered style={{ paddingTop: '3rem' }}>
                   <Grid.Column textAlign="center">
                     <Button
                       primary

diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
@@ -261,9 +261,7 @@ const Sidebar = ({
                       value={subblock.field_type || ''}
                       onChange={(name, value) => {
                         var update_values = {};
-                        if (
-                          ['select', 'radio', 'checkbox'].indexOf(value) < 0
-                        ) {
+                        if (['select', 'radio'].indexOf(value) < 0) {
                           update_values.input_values = null;
                         }
                         onChangeSubBlock(index, {
@@ -299,9 +297,7 @@ const Sidebar = ({
                       ]}
                     />
 
-                    {['select', 'radio', 'checkbox'].indexOf(
-                      subblock.field_type,
-                    ) >= 0 && (
+                    {['select', 'radio'].indexOf(subblock.field_type) >= 0 && (
                       <ArrayWidget
                         id="input_values"
                         title={intl.formatMessage(messages.field_input_values)}

diff --git a/src/components/Widget/FileWidget.jsx b/src/components/Widget/FileWidget.jsx
@@ -83,16 +83,16 @@ const FileWidget = (props) => {
               disabled={props.isDisabled}
               {...getInputProps({
                 type: 'file',
-                style: { display: 'none' },
+                style: { display: 'block' },
               })}
               onChange={({ target }) => {
                 const file = target.files[0];
                 onUpload(file);
               }}
             />
-            <div className="field-file-name">
-              {value && value.filename}
-              {value && (
+            {value && (
+              <div className="field-file-name">
+                {value.filename}
                 <Button
                   icon
                   basic
@@ -106,8 +106,8 @@ const FileWidget = (props) => {
                 >
                   <Icon name={deleteSVG} size="20px" />
                 </Button>
-              )}
-            </div>
+              </div>
+            )}
           </div>
         )}
       </Dropzone>