@digigov/form 2.0.0-49de50c4 → 2.0.0-555d1027

package/inputs/ImageInput/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/ImageInput/index.tsx"],
-  "sourcesContent": ["import React, { useState, useCallback } from 'react';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonGroup } from '@digigov/ui/form/Button';\nimport { FileUpload, FileUploadContainer } from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\nimport { Base } from '@digigov/ui/utils/Base';\nexport interface ImageProps {\n  src?: any;\n}\n\nexport interface Limit {\n  maxSize?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n  minWidth?: number;\n  minHeight?: number;\n}\n\nexport const Image: React.FC<ImageProps> = React.memo(function Image({ src }) {\n  return <Base as=\"img\" src={src} className=\"ds-image--ratio\" />;\n});\nexport interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    className?: string;\n    multiple?: boolean;\n    accept?: string;\n    limit?: Limit;\n  };\n  reset: (values?: any) => void;\n  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;\n}\n\nexport const ImageInput: React.FC<ImageInputProps> = React.forwardRef(\n  function ImageInput({ name, disabled, onChange, reset, ...props }, ref: any) {\n    const { t } = useTranslation();\n    const [selectedImage, setSelectedImage] = useState<File | null>(null);\n    const [imageUrl, setImageUrl] = useState<string | null>(null);\n    const handleImageChange = useCallback(\n      (e: React.ChangeEvent<HTMLInputElement>) => {\n        e.preventDefault();\n        const target = e.target as HTMLInputElement;\n        const selectedFile = target.files?.[0];\n\n        if (selectedFile) {\n          setSelectedImage(selectedFile);\n          setImageUrl(URL.createObjectURL(selectedFile));\n        }\n        onChange(e);\n      },\n      [selectedImage]\n    );\n\n    const handleDeleteImage = useCallback(\n      (event) => {\n        event.preventDefault();\n        reset({ [name]: '' });\n        setSelectedImage(null);\n        setImageUrl('');\n      },\n      [selectedImage]\n    );\n\n    return (\n      <>\n        <FileUploadContainer>\n          {selectedImage !== null ? (\n            <>\n              <Paragraph>\n                <Base as=\"b\">{t('upload.image')}:</Base>{' '}\n                {`${selectedImage?.name}`}\n              </Paragraph>\n            </>\n          ) : (\n            <Hint className=\"ds-dashed--border\">{t('upload.no_image')}</Hint>\n          )}\n          <>\n            {selectedImage !== null && <Image src={imageUrl} />}\n            <ButtonGroup marginTop={2}>\n              {selectedImage !== null && (\n                <Button variant=\"link\" onClick={handleDeleteImage}>\n                  {t('upload.reset_file')}\n                </Button>\n              )}\n              <FileUpload\n                ref={ref}\n                hasFiles={selectedImage !== null}\n                name={name}\n                id={name}\n                disabled={disabled}\n                accept=\"image/*\"\n                onChange={handleImageChange}\n                {...{\n                  ...props,\n                  required: undefined,\n                  Field: undefined,\n                  type: 'file',\n                }}\n              >\n                {t('upload.choose_image')}\n              </FileUpload>\n            </ButtonGroup>\n          </>\n        </FileUploadContainer>\n      </>\n    );\n  }\n);\n\nexport default ImageInput;\n"],
-  "mappings": "AAAA,OAAO,SAAS,UAAU,mBAAmB;AAE7C,SAAS,QAAQ,mBAAmB;AACpC,SAAS,YAAY,2BAA2B;AAChD,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AACrB,SAAS,iBAAiB;AAC1B,SAAS,YAAY;AAad,MAAM,QAA8B,MAAM,KAAK,SAASA,OAAM,EAAE,IAAI,GAAG;AAC5E,SAAO,oCAAC,QAAK,IAAG,OAAM,KAAU,WAAU,mBAAkB;AAC9D,CAAC;AAYM,MAAM,aAAwC,MAAM;AAAA,EACzD,SAASC,YAAW,EAAE,MAAM,UAAU,UAAU,OAAO,GAAG,MAAM,GAAG,KAAU;AAC3E,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,CAAC,eAAe,gBAAgB,IAAI,SAAsB,IAAI;AACpE,UAAM,CAAC,UAAU,WAAW,IAAI,SAAwB,IAAI;AAC5D,UAAM,oBAAoB;AAAA,MACxB,CAAC,MAA2C;AAC1C,UAAE,eAAe;AACjB,cAAM,SAAS,EAAE;AACjB,cAAM,eAAe,OAAO,QAAQ,CAAC;AAErC,YAAI,cAAc;AAChB,2BAAiB,YAAY;AAC7B,sBAAY,IAAI,gBAAgB,YAAY,CAAC;AAAA,QAC/C;AACA,iBAAS,CAAC;AAAA,MACZ;AAAA,MACA,CAAC,aAAa;AAAA,IAChB;AAEA,UAAM,oBAAoB;AAAA,MACxB,CAAC,UAAU;AACT,cAAM,eAAe;AACrB,cAAM,EAAE,CAAC,IAAI,GAAG,GAAG,CAAC;AACpB,yBAAiB,IAAI;AACrB,oBAAY,EAAE;AAAA,MAChB;AAAA,MACA,CAAC,aAAa;AAAA,IAChB;AAEA,WACE,0DACE,oCAAC,2BACE,kBAAkB,OACjB,0DACE,oCAAC,iBACC,oCAAC,QAAK,IAAG,OAAK,EAAE,cAAc,GAAE,GAAC,GAAQ,KACxC,GAAG,eAAe,IAAI,EACzB,CACF,IAEA,oCAAC,QAAK,WAAU,uBAAqB,EAAE,iBAAiB,CAAE,GAE5D,0DACG,kBAAkB,QAAQ,oCAAC,SAAM,KAAK,UAAU,GACjD,oCAAC,eAAY,WAAW,KACrB,kBAAkB,QACjB,oCAAC,UAAO,SAAQ,QAAO,SAAS,qBAC7B,EAAE,mBAAmB,CACxB,GAEF;AAAA,MAAC;AAAA;AAAA,QACC;AAAA,QACA,UAAU,kBAAkB;AAAA,QAC5B;AAAA,QACA,IAAI;AAAA,QACJ;AAAA,QACA,QAAO;AAAA,QACP,UAAU;AAAA,QACT,GAAG;AAAA,UACF,GAAG;AAAA,UACH,UAAU;AAAA,UACV,OAAO;AAAA,UACP,MAAM;AAAA,QACR;AAAA;AAAA,MAEC,EAAE,qBAAqB;AAAA,IAC1B,CACF,CACF,CACF,CACF;AAAA,EAEJ;AACF;AAEA,IAAO,qBAAQ;",
+  "sourcesContent": ["import React, { useRef, useState, useEffect, useCallback } from 'react';\nimport { UseFormReturn } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { Button, ButtonGroup } from '@digigov/ui/form/Button';\nimport { FileUpload, FileUploadContainer } from '@digigov/ui/form/FileUpload';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\nimport { Paragraph } from '@digigov/ui/typography/Paragraph';\nimport { Base } from '@digigov/ui/utils/Base';\nexport interface ImageProps {\n  src: string;\n}\n\nexport interface Limit {\n  maxSize?: number;\n  maxWidth?: number;\n  maxHeight?: number;\n  minWidth?: number;\n  minHeight?: number;\n}\n\nexport const Image: React.FC<ImageProps> = React.memo(function Image({ src }) {\n  return <Base as=\"img\" src={src} className=\"ds-image--ratio\" />;\n});\n\ninterface ImageInputDefaultValue {\n  filename: string;\n  src: string;\n}\n\nconst blobToFileList = (blob: Blob, fileName: string): FileList => {\n  const file = new File([blob], fileName, { type: 'image/jpeg' });\n  const dataTransfer = new DataTransfer();\n  dataTransfer.items.add(file);\n  return dataTransfer.files;\n};\nexport interface ImageInputProps extends Omit<UncontrolledFieldProps, 'extra'> {\n  extra?: {\n    className?: string;\n    multiple?: boolean;\n    accept?: string;\n    limit?: Limit;\n  };\n  reset: (values?: any) => void;\n  resetField: UseFormReturn['resetField'];\n  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;\n  defaultValue?: ImageInputDefaultValue | null;\n  value: any;\n}\n\nexport const ImageInput: React.FC<ImageInputProps> = React.forwardRef(\n  function ImageInput(\n    { name, disabled, onChange, resetField, defaultValue, value, ...props },\n    ref: any\n  ) {\n    const imageRef = useRef(ref?.current);\n    const { t } = useTranslation();\n    const currentValue: ImageInputDefaultValue | null =\n      defaultValue || value || null;\n    const [selectedImage, setSelectedImage] = useState<\n      File | ImageInputDefaultValue | null\n    >(currentValue);\n    const [imageUrl, setImageUrl] = useState<string | null>(\n      currentValue?.src || null\n    );\n\n    const handleImageChange = useCallback(\n      (e: React.ChangeEvent<HTMLInputElement>) => {\n        e.preventDefault();\n        const target = e.target as HTMLInputElement;\n        const selectedFile = target.files?.[0];\n        if (selectedFile) {\n          setSelectedImage(selectedFile);\n          setImageUrl(URL.createObjectURL(selectedFile));\n        }\n        onChange(\n          target.files as unknown as React.ChangeEvent<HTMLInputElement>\n        );\n      },\n      [selectedImage]\n    );\n\n    const handleDeleteImage = useCallback(\n      (event) => {\n        event.preventDefault();\n        resetField(name);\n        setSelectedImage(null);\n        setImageUrl(null);\n      },\n      [selectedImage]\n    );\n\n    useEffect(() => {\n      // This is to fill the input with the default value (image)\n      if (defaultValue?.src && imageRef.current) {\n        fetch(defaultValue?.src)\n          .then((response) => response.blob())\n          .then((blob) => {\n            const fileList = blobToFileList(blob, defaultValue.filename);\n            imageRef.current.files = fileList;\n            const fileChangeEvent = new Event('change', { bubbles: true });\n            imageRef.current.dispatchEvent(fileChangeEvent);\n            return;\n          })\n          .catch((error) => console.error('Error fetching image:', error));\n      }\n    }, [defaultValue, imageRef]);\n\n    return (\n      <FileUploadContainer>\n        {selectedImage !== null ? (\n          <>\n            <Paragraph>\n              <Base as=\"b\">{t('upload.image')}:</Base>{' '}\n              <em>\n                {`${(selectedImage as File)?.name || (selectedImage as ImageInputDefaultValue)?.filename}`}\n              </em>\n            </Paragraph>\n          </>\n        ) : (\n          <Hint className=\"ds-dashed--border\">{t('upload.no_image')}</Hint>\n        )}\n        {imageUrl !== null && selectedImage !== null && (\n          <Image src={imageUrl} />\n        )}\n        {!disabled && (\n          <ButtonGroup marginTop={2}>\n            <FileUpload\n              ref={imageRef}\n              hasFiles={selectedImage !== null}\n              name={name}\n              id={name}\n              disabled={disabled}\n              accept=\"image/*\"\n              onChange={handleImageChange}\n              {...{\n                ...(props as any),\n                required: undefined,\n                Field: undefined,\n                type: 'file',\n              }}\n            >\n              {selectedImage\n                ? t('upload.change_image')\n                : t('upload.choose_image')}\n            </FileUpload>\n            {selectedImage !== null && (\n              <Button\n                color=\"warning\"\n                variant=\"link\"\n                onClick={handleDeleteImage}\n              >\n                {t('upload.reset_file')}\n              </Button>\n            )}\n          </ButtonGroup>\n        )}\n      </FileUploadContainer>\n    );\n  }\n);\n\nexport default ImageInput;\n"],
+  "mappings": "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",
   "names": ["Image", "ImageInput"]
 }

