@digigov/form 2.0.0-cbc56209 → 2.0.0-d2ffc726

package/src/FormContext.tsx

@@ -1,8 +1,12 @@
-import React from 'react';
-import { createContext } from 'react';
-import { FormContextProps } from '@digigov/form/types';
+import type React from 'react';
+import { createContext, useContext } from 'react';
+import type { FormContextProps } from '@digigov/form/types';
 
 export const FormContext: React.Context<FormContextProps> = createContext({
   fieldsMap: {},
   fieldsetsMap: {},
 } as FormContextProps);
+
+export const useFormContext = () => {
+  return useContext(FormContext);
+};

package/src/MultiplicityField/MultiplicityField.stories.js

@@ -1,12 +1,15 @@
 import MultiplicityField from '@digigov/form/MultiplicityField';
+import doc from './doc.mdx?raw';
 export default {
   title: 'Digigov Form/MultiplicityField',
   component: MultiplicityField,
+  tags: ['autodocs'],
+  markdown: doc,
   displayName: 'MultiplicityField',
 };
-export * from '@digigov/form/MultiplicityField/__stories__/Default';
-export * from '@digigov/form/MultiplicityField/__stories__/WithMinLength';
-export * from '@digigov/form/MultiplicityField/__stories__/WithMaxLength';
-export * from '@digigov/form/MultiplicityField/__stories__/WithMinAndMaxLength';
-export * from '@digigov/form/MultiplicityField/__stories__/WithExactLength';
-export * from '@digigov/form/MultiplicityField/__stories__/PreviewDisplay';
+export { Default } from '@digigov/form/MultiplicityField/__stories__/Default';
+export { PreviewDisplay } from '@digigov/form/MultiplicityField/__stories__/PreviewDisplay';
+export { WithMinLength } from '@digigov/form/MultiplicityField/__stories__/WithMinLength';
+export { WithMaxLength } from '@digigov/form/MultiplicityField/__stories__/WithMaxLength';
+export { WithMinAndMaxLength } from '@digigov/form/MultiplicityField/__stories__/WithMinAndMaxLength';
+export { WithExactLength } from '@digigov/form/MultiplicityField/__stories__/WithExactLength';

package/src/MultiplicityField/__stories__/Default.tsx

@@ -85,7 +85,7 @@ const fields = [
   },
 ] as FieldSpec[];
 
-export const Default = () => (
+export const Default = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/MultiplicityField/__stories__/PreviewDisplay.tsx

@@ -61,7 +61,7 @@ const fields = [
   },
 ];
 
