@digigov/form 2.0.0-2a26e869 → 2.0.0-44e7106a

package/src/Field/index.tsx

@@ -16,7 +16,6 @@ import FieldArray from '@digigov/form/FieldArray';
 import Multiplicity from '@digigov/form/MultiplicityField';
 export const Field: React.FC<FieldProps> = ({
   name,
-  disabled,
   children,
   ...customField
 }) => {
@@ -25,6 +24,7 @@ export const Field: React.FC<FieldProps> = ({
     control,
     register,
     reset,
+    resetField,
     error,
     componentRegistry,
     formState,
@@ -47,12 +47,12 @@ export const Field: React.FC<FieldProps> = ({
       ),
     [field]
   );
-
   if (calculatedField.condition) {
     return (
       <FieldConditional
         control={control}
         reset={reset}
+        resetField={resetField}
         register={register}
         field={calculatedField as FieldWithCondition}
         error={error}
@@ -65,10 +65,18 @@ export const Field: React.FC<FieldProps> = ({
     return (
       <FieldArray
         control={control}
+        trigger={trigger}
         register={register}
-        error={error}
+        clearErrors={clearErrors}
+        error={
+          formState.isSubmitted && !formState.isSubmitting ? error : undefined
+        }
+        getValues={getValues}
+        setValue={setValue}
         formState={formState}
         Field={Field}
+        reset={reset}
+        resetField={resetField}
         {...calculatedField}
       />
     );
@@ -89,20 +97,27 @@ export const Field: React.FC<FieldProps> = ({
         setValue={setValue}
         getValues={getValues}
         unregister={unregister}
+        resetField={resetField}
         Field={Field}
         {...calculatedField}
       />
     );
   }
+  const editable =
+    customField.editable === false || customField.disabled === true
+      ? false
+      : true;
+  const customError = error ? error : formState?.errors[name];
   return (
     <FieldBase
       {...calculatedField}
+      editable={editable}
       name={name}
-      disabled={disabled}
       control={control}
       register={register}
       reset={reset}
-      error={error}
+      error={customError}
+      resetField={resetField}
       Field={Field}
     />
   );

package/src/Field/types.tsx

@@ -1,11 +1,13 @@
 import React from 'react';
 import { ErrorOption, UseFormReturn, UseFormProps } from 'react-hook-form';
 import { ValidatorSchema } from '@digigov/form/validators/types';
+import { FieldsetLegendProps } from '@digigov/ui/form/FieldContainer';
 import { GridProps } from '@digigov/ui/layouts/Grid';
 
 export interface FieldLabelProps {
   primary?: string;
   secondary?: string;
+  hint?: string;
 }
 
 export interface FieldSpec {
@@ -21,8 +23,10 @@ export interface FieldSpec {
     | 'choice:single'
     | 'mobile_phone'
     | 'date'
+    | 'datetime'
     | 'otp'
     | 'afm'
+    | 'amka'
     | 'iban'
     | 'file'
     | 'image'
@@ -33,15 +37,17 @@ export interface FieldSpec {
   trim?: boolean;
   component?: any;
   autoComplete?: string;
+  placeholder?: string;
   maxLength?: number;
   condition?: Record<string, FieldCondition>;
   controlled?: boolean;
   label?: FieldLabelProps;
   extra?: Record<string, any>;
   editable?: boolean;
+  variant?: 'inline' | 'dialog';
   required?: boolean;
   enabled?: boolean;
-  disabled?: boolean;
+  disabled?: boolean; // TODO: keep disabled or editable
   layout?: Record<
     string,
     | GridProps['xs']
@@ -76,6 +82,7 @@ export interface FieldConditionalProps {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
+  resetField?: UseFormReturn['resetField'];
   error?: ErrorOption;
   Field: React.FC<FieldProps>;
 }
@@ -89,12 +96,15 @@ export interface FieldComponentItem {
 
 export interface FieldContainerProps {
   name?: FieldSpec['key'];
+  register: FieldBaseProps['register'];
   layout?: FieldSpec['layout'];
   label?: FieldSpec['label'];
   error?: ErrorOption | Record<string, any>;
   hasError?: boolean;
   children?: React.ReactNode;
+  controlled?: boolean;
   wrapper?: FieldSpec['wrapper'];
+  labelSize?: FieldsetLegendProps['size'];
 }
 
 export type FieldComponentRegistry = Record<string, FieldComponentItem>;
@@ -113,7 +123,7 @@ export interface ControlledFieldProps {
   error?: boolean;
   name?: string;
   disabled?: boolean;
-  Field: React.FC<FieldProps>;
+  Field?: React.FC<FieldProps>;
 }
 
 export interface UncontrolledFieldProps {
@@ -141,7 +151,8 @@ export interface FieldBaseProps extends CalculatedField {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
-  Field: React.FC<FieldProps>;
+  resetField?: UseFormReturn['resetField'];
+  Field?: React.FC<FieldProps>;
 }
 
 export interface FieldProps extends FieldSpec {
@@ -154,6 +165,7 @@ export interface UseFieldProps {
   control: FieldBaseProps['control'];
   register: FieldBaseProps['register'];
   reset: FieldBaseProps['reset'];
+  resetField: FieldBaseProps['resetField'];
   watch: UseFormReturn['watch'];
   formState: UseFormReturn['formState'];
   getFieldState: UseFormReturn['getFieldState'];

package/src/Field/utils/index.ts

@@ -2,6 +2,7 @@ import { FieldComponentRegistry } from '@digigov/form/Field/types';
 import AutoCompleteInput from '@digigov/form/inputs/AutoCompleteInput';
 import Checkboxes from '@digigov/form/inputs/Checkboxes';
 import DateInput from '@digigov/form/inputs/DateInput';
+import DateTimeInput from '@digigov/form/inputs/DateTimeInput';
 import FileInput from '@digigov/form/inputs/FileInput';
 import ImageInput from '@digigov/form/inputs/ImageInput';
 import Input from '@digigov/form/inputs/Input';
@@ -19,6 +20,7 @@ export const FIELD_COMPONENTS: FieldComponentRegistry = {
   file: {
     wrapper: 'fieldset',
     component: FileInput,
+    // controlled: true,
   },
   image: {
     wrapper: 'fieldset',
@@ -29,6 +31,11 @@ export const FIELD_COMPONENTS: FieldComponentRegistry = {
     controlled: true,
     component: DateInput,
   },
+  datetime: {
+    wrapper: 'fieldset',
+    controlled: true,
+    component: DateTimeInput,
+  },
   otp: {
     wrapper: 'fieldset',
     controlled: true,

package/src/Field/utils/useField.ts

@@ -11,6 +11,7 @@ export const useField = (
     control,
     register,
     reset,
+    resetField,
     trigger,
     clearErrors,
     errors,
@@ -23,14 +24,24 @@ export const useField = (
     unregister,
     formState,
   } = useContext(FormContext);
-
   if (!registerField) {
     throw new Error(`
       You can't use the Field component without wrapping it in FormBuilder.
       https://devs.pages.grnet.gr/digigov/digigov-sdk/sdk-docs/forms/create-simple-form/
     `);
   }
+  let error = errors[name];
 
+  const nameIndexRegex = name.match(/^\[*(.*?)\.(\d+)\]*$/);
+  if (nameIndexRegex) {
+    const [, fieldArrayName, indexStr] = nameIndexRegex;
+    error = errors[fieldArrayName]?.[Number(indexStr)];
+  }
+  const nestedNameIndexRegex = name.match(/^\[*(.*?)\.(\d+)\.(.*?)\]*$/);
+  if (nestedNameIndexRegex) {
+    const [, fieldArrayName, indexStr, fieldItemName] = nestedNameIndexRegex;
+    error = errors[fieldArrayName]?.[Number(indexStr)]?.[fieldItemName];
+  }
   useMemo(
     () => customField?.type && registerField({ ...customField, key: name }),
     [customField, name, registerField]
@@ -40,6 +51,7 @@ export const useField = (
     control,
     register,
     reset,
+    resetField,
     trigger,
     watch,
     componentRegistry,
@@ -49,6 +61,6 @@ export const useField = (
     getValues,
     unregister,
     formState,
-    error: errors[name],
+    error,
   };
 };

package/src/FieldArray/FieldArray.stories.js

@@ -5,4 +5,5 @@ export default {
   displayName: 'FieldArray',
 };
 export { Default } from '@digigov/form/FieldArray/__stories__/Default';
+export { WithModal } from '@digigov/form/FieldArray/__stories__/WithModal';
 export { WithExactLength } from '@digigov/form/FieldArray/__stories__/WithExactLength';