package/inputs/Input/Input.stories.d.ts

@@ -1,6 +1,8 @@
 declare namespace _default {
     export let title: string;
     export { Input as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;
@@ -14,6 +16,7 @@ export { MobilePhone } from "@digigov/form/inputs/Input/__stories__/MobilePhone"
 export { AFM } from "@digigov/form/inputs/Input/__stories__/AFM";
 export { AMKA } from "@digigov/form/inputs/Input/__stories__/AMKA";
 export { IBAN } from "@digigov/form/inputs/Input/__stories__/IBAN";
+export { Email } from "@digigov/form/inputs/Input/__stories__/Email";
 export { PostalCode } from "@digigov/form/inputs/Input/__stories__/PostalCode";
 export { TextWithLimit } from "@digigov/form/inputs/Input/__stories__/TextWithLimit";
 import Input from '@digigov/form/inputs/Input';

package/inputs/Input/__stories__/AFM.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const AFM: () => React.JSX.Element;
+export declare const AFM: (_: any) => React.JSX.Element;
 export default AFM;

package/inputs/Input/__stories__/Boolean.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Boolean: () => React.JSX.Element;
+export declare const Boolean: (_: any) => React.JSX.Element;
 export default Boolean;

package/inputs/Input/__stories__/Email.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export declare const Email: (_: any) => React.JSX.Element;
+export default Email;

package/inputs/Input/__stories__/IBAN.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const IBAN: () => React.JSX.Element;
+export declare const IBAN: (_: any) => React.JSX.Element;
 export default IBAN;

package/inputs/Input/__stories__/Integer.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Integer: () => React.JSX.Element;
+export declare const Integer: (_: any) => React.JSX.Element;
 export default Integer;

package/inputs/Input/__stories__/LandlineNumber.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const LandlineNumber: () => React.JSX.Element;
+export declare const LandlineNumber: (_: any) => React.JSX.Element;
 export default LandlineNumber;

package/inputs/Input/__stories__/MobilePhone.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const MobilePhone: () => React.JSX.Element;
+export declare const MobilePhone: (_: any) => React.JSX.Element;
 export default MobilePhone;

package/inputs/Input/__stories__/PhoneNumber.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const PhoneNumber: () => React.JSX.Element;
+export declare const PhoneNumber: (_: any) => React.JSX.Element;
 export default PhoneNumber;

package/inputs/Input/__stories__/PostalCode.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const PostalCode: () => React.JSX.Element;
+export declare const PostalCode: (_: any) => React.JSX.Element;
 export default PostalCode;

package/inputs/Input/__stories__/String.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const String: () => React.JSX.Element;
+export declare const String: (_: any) => React.JSX.Element;
 export default String;

package/inputs/Input/__stories__/StringWithTrimValidation.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const StringWithTrimValidation: () => React.JSX.Element;
+export declare const StringWithTrimValidation: (_: any) => React.JSX.Element;
 export default StringWithTrimValidation;

package/inputs/Input/__stories__/TextWithLimit.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const TextWithLimit: () => React.JSX.Element;
+export declare const TextWithLimit: (_: any) => React.JSX.Element;
 export default TextWithLimit;

package/inputs/Input/index.js

@@ -6,6 +6,7 @@ import { useTranslation } from "@digigov/ui/i18n";
 import { Hint } from "@digigov/ui/typography/Hint";
 const TYPES_MAP = {
   string: "text",
+  password: "password",
   int: "text",
   text: "text",
   date: "date"

package/inputs/Input/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/inputs/Input/index.tsx"],
-  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { TextArea } from '@digigov/ui/form/TextArea';\nimport { TextInput } from '@digigov/ui/form/TextInput';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nconst TYPES_MAP = {\n  string: 'text',\n  int: 'text',\n  text: 'text',\n  date: 'date',\n};\n\nexport interface InputProps\n  extends Omit<UncontrolledFieldProps, 'extra' | 'Field'> {\n  extra?: {\n    fullWidth?: boolean;\n    multiline?: boolean;\n    className?: string;\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    rows?: any;\n    limit: {\n      min?: number;\n      max?: number;\n    };\n  };\n  Field?: UncontrolledFieldProps['Field'];\n}\n\nexport const Input: React.ExoticComponent<InputProps> = React.forwardRef(\n  function WrappedInput({ name, control, type, extra, ...props }, ref: never) {\n    delete props['Field'];\n    // eslint-disable-next-line prefer-const\n    let { multiline = false, rows, limit } = extra || {};\n    const { className } = extra || {};\n    // if enforced to multiline use true. Derive from type otherwise.\n    multiline = multiline === true || type === 'text';\n    // use explicit rows value if set. Derive from multiline otherwise.\n    rows = rows || (multiline ? 4 : 1);\n    // translate dilosi type to HTML Input type\n    const fieldType = TYPES_MAP[type || 'text'] || 'text';\n    const { t } = useTranslation();\n    const currentValue: string | '' = useWatch({ control, name });\n\n    const getRemainingChars = (currentValue, limit) => {\n      if (currentValue) {\n        return limit?.max - currentValue.length;\n      }\n      return limit?.max;\n    };\n\n    const constructRemainingText = (currentValue, limit) => {\n      const remainingChars = getRemainingChars(currentValue, limit);\n      let remainingText =\n        Math.abs(remainingChars) === 1\n          ? t('form.info.text.character')\n          : t('form.info.text.characters');\n      remainingText +=\n        remainingChars > 0\n          ? ` ${t('form.info.text.remaining')}.`\n          : ` ${t('form.info.text.too_many')}.`;\n      return remainingText;\n    };\n\n    if (multiline === true) {\n      return (\n        <>\n          <TextArea\n            name={name}\n            className={className}\n            rows={rows}\n            ref={ref}\n            id={name}\n            {...{\n              ...props,\n              reset: undefined,\n              required: undefined,\n              type: fieldType,\n            }}\n          />\n          {limit?.max && (\n            <Hint display={'flex'}>\n              {t('form.info.text.you_have')}\n              <Hint fontWeight=\"bold\">\n                &nbsp;{`${Math.abs(getRemainingChars(currentValue, limit))}`}\n                &nbsp;\n              </Hint>\n              {constructRemainingText(currentValue, limit)}\n            </Hint>\n          )}\n        </>\n      );\n    } else {\n      return (\n        <TextInput\n          name={name}\n          id={name}\n          type={fieldType}\n          data-type={type}\n          className={className}\n          ref={ref}\n          {...{\n            ...props,\n            reset: undefined,\n            required: undefined,\n          }}\n        />\n      );\n    }\n  }\n);\n\nexport default Input;\n"],
-  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAErB,MAAM,YAAY;AAAA,EAChB,QAAQ;AAAA,EACR,KAAK;AAAA,EACL,MAAM;AAAA,EACN,MAAM;AACR;AAkBO,MAAM,QAA2C,MAAM;AAAA,EAC5D,SAAS,aAAa,EAAE,MAAM,SAAS,MAAM,OAAO,GAAG,MAAM,GAAG,KAAY;AAC1E,WAAO,MAAM,OAAO;AAEpB,QAAI,EAAE,YAAY,OAAO,MAAM,MAAM,IAAI,SAAS,CAAC;AACnD,UAAM,EAAE,UAAU,IAAI,SAAS,CAAC;AAEhC,gBAAY,cAAc,QAAQ,SAAS;AAE3C,WAAO,SAAS,YAAY,IAAI;AAEhC,UAAM,YAAY,UAAU,QAAQ,MAAM,KAAK;AAC/C,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,eAA4B,SAAS,EAAE,SAAS,KAAK,CAAC;AAE5D,UAAM,oBAAoB,CAACA,eAAcC,WAAU;AACjD,UAAID,eAAc;AAChB,eAAOC,QAAO,MAAMD,cAAa;AAAA,MACnC;AACA,aAAOC,QAAO;AAAA,IAChB;AAEA,UAAM,yBAAyB,CAACD,eAAcC,WAAU;AACtD,YAAM,iBAAiB,kBAAkBD,eAAcC,MAAK;AAC5D,UAAI,gBACF,KAAK,IAAI,cAAc,MAAM,IACzB,EAAE,0BAA0B,IAC5B,EAAE,2BAA2B;AACnC,uBACE,iBAAiB,IACb,IAAI,EAAE,0BAA0B,CAAC,MACjC,IAAI,EAAE,yBAAyB,CAAC;AACtC,aAAO;AAAA,IACT;AAEA,QAAI,cAAc,MAAM;AACtB,aACE,0DACE;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,IAAI;AAAA,UACH,GAAG;AAAA,YACF,GAAG;AAAA,YACH,OAAO;AAAA,YACP,UAAU;AAAA,YACV,MAAM;AAAA,UACR;AAAA;AAAA,MACF,GACC,OAAO,OACN,oCAAC,QAAK,SAAS,UACZ,EAAE,yBAAyB,GAC5B,oCAAC,QAAK,YAAW,UAAO,QACf,GAAG,KAAK,IAAI,kBAAkB,cAAc,KAAK,CAAC,CAAC,IAAG,MAE/D,GACC,uBAAuB,cAAc,KAAK,CAC7C,CAEJ;AAAA,IAEJ,OAAO;AACL,aACE;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,aAAW;AAAA,UACX;AAAA,UACA;AAAA,UACC,GAAG;AAAA,YACF,GAAG;AAAA,YACH,OAAO;AAAA,YACP,UAAU;AAAA,UACZ;AAAA;AAAA,MACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;",
+  "sourcesContent": ["import React from 'react';\nimport { useWatch } from 'react-hook-form';\nimport { UncontrolledFieldProps } from '@digigov/form/Field/types';\nimport { TextArea } from '@digigov/ui/form/TextArea';\nimport { TextInput } from '@digigov/ui/form/TextInput';\nimport { useTranslation } from '@digigov/ui/i18n';\nimport { Hint } from '@digigov/ui/typography/Hint';\n\nconst TYPES_MAP = {\n  string: 'text',\n  password: 'password',\n  int: 'text',\n  text: 'text',\n  date: 'date',\n};\n\nexport interface InputProps\n  extends Omit<UncontrolledFieldProps, 'extra' | 'Field'> {\n  extra?: {\n    fullWidth?: boolean;\n    multiline?: boolean;\n    className?: string;\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    rows?: any;\n    limit: {\n      min?: number;\n      max?: number;\n    };\n  };\n  Field?: UncontrolledFieldProps['Field'];\n}\n\nexport const Input: React.ExoticComponent<InputProps> = React.forwardRef(\n  function WrappedInput({ name, control, type, extra, ...props }, ref: never) {\n    delete props['Field'];\n    // eslint-disable-next-line prefer-const\n    let { multiline = false, rows, limit } = extra || {};\n    const { className } = extra || {};\n    // if enforced to multiline use true. Derive from type otherwise.\n    multiline = multiline === true || type === 'text';\n    // use explicit rows value if set. Derive from multiline otherwise.\n    rows = rows || (multiline ? 4 : 1);\n    // translate dilosi type to HTML Input type\n    const fieldType = TYPES_MAP[type || 'text'] || 'text';\n    const { t } = useTranslation();\n    const currentValue: string | '' = useWatch({ control, name });\n\n    const getRemainingChars = (currentValue, limit) => {\n      if (currentValue) {\n        return limit?.max - currentValue.length;\n      }\n      return limit?.max;\n    };\n\n    const constructRemainingText = (currentValue, limit) => {\n      const remainingChars = getRemainingChars(currentValue, limit);\n      let remainingText =\n        Math.abs(remainingChars) === 1\n          ? t('form.info.text.character')\n          : t('form.info.text.characters');\n      remainingText +=\n        remainingChars > 0\n          ? ` ${t('form.info.text.remaining')}.`\n          : ` ${t('form.info.text.too_many')}.`;\n      return remainingText;\n    };\n\n    if (multiline === true) {\n      return (\n        <>\n          <TextArea\n            name={name}\n            className={className}\n            rows={rows}\n            ref={ref}\n            id={name}\n            {...{\n              ...props,\n              reset: undefined,\n              required: undefined,\n              type: fieldType,\n            }}\n          />\n          {limit?.max && (\n            <Hint display={'flex'}>\n              {t('form.info.text.you_have')}\n              <Hint fontWeight=\"bold\">\n                &nbsp;{`${Math.abs(getRemainingChars(currentValue, limit))}`}\n                &nbsp;\n              </Hint>\n              {constructRemainingText(currentValue, limit)}\n            </Hint>\n          )}\n        </>\n      );\n    } else {\n      return (\n        <TextInput\n          name={name}\n          id={name}\n          type={fieldType}\n          data-type={type}\n          className={className}\n          ref={ref}\n          {...{\n            ...props,\n            reset: undefined,\n            required: undefined,\n          }}\n        />\n      );\n    }\n  }\n);\n\nexport default Input;\n"],
+  "mappings": "AAAA,OAAO,WAAW;AAClB,SAAS,gBAAgB;AAEzB,SAAS,gBAAgB;AACzB,SAAS,iBAAiB;AAC1B,SAAS,sBAAsB;AAC/B,SAAS,YAAY;AAErB,MAAM,YAAY;AAAA,EAChB,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,KAAK;AAAA,EACL,MAAM;AAAA,EACN,MAAM;AACR;AAkBO,MAAM,QAA2C,MAAM;AAAA,EAC5D,SAAS,aAAa,EAAE,MAAM,SAAS,MAAM,OAAO,GAAG,MAAM,GAAG,KAAY;AAC1E,WAAO,MAAM,OAAO;AAEpB,QAAI,EAAE,YAAY,OAAO,MAAM,MAAM,IAAI,SAAS,CAAC;AACnD,UAAM,EAAE,UAAU,IAAI,SAAS,CAAC;AAEhC,gBAAY,cAAc,QAAQ,SAAS;AAE3C,WAAO,SAAS,YAAY,IAAI;AAEhC,UAAM,YAAY,UAAU,QAAQ,MAAM,KAAK;AAC/C,UAAM,EAAE,EAAE,IAAI,eAAe;AAC7B,UAAM,eAA4B,SAAS,EAAE,SAAS,KAAK,CAAC;AAE5D,UAAM,oBAAoB,CAACA,eAAcC,WAAU;AACjD,UAAID,eAAc;AAChB,eAAOC,QAAO,MAAMD,cAAa;AAAA,MACnC;AACA,aAAOC,QAAO;AAAA,IAChB;AAEA,UAAM,yBAAyB,CAACD,eAAcC,WAAU;AACtD,YAAM,iBAAiB,kBAAkBD,eAAcC,MAAK;AAC5D,UAAI,gBACF,KAAK,IAAI,cAAc,MAAM,IACzB,EAAE,0BAA0B,IAC5B,EAAE,2BAA2B;AACnC,uBACE,iBAAiB,IACb,IAAI,EAAE,0BAA0B,CAAC,MACjC,IAAI,EAAE,yBAAyB,CAAC;AACtC,aAAO;AAAA,IACT;AAEA,QAAI,cAAc,MAAM;AACtB,aACE,0DACE;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA,IAAI;AAAA,UACH,GAAG;AAAA,YACF,GAAG;AAAA,YACH,OAAO;AAAA,YACP,UAAU;AAAA,YACV,MAAM;AAAA,UACR;AAAA;AAAA,MACF,GACC,OAAO,OACN,oCAAC,QAAK,SAAS,UACZ,EAAE,yBAAyB,GAC5B,oCAAC,QAAK,YAAW,UAAO,QACf,GAAG,KAAK,IAAI,kBAAkB,cAAc,KAAK,CAAC,CAAC,IAAG,MAE/D,GACC,uBAAuB,cAAc,KAAK,CAC7C,CAEJ;AAAA,IAEJ,OAAO;AACL,aACE;AAAA,QAAC;AAAA;AAAA,UACC;AAAA,UACA,IAAI;AAAA,UACJ,MAAM;AAAA,UACN,aAAW;AAAA,UACX;AAAA,UACA;AAAA,UACC,GAAG;AAAA,YACF,GAAG;AAAA,YACH,OAAO;AAAA,YACP,UAAU;AAAA,UACZ;AAAA;AAAA,MACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,IAAO,gBAAQ;",
   "names": ["currentValue", "limit"]
 }

package/inputs/Label/Label.stories.d.ts

@@ -1,6 +1,8 @@
 declare namespace _default {
     export let title: string;
     export { Label as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;

package/inputs/Label/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/inputs/OtpInput/OtpInput.stories.d.ts

@@ -1,6 +1,8 @@
 declare namespace _default {
     export let title: string;
     export { OtpInput as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;

package/inputs/OtpInput/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/inputs/Radio/Radio.stories.d.ts

@@ -1,6 +1,8 @@
 declare namespace _default {
     export let title: string;
     export { Radio as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;

package/inputs/Radio/__stories__/Conditional.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Conditional: () => React.JSX.Element;
+export declare const Conditional: (_: any) => React.JSX.Element;
 export default Conditional;

package/inputs/Radio/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/inputs/Radio/__stories__/WithDivider.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const WithDivider: () => React.JSX.Element;
+export declare const WithDivider: (_: any) => React.JSX.Element;
 export default WithDivider;

package/inputs/Select/Select.stories.d.ts

@@ -1,6 +1,8 @@
 declare namespace _default {
     export let title: string;
     export { Select as component };
+    export let tags: string[];
+    export { doc as markdown };
     export let displayName: string;
 }
 export default _default;

package/inputs/Select/__stories__/Default.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const Default: () => React.JSX.Element;
+export declare const Default: (_: any) => React.JSX.Element;
 export default Default;

package/lazy/index.js

@@ -14,11 +14,11 @@ export default {
   'ArrayItemHeader': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemHeader'] }))),
   'ArrayItemDisplay': lazy(() => import('@digigov/form/FieldArray/FormDialog').then((module) => ({ default: module['ArrayItemDisplay'] }))),
   'FieldArray': lazy(() => import('@digigov/form/FieldArray').then((module) => ({ default: module['FieldArray'] }))),
+  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'FieldsetWithContext': lazy(() => import('@digigov/form/Fieldset/FieldsetWithContext').then((module) => ({ default: module['FieldsetWithContext'] }))),
   'FieldsetLabel': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetLabel'] }))),
   'FieldsetCaption': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetCaption'] }))),
   'FieldsetBody': lazy(() => import('@digigov/form/Fieldset').then((module) => ({ default: module['FieldsetBody'] }))),
-  'FieldObject': lazy(() => import('@digigov/form/FieldObject').then((module) => ({ default: module['FieldObject'] }))),
   'ControlledFormBuilder': lazy(() => import('@digigov/form/FormBuilder').then((module) => ({ default: module['ControlledFormBuilder'] }))),
   'FormBase': lazy(() => import('@digigov/form/FormBuilder').then((module) => ({ default: module['FormBase'] }))),
   'AddObjects': lazy(() => import('@digigov/form/MultiplicityField/add-objects').then((module) => ({ default: module['AddObjects'] }))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "2.0.0-49de50c4",
+  "version": "2.0.0-555d1027",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -10,18 +10,18 @@
     "access": "public"
   },
   "dependencies": {
-    "react-hook-form": "7.33.1",
+    "react-hook-form": "7.56.1",
     "yup": "0.32.11",
     "dayjs": "1.10.4",
-    "@hookform/resolvers": "4.1.3",
-    "@digigov/react-icons": "2.0.0-49de50c4"
+    "@hookform/resolvers": "5.0.1",
+    "@digigov/react-icons": "2.0.0-555d1027"
   },
   "peerDependencies": {
-    "@digigov/ui": "2.0.0-49de50c4",
-    "@digigov/react-core": "2.0.0-49de50c4",
+    "@digigov/ui": "2.0.0-555d1027",
+    "@digigov/react-core": "2.0.0-555d1027",
     "clsx": "1.1.1",
-    "react": ">=16.8.0 <19.0.0",
-    "react-dom": ">=16.8.0 <19.0.0"
+    "react": "^18.3.0 || ^19.1.0",
+    "react-dom": "^18.3.0 || ^19.1.0"
   },
   "gitHead": "c903a46306f77f55ad7fc4d2e274006f39a6c871",
   "private": false,

package/registry/index.js

@@ -12,10 +12,10 @@ import * as _digigov_form_Field from "@digigov/form/Field";
 import * as _digigov_form_Field_types from "@digigov/form/Field/types";
 import * as _digigov_form_FieldArray_FormDialog from "@digigov/form/FieldArray/FormDialog";
 import * as _digigov_form_FieldArray from "@digigov/form/FieldArray";
+import * as _digigov_form_FieldObject from "@digigov/form/FieldObject";
 import * as _digigov_form_Fieldset_FieldsetWithContext from "@digigov/form/Fieldset/FieldsetWithContext";
 import * as _digigov_form_Fieldset from "@digigov/form/Fieldset";
 import * as _digigov_form_Fieldset_types from "@digigov/form/Fieldset/types";
-import * as _digigov_form_FieldObject from "@digigov/form/FieldObject";
 import * as _digigov_form_FormBuilder from "@digigov/form/FormBuilder";
 import * as _digigov_form_MultiplicityField_add_objects from "@digigov/form/MultiplicityField/add-objects";
 import * as _digigov_form_MultiplicityField from "@digigov/form/MultiplicityField";
@@ -46,13 +46,12 @@ import * as _digigov_form_Questions_Step_getAddMoreFields from "@digigov/form/Qu
 import * as _digigov_form_Questions_Step from "@digigov/form/Questions/Step";
 import * as _digigov_form_Questions_Step_types from "@digigov/form/Questions/Step/types";
 import * as _digigov_form_inputs_AutoCompleteInput from "@digigov/form/inputs/AutoCompleteInput";
-import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
 import * as _digigov_form_inputs_Checkboxes from "@digigov/form/inputs/Checkboxes";
+import * as _digigov_form_inputs_DateInput from "@digigov/form/inputs/DateInput";
 import * as _digigov_form_inputs_DateTimeInput from "@digigov/form/inputs/DateTimeInput";
 import * as _digigov_form_inputs_FileInput from "@digigov/form/inputs/FileInput";
 import * as _digigov_form_inputs_ImageInput from "@digigov/form/inputs/ImageInput";
 import * as _digigov_form_inputs_Input from "@digigov/form/inputs/Input";
-import * as _digigov_form_inputs_Input_inputsInputScenarios from "@digigov/form/inputs/Input/inputsInputScenarios";
 import * as _digigov_form_inputs_Label from "@digigov/form/inputs/Label";
 import * as _digigov_form_inputs_OtpInput from "@digigov/form/inputs/OtpInput";
 import * as _digigov_form_inputs_Radio from "@digigov/form/inputs/Radio";
@@ -104,10 +103,10 @@ export default {
   '@digigov/form/Field/types': lazyImport(_digigov_form_Field_types),
   '@digigov/form/FieldArray/FormDialog': lazyImport(_digigov_form_FieldArray_FormDialog),
   '@digigov/form/FieldArray': lazyImport(_digigov_form_FieldArray),
+  '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/Fieldset/FieldsetWithContext': lazyImport(_digigov_form_Fieldset_FieldsetWithContext),
   '@digigov/form/Fieldset': lazyImport(_digigov_form_Fieldset),
   '@digigov/form/Fieldset/types': lazyImport(_digigov_form_Fieldset_types),
-  '@digigov/form/FieldObject': lazyImport(_digigov_form_FieldObject),
   '@digigov/form/FormBuilder': lazyImport(_digigov_form_FormBuilder),
   '@digigov/form/MultiplicityField/add-objects': lazyImport(_digigov_form_MultiplicityField_add_objects),
   '@digigov/form/MultiplicityField': lazyImport(_digigov_form_MultiplicityField),
@@ -138,13 +137,12 @@ export default {
   '@digigov/form/Questions/Step': lazyImport(_digigov_form_Questions_Step),
   '@digigov/form/Questions/Step/types': lazyImport(_digigov_form_Questions_Step_types),
   '@digigov/form/inputs/AutoCompleteInput': lazyImport(_digigov_form_inputs_AutoCompleteInput),
-  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
   '@digigov/form/inputs/Checkboxes': lazyImport(_digigov_form_inputs_Checkboxes),
+  '@digigov/form/inputs/DateInput': lazyImport(_digigov_form_inputs_DateInput),
   '@digigov/form/inputs/DateTimeInput': lazyImport(_digigov_form_inputs_DateTimeInput),
   '@digigov/form/inputs/FileInput': lazyImport(_digigov_form_inputs_FileInput),
   '@digigov/form/inputs/ImageInput': lazyImport(_digigov_form_inputs_ImageInput),
   '@digigov/form/inputs/Input': lazyImport(_digigov_form_inputs_Input),
-  '@digigov/form/inputs/Input/inputsInputScenarios': lazyImport(_digigov_form_inputs_Input_inputsInputScenarios),
   '@digigov/form/inputs/Label': lazyImport(_digigov_form_inputs_Label),
   '@digigov/form/inputs/OtpInput': lazyImport(_digigov_form_inputs_OtpInput),
   '@digigov/form/inputs/Radio': lazyImport(_digigov_form_inputs_Radio),

package/src/Field/FieldBase.tsx

@@ -51,23 +51,20 @@ export const FieldBase: React.FC<FieldBaseProps> = ({
           name={name}
           render={({ field }) => {
             return (
-              <>
-                <div tabIndex={-1} ref={field.ref} />
-                <Component
-                  {...field}
-                  control={control}
-                  ref={undefined}
-                  defaultValue={defaultValue}
-                  extra={extra}
-                  error={!!error}
-                  type={type}
-                  aria-required={!!required}
-                  aria-describedby={error && `${name}-error`}
-                  required={required}
-                  disabled={editable === false}
-                  {...componentProps}
-                />
-              </>
+              <Component
+                {...field}
+                control={control}
+                ref={undefined}
+                defaultValue={defaultValue ?? field.value}
+                extra={extra}
+                error={!!error}
+                type={type}
+                aria-required={!!required}
+                aria-describedby={error && `${name}-error`}
+                required={required}
+                disabled={editable === false}
+                {...componentProps}
+              />
             );
           }}
         />
@@ -112,7 +109,6 @@ export const FieldBase: React.FC<FieldBaseProps> = ({
           aria-describedby={error && `${name}-error`}
           required={required}
           disabled={editable === false}
-          ref={undefined}
           {...componentProps}
         />
       )}

package/src/Field/FieldBaseContainer.tsx

@@ -3,7 +3,7 @@ import { FieldContainerProps } from '@digigov/form/Field/types';
 import Label from '@digigov/form/inputs/Label';
 import { ErrorMessage } from '@digigov/react-core/ErrorMessage';
 import FieldContainer from '@digigov/react-core/FieldContainer';
-import CoreFieldset from '@digigov/react-core/Fieldset';
+import Fieldset from '@digigov/react-core/Fieldset';
 import FieldsetLegend from '@digigov/react-core/FieldsetLegend';
 import LabelContainer from '@digigov/react-core/LabelContainer';
 import { useTranslation } from '@digigov/ui/i18n';
@@ -11,12 +11,14 @@ import { Hint } from '@digigov/ui/typography/Hint';
 
 export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
   name,
+  register,
   wrapper,
   label,
   children,
   error,
   hasError,
   layout,
+  controlled,
   labelSize = 'sm',
 }) => {
   const { t } = useTranslation();
@@ -27,19 +29,25 @@ export const FieldBaseContainer: React.FC<FieldContainerProps> = ({
   if (wrapper === 'fieldset') {
     return (
       <FieldContainer error={hasError} {...layout}>
-        <CoreFieldset>
+        <Fieldset
+          className="outline-none"
+          {...(controlled && {
+            tabIndex: -1,
+            ...(register(name || '') as any),
+          })}
+        >
           <FieldsetLegend size={labelSize}>
             {label && label.primary}
           </FieldsetLegend>
-          {label && label.secondary && <Hint mb={0}>{t(label.secondary)}</Hint>}
+          {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
           {error && (
-            <ErrorMessage id={`${name}-error`} mb={0}>
+            <ErrorMessage id={`${name}-error`}>
               {t(errorMessage, errorContext)}
             </ErrorMessage>
           )}
           {children}
           {label && label.hint && <Hint size="sm">{label.hint}</Hint>}
-        </CoreFieldset>
+        </Fieldset>
       </FieldContainer>
     );
   } else {

package/src/Field/FieldConditional.tsx

@@ -78,8 +78,8 @@ export const FieldConditional: React.FC<FieldConditionalProps> = ({
       field={field}
       control={control}
       register={register}
-      resetField={resetField}
       reset={reset}
+      resetField={resetField}
       error={error}
       Field={Field}
     />

package/src/Field/index.tsx

@@ -97,6 +97,7 @@ export const Field: React.FC<FieldProps> = ({
         setValue={setValue}
         getValues={getValues}
         unregister={unregister}
+        resetField={resetField}
         Field={Field}
         {...calculatedField}
       />
@@ -115,8 +116,8 @@ export const Field: React.FC<FieldProps> = ({
       control={control}
       register={register}
       reset={reset}
-      resetField={resetField}
       error={customError}
+      resetField={resetField}
       Field={Field}
     />
   );

package/src/Field/types.tsx

@@ -82,7 +82,7 @@ export interface FieldConditionalProps {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
-  resetField: UseFormReturn['resetField'];
+  resetField?: UseFormReturn['resetField'];
   error?: ErrorOption;
   Field: React.FC<FieldProps>;
 }
@@ -151,7 +151,7 @@ export interface FieldBaseProps extends CalculatedField {
   control: UseFormReturn['control'];
   register: UseFormReturn['register'];
   reset: UseFormReturn['reset'];
-  resetField: UseFormReturn['resetField'];
+  resetField?: UseFormReturn['resetField'];
   Field?: React.FC<FieldProps>;
 }
 

package/src/Field/utils/index.ts

@@ -20,11 +20,12 @@ export const FIELD_COMPONENTS: FieldComponentRegistry = {
   file: {
     wrapper: 'fieldset',
     component: FileInput,
-    controlled: true,
+    // controlled: true,
   },
   image: {
     wrapper: 'fieldset',
     component: ImageInput,
+    controlled: true,
   },
   date: {
     wrapper: 'fieldset',

package/src/FieldArray/FormDialog.tsx

@@ -40,7 +40,7 @@ export interface FormDialogProps extends FieldProps {
   getValues: UseFormReturn['getValues'];
   setValue: UseFormReturn['setValue'];
   reset: UseFormReturn['reset'];
-  resetField: UseFormReturn['resetField'];
+  resetField?: UseFormReturn['resetField'];
   sortable: boolean;
   Field: React.FC<FieldProps>;
 }
@@ -206,9 +206,6 @@ export const FormDialog: React.FC<FormDialogProps> = React.forwardRef(
                 ofField?.extra &&
                 values?.length > 0 && (
                   <ArrayItemHeader
-                    tableCellActionsLabel={
-                      customField.extra?.tableCellActionsLabel
-                    }
                     labels={
                       ofField.type === 'object'
                         ? ofField.extra.fields.map(({ label }) => label.primary)
@@ -224,6 +221,7 @@ export const FormDialog: React.FC<FormDialogProps> = React.forwardRef(
                       <ArrayItemDisplay
                         key={index}
                         name={`${name}.${index}`}
+                        register={register}
                         index={index}
                         isFirst={index === 0}
                         isLast={index === values.length - 1}
@@ -396,20 +394,14 @@ export const ArrayItemModal = React.forwardRef(function ArrayItemModal(
   );
 });
 
-export const ArrayItemHeader = ({
-  labels,
-  disabled,
-  tableCellActionsLabel,
-}) => {
+export const ArrayItemHeader = ({ labels, disabled }) => {
   return (
     <TableHead>
       <TableRow>
         {labels.map((label, index) => {
           return <TableHeadCell key={index}>{label}</TableHeadCell>;
         })}
-        {!disabled && (
-          <TableHeadCell>{tableCellActionsLabel ?? `Ενέργειες`}</TableHeadCell>
-        )}
+        {!disabled && <TableHeadCell>Ενέργειες</TableHeadCell>}
       </TableRow>
     </TableHead>
   );
@@ -418,6 +410,7 @@ export const ArrayItemHeader = ({
 export const ArrayItemDisplay = ({
   name,
   data,
+  register,
   edit,
   remove,
   disabledEdit,
@@ -442,6 +435,7 @@ export const ArrayItemDisplay = ({
   name: string;
   edit: (name: string) => void;
   remove: (name: string) => void;
+  register: (name: string) => void;
   disabledEdit?: boolean;
   disabledDelete?: boolean;
   disabled?: boolean;
@@ -470,7 +464,7 @@ export const ArrayItemDisplay = ({
   const borderVariant = border === false || sortable ? 'none' : 'border';
   return (
     <>
-      <TableRow>
+      <TableRow {...(register(name) as any)}>
         {values?.map?.((value, valueIndex) => {
           return (
             <TableDataCell

package/src/FieldArray/__stories__/Default.tsx

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

package/src/FieldArray/__stories__/WithExactLength.tsx

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