-export const PreviewDisplay = () => (
+export const PreviewDisplay = (_: any) => (
   <Layout>
     <Header>
       <HeaderContent>
@@ -83,7 +83,7 @@ export const PreviewDisplay = () => (
         <Card variant="border" borderColor="dark">
           <CardHeading>Συνυπογράφοντας 1</CardHeading>
           <CardContent>
-            <SummaryList>
+            <SummaryList noLastBorder marginBottom={0}>
               {fields &&
                 fields.map((field, index) => {
                   return (
@@ -99,7 +99,7 @@ export const PreviewDisplay = () => (
         <Card variant="border" borderColor="dark">
           <CardHeading>Συνυπογράφοντας 2</CardHeading>
           <CardContent>
-            <SummaryList>
+            <SummaryList noLastBorder marginBottom={0}>
               {fields &&
                 fields.map((field, index) => {
                   return (

package/src/MultiplicityField/__stories__/WithExactLength.tsx

@@ -61,7 +61,7 @@ const fields = [
               },
             },
             {
-              key: 'bod',
+              key: 'dob',
               required: true,
               type: 'date',
               label: {
@@ -84,7 +84,7 @@ const fields = [
   },
 ] as FieldSpec[];
 
-export const WithExactLength = () => (
+export const WithExactLength = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/MultiplicityField/__stories__/WithMaxLength.tsx

@@ -61,7 +61,7 @@ const fields = [
               },
             },
             {
-              key: 'bod',
+              key: 'dob',
               required: true,
               type: 'date',
               label: {
@@ -87,7 +87,7 @@ const fields = [
   },
 ] as FieldSpec[];
 
-export const WithMaxLength = () => (
+export const WithMaxLength = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/MultiplicityField/__stories__/WithMinAndMaxLength.tsx

@@ -62,7 +62,7 @@ const fields = [
               },
             },
             {
-              key: 'bod',
+              key: 'dob',
               required: true,
               type: 'date',
               label: {
@@ -88,7 +88,7 @@ const fields = [
   },
 ] as FieldSpec[];
 
-export const WithMinAndMaxLength = () => (
+export const WithMinAndMaxLength = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/MultiplicityField/__stories__/WithMinLength.tsx

@@ -61,7 +61,7 @@ const fields = [
               },
             },
             {
-              key: 'bod',
+              key: 'dob',
               required: true,
               type: 'date',
               label: {
@@ -87,7 +87,7 @@ const fields = [
   },
 ] as FieldSpec[];
 
-export const WithMinLength = () => (
+export const WithMinLength = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/MultiplicityField/add-objects.tsx

@@ -1,24 +1,23 @@
-/* eslint-disable react/prop-types */
 import React, { useEffect, useMemo } from 'react';
-// import { FormBuilderProps } from '@digigov/form';
-import {
+import type {
   ErrorOption,
   FieldArrayWithId,
   UseFieldArrayReturn,
-  useWatch,
 } from 'react-hook-form';
+import { useWatch } from 'react-hook-form';
 import { FieldBase } from '@digigov/form/Field/FieldBase';
-import { CalculatedField } from '@digigov/form/Field/types';
-import { calculateField, useField } from '@digigov/form/Field/utils';
-import FieldObject from '@digigov/form/FieldObject';
-import {
+import { resolveField } from '@digigov/form/Field/utils/resolveField';
+import { useField } from '@digigov/form/Field/utils/useField';
+import { FieldObject } from '@digigov/form/FieldObject';
+import { Fieldset } from '@digigov/form/Fieldset';
+import type {
   MultiplicityProps,
   StashedObject,
-} from '@digigov/form/MultiplicityField';
-import { FieldSpec } from '@digigov/form/types';
-import Fieldset from '@digigov/react-core/Fieldset';
-import RadioConditional from '@digigov/react-core/RadioConditional';
-import Button from '@digigov/ui/form/Button';
+} from '@digigov/form/MultiplicityField/types';
+import type { FieldSpec } from '@digigov/form/types';
+import { Button } from '@digigov/ui/form/Button';
+import { RadioConditional } from '@digigov/ui/form/RadioContainer';
+
 export interface AddObjectsProps
   extends Omit<MultiplicityProps, 'key' | 'component'> {
   fields: FieldArrayWithId[];
@@ -27,6 +26,7 @@ export interface AddObjectsProps
   remove: UseFieldArrayReturn['remove'];
   stashedObjects: StashedObject[];
   onStash: (arg0: StashedObject) => void;
+  children?: React.ReactNode;
 }
 
 export const AddObjects: React.FC<AddObjectsProps> = ({
@@ -42,8 +42,10 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
   setValue,
   stashedObjects,
   getValues,
+  resetField,
   onStash,
   error,
+  Field,
 }) => {
   const currentIndex = fields.length > 0 ? fields.length - 1 : fields.length;
   const currentName = `${name}.${currentIndex}`;
@@ -67,6 +69,7 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
       options: [
         {
           label: { primary: extra?.label.question.yes },
+          id: `radio-input-${name}-yes`,
           value: 'yes',
           selected: function RadioSelected() {
             return (
@@ -91,14 +94,17 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
                     />
                     <Button
                       color="secondary"
+                      name={`${currentName}-add-object`}
                       onClick={async (e) => {
                         e.preventDefault();
                         const nestedFields = extra?.of.extra.fields.map(
                           (f) => `${currentName}.${f.key}`
                         );
                         const result = await trigger(nestedFields);
-                        result && setValue('needs-more', '');
-                        result && onStash(getValues(currentName));
+                        if (result) {
+                          setValue('needs-more', '');
+                          onStash(getValues(currentName));
+                        }
                       }}
                     >
                       {extra?.label.object.add}
@@ -111,21 +117,22 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
         },
         {
           label: { primary: extra?.label.question.no },
+          id: `radio-input-${name}-no`,
           value: 'no',
         },
       ],
     },
   };
 
-  const { field, control, register, reset, error: needsMoreError } = useField(
-    radioField.key,
-    radioField?.type ? radioField : null
-  );
+  const {
+    field,
+    control,
+    register,
+    reset,
+    error: needsMoreError,
+  } = useField(radioField.key, radioField?.type ? radioField : null);
 
-  const calculatedField: CalculatedField = useMemo(
-    () => calculateField(children, field),
-    [field]
-  );
+  const resolvedField = useMemo(() => resolveField(children, field), [field]);
   const needsMore = useWatch({ name: field.key, control });
 
   useEffect(() => {
@@ -140,25 +147,25 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
 
   // TODO: Refactor types so that label is always required, the following
   // assignment is a temp fix for typescript build to run
-  calculatedField.label = calculatedField.label || {};
+  resolvedField.label = resolvedField.label || {};
   if (extra?.length) {
-    calculatedField.label.secondary = `Έχετε προσθέσει ${
+    resolvedField.label.secondary = `Έχετε προσθέσει ${
       stashedObjects.length
     } εγγραφές και σας απομένουν ακόμα ${
       extra.length - stashedObjects.length
     } εγγραφές.`;
   } else if (extra?.min && extra?.max) {
-    calculatedField.label.secondary = `Το πεδίο πρέπει να έχει ακόμα ${
+    resolvedField.label.secondary = `Το πεδίο πρέπει να έχει ακόμα ${
       extra?.min - stashedObjects.length
     } και το μέγιστο ${
       extra?.max
     } εγγραφές. Προσθέστε μια ακόμα επιλέγοντας την απάντηση «Ναι» στην επόμενη ερώτηση.`;
   } else if (extra?.min) {
-    calculatedField.label.secondary = `Το πεδίο πρέπει να έχει ακόμα ${
+    resolvedField.label.secondary = `Το πεδίο πρέπει να έχει ακόμα ${
       extra?.min - stashedObjects.length
     } εγγραφές. Προσθέστε μια ακόμα επιλέγοντας την απάντηση «Ναι» στην επόμενη ερώτηση.`;
   } else if (extra?.max) {
-    calculatedField.label.secondary = ` Έχετε προσθέσει ${
+    resolvedField.label.secondary = ` Έχετε προσθέσει ${
       stashedObjects.length
     } εγγραφές και σας απομένουν ${
       extra.max - stashedObjects.length
@@ -167,11 +174,13 @@ export const AddObjects: React.FC<AddObjectsProps> = ({
   return (
     <Fieldset>
       <FieldBase
-        {...calculatedField}
-        name={calculatedField.key}
+        {...resolvedField}
+        name={resolvedField.key}
         control={control}
         register={register}
         reset={reset}
+        resetField={resetField}
+        Field={Field}
         error={
           extra?.max - stashedObjects.length === 0 ||
           extra?.length - stashedObjects.length === 0