@digigov/form 2.0.0-d0adc9fb → 2.0.0-d2ffc726

package/src/inputs/DateTimeInput/index.tsx

@@ -1,7 +1,8 @@
-import React, { useMemo, useState } from 'react';
+import React, { useMemo, useEffect } from 'react';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import { useFormContext } from '@digigov/form/FormContext';
 import {
   DateInputContainer,
   DateInputItem,
@@ -17,10 +18,9 @@ export interface DateTimeInputProps
   };
 }
 
-function useDateTime(value, onChange) {
+function useDateTime(name, value, form) {
   const [year, month, day, hours, minutes] = useMemo(() => {
     if (!value || value.length === 0) {
-      onChange('');
       return ['', '', '', '', ''];
     }
     const [datePart, timePart] = value.split(' ');
@@ -29,15 +29,19 @@ function useDateTime(value, onChange) {
     return [year, month, day, hours, minutes];
   }, [value]);
 
+  function update(value) {
+    form.setValue(name, value, { shouldValidate: false });
+  }
+
   function set(year, month, day, hours, minutes) {
     const datePart = `${day || ''}/${month || ''}/${year || ''}`;
     const timePart = hours || minutes ? `${hours || ''}:${minutes || ''}` : '';
     const value = timePart ? `${datePart} ${timePart}` : datePart;
 
     if (!year && !month && !day && !hours && !minutes) {
-      onChange(null);
+      update('');
     } else {
-      onChange(value);
+      update(value);
     }
   }
 
@@ -78,6 +82,12 @@ function useDateTime(value, onChange) {
     set(year, month, day, hours, val);
   }
 
+  function trigger() {
+    if (form.formState.isSubmitted) {
+      form.trigger(name);
+    }
+  }
+
   return {
     day,
     month,
@@ -89,6 +99,7 @@ function useDateTime(value, onChange) {
     setDay,
     setHours,
     setMinutes,
+    trigger,
   };
 }
 
@@ -102,88 +113,134 @@ const makeDateTime = (val) => {
   return '';
 };
 
-const DateTimePart = ({ label, ...props }) => {
-  return <DateInputItem {...props}>{label}</DateInputItem>;
-};
+const DateTimePart = React.forwardRef<HTMLInputElement, Record<string, any>>(
+  ({ label, ...props }, ref) => {
+    return (
+      <DateInputItem {...props} ref={ref}>
+        {label}
+      </DateInputItem>
+    );
+  }
+);
+DateTimePart.displayName = 'DateTimePart';
 
-export const DateTimeInput = ({ name, ...props }) => {
+export const DateTimeInput = React.forwardRef<
+  HTMLInputElement,
+  Record<string, any>
+>(({ name, ...props }, ref) => {
   const { t } = useTranslation();
-  const [initial] = useState(props.value);
-  const value = useMemo(() => {
-    if (initial === props.value) {
-      return makeDateTime(props.value);
+  const form = useFormContext();
+
+  useEffect(() => {
+    const initialValue = form.getValues(name);
+    // checks if the initial value is undefined and if the default value is valid  date
+    if (initialValue === undefined && props.defaultValue) {
+      form.setValue(name, makeDateTime(props.defaultValue), {
+        shouldValidate: false,
+      });
+    } else {
+      // checks if the initial value is a valid date
+      form.setValue(name, makeDateTime(initialValue), {
+        shouldValidate: false,
+      });
     }
-    return props.value;
-  }, [props.value, initial]);
+  }, []);
 
-  const datetime = useDateTime(
-    value || makeDateTime(props.defaultValue),
-    props.onChange
-  );
+  const value = form.getValues(name);
+  const dateTime = useDateTime(name, value, form);
 
   return (
     <DateInputContainer>
       <DateTimePart
+        ref={ref}
         label={t('form.label.day')}
-        onChange={datetime.setDay}
-        onBlur={(e) => datetime.setDay(e, true)}
-        value={datetime.day}
+        onChange={dateTime.setDay}
+        onBlur={(e) => {
+          if (dateTime.day && dateTime.day.length === 1) {
+            dateTime.setDay(e, true);
+          }
+          dateTime.trigger();
+        }}
+        value={dateTime.day}
         width={2}
         name={`${name}-day`}
         maxLength="2"
         disabled={props.disabled}
         aria-required={props['aria-required']}
-        error={!datetime.day ? props.error : false}
+        error={!dateTime.day ? props.error : false}
+        id={`${name}-day`}
       />
       <DateTimePart
         label={t('form.label.month')}
-        onChange={datetime.setMonth}
-        onBlur={(e) => datetime.setMonth(e, true)}
-        value={datetime.month}
+        onChange={dateTime.setMonth}
+        onBlur={(e) => {
+          if (dateTime.month && dateTime.month.length === 1) {
+            dateTime.setMonth(e, true);
+          }
+          dateTime.trigger();
+        }}
+        value={dateTime.month}
         width={2}
         name={`${name}-month`}
+        id={`${name}-month`}
         maxLength="2"
         disabled={props.disabled}
         aria-required={props['aria-required']}
-        error={!datetime.month ? props.error : false}
+        error={!dateTime.month ? props.error : false}
       />
       <DateTimePart
         label={t('form.label.year')}
-        onChange={datetime.setYear}
-        value={datetime.year}
+        onChange={dateTime.setYear}
+        onBlur={dateTime.trigger}
+        value={dateTime.year}
         width={4}
         name={`${name}-year`}
+        id={`${name}-year`}
         maxLength="4"
         disabled={props.disabled}
         aria-required={props['aria-required']}
-        error={!datetime.year ? props.error : false}
+        error={!dateTime.year ? props.error : false}
       />
       <DateTimePart
         label={t('form.label.hours')}
-        onChange={datetime.setHours}
-        onBlur={(e) => datetime.setHours(e, true)}
-        value={datetime.hours}
+        onChange={dateTime.setHours}
+        onBlur={(e) => {
+          if (dateTime.hours && dateTime.hours.length === 1) {
+            dateTime.setHours(e, true);
+          }
+          dateTime.trigger();
+        }}
+        value={dateTime.hours}
         width={2}
         name={`${name}-hours`}
+        id={`${name}-hours`}
         maxLength="2"
         disabled={props.disabled}
         aria-required={props['aria-required']}
-        error={!datetime.hours ? props.error : false}
+        error={!dateTime.hours ? props.error : false}
       />
       <DateTimePart
         label={t('form.label.minutes')}
-        onChange={datetime.setMinutes}
-        onBlur={(e) => datetime.setMinutes(e, true)}
-        value={datetime.minutes}
+        onChange={dateTime.setMinutes}
+        onBlur={(e) => {
+          if (dateTime.minutes && dateTime.minutes.length === 1) {
+            dateTime.setMinutes(e, true);
+          }
+          dateTime.trigger();
+        }}
+        value={dateTime.minutes}
         width={2}
         name={`${name}-minutes`}
+        id={`${name}-minutes`}
         maxLength="2"
         disabled={props.disabled}
         aria-required={props['aria-required']}
-        error={!datetime.minutes ? props.error : false}
+        error={!dateTime.minutes ? props.error : false}
       />
     </DateInputContainer>
   );
-};
+});
+
+DateTimeInput.displayName = 'DateTimeInput';
 
 export default DateTimeInput;

package/src/inputs/FileInput/FileInput.stories.js

@@ -1,7 +1,11 @@
 import FileInput from '@digigov/form/inputs/FileInput';
+import doc from './doc.mdx?raw';
 export default {
   title: 'Digigov Form/inputs/FileInput',
   component: FileInput,
+  tags: ['autodocs'],
+  markdown: doc,
   displayName: 'FileInput',
 };
 export { Default } from '@digigov/form/inputs/FileInput/__stories__/Default';
+export { WithBorderAndLink } from '@digigov/form/inputs/FileInput/__stories__/WithBorderAndLink';

package/src/inputs/FileInput/__stories__/Default.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import FormBuilder, { Field } from '@digigov/form';
 import { Button } from '@digigov/ui/form/Button';
 
-export const Default = () => (
+export const Default = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);

package/src/inputs/FileInput/__stories__/WithBorderAndLink.tsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import FormBuilder, { Field } from '@digigov/form';
+import { Button } from '@digigov/ui/form/Button';
+
+export const WithBorderAndLink = () => (
+  <FormBuilder
+    onSubmit={(data) => {
+      console.log(data);
+    }}
+  >
+    <Field
+      key={'string'}
+      name="file"
+      type="file"
+      required
+      extra={{
+        containerProps: {
+          variant: 'border',
+        },
+        uploadButtonProps: {
+          variant: 'link',
+        },
+        resetButtonProps: {
+          variant: 'link',
+          color: 'warning',
+        },
+      }}
+      label={{ primary: 'Βιογραφικό σημείωμα' }}
+    />
+    <Button>Συνέχεια</Button>
+  </FormBuilder>
+);
+
+export default WithBorderAndLink;

package/src/inputs/FileInput/index.test.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { test, expect } from '@playwright/experimental-ct-react';
 import TestVariant from '@digigov/ui/utils/TestVariant'
 import { Default } from '@digigov/form/inputs/FileInput/__stories__/Default';
+import { WithBorderAndLink } from '@digigov/form/inputs/FileInput/__stories__/WithBorderAndLink';
 
 test('renders the All FileInput variants', async ({ mount, page }) => {
   await mount(
@@ -10,10 +11,17 @@ test('renders the All FileInput variants', async ({ mount, page }) => {
     <TestVariant title="Default">
       <Default />
     </TestVariant>
+    <TestVariant title="WithBorderAndLink">
+      <WithBorderAndLink />
+    </TestVariant>
   </div>
   )
   await page.evaluate(() => document.fonts.ready);
 
+  // Move the mouse to the top-left corner to avoid random hover issues
+  await page.mouse.move(0, 0);
+
+
   const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
   expect(screenshot).toMatchSnapshot();
 });

package/src/inputs/FileInput/index.tsx

@@ -1,10 +1,19 @@
-import React, { useState } from 'react';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { ComponentRef } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
+import type { UseFormReturn } from 'react-hook-form';
+import { useWatch } from 'react-hook-form';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { ButtonProps } from '@digigov/ui/form/Button';
 import { Button } from '@digigov/ui/form/Button';
+import type {
+  FileUploadContainerProps,
+  FileUploadProps,
+} from '@digigov/ui/form/FileUpload';
 import { FileUpload, FileUploadContainer } from '@digigov/ui/form/FileUpload';
 import { useTranslation } from '@digigov/ui/i18n';
 import { Hint } from '@digigov/ui/typography/Hint';
 import { Paragraph } from '@digigov/ui/typography/Paragraph';
+
 export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
   extra?: {
     className?: string;
@@ -13,62 +22,121 @@ export interface FileInputProps extends Omit<UncontrolledFieldProps, 'extra'> {
     limit: {
       maxSize?: number;
     };
+    containerProps?: FileUploadContainerProps;
+    uploadButtonProps?: FileUploadProps;
+    noResetButton?: boolean;
+    resetButtonProps?: ButtonProps;
+    locales?: {
+      file?: string;
+      chooseFile?: string;
+      changeFile?: string;
+      resetFile?: string;
+    };
   };
+  reset: (values?: FileList) => void;
+  resetField: UseFormReturn['resetField'];
+  onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const FileInput: React.FC<any> = React.forwardRef(function FileInput(
-  { name, disabled, reset, onChange, ...props },
-  ref: any
+export const FileInput = React.forwardRef<
+  ComponentRef<typeof FileUpload>,
+  FileInputProps
+>(function FileInput(
+  {
+    name,
+    disabled,
+    resetField,
+    extra,
+    control,
+    onChange,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    Field,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    reset,
+    ...props
+  },
+  ref
 ) {
   const { t } = useTranslation();
-  const [files, setFiles] = useState<string[] | undefined>([]);
-  const handleChange = (e) => {
-    const target = e.target as HTMLInputElement;
-    const selectedFiles = Array.from(
-      target.files as ArrayLike<{ name: string }>
-    ).map(({ name }) => name);
-    setFiles(selectedFiles);
-    // proceed calling the onChange provided
-    // by react-hook-form
-    onChange(e);
-  };
+  const value: FileList = useWatch({ control, name });
+
+  const [filenames, setFilenames] = useState<string[] | undefined>(
+    Object.values(value || {}).map(({ name }) => name) || []
+  );
+
+  useEffect(() => {
+    setFilenames(Object.values(value || {}).map(({ name }) => name));
+  }, [value]);
+
+  const handleChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      event.preventDefault();
+      const target = event.target;
+      if (target.files && target.files.length > 0) {
+        setFilenames(Object.values(target.files).map(({ name }) => name));
+      }
+      onChange(event);
+    },
+    [onChange]
+  );
+
+  const handleReset = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.preventDefault();
+      resetField(name);
+      setFilenames(undefined);
+    },
+    [name, resetField]
+  );
+
   return (
     <>
-      <FileUploadContainer hasFiles={files && files.length > 0}>
-        {files?.length ? (
+      <FileUploadContainer
+        variant={extra?.containerProps?.variant || 'default'}
+        hasFiles={filenames && filenames.length > 0}
+      >
+        {filenames?.length ? (
           <>
             <Paragraph>
-              <b>{t('upload.file')}:</b> {`${files.join(', ')}`}
+              <b>{t('upload.file')}:</b> {`${filenames.join(', ')}`}
             </Paragraph>
           </>
         ) : (
-          <Hint>{t('upload.no_file')}</Hint>
+          <Hint>
+            <b>
+              {t('upload.file')}
+              {': '}
+            </b>
+            {t('upload.no_file')}
+          </Hint>
         )}
         <FileUpload
           ref={ref}
-          hasFiles={!!files?.length}
+          hasFiles={!!filenames?.length}
           name={name}
+          variant={extra?.uploadButtonProps?.variant}
           disabled={disabled}
+          id={name}
           onChange={handleChange}
-          {...{ ...props, required: undefined, Field: undefined }}
+          {...{ ...props, required: undefined }}
         >
-          {files?.length ? t('upload.change_file') : t('upload.choose_file')}
+          {filenames?.length
+            ? t('upload.change_file')
+            : t('upload.choose_file')}
         </FileUpload>
-        {files !== undefined && files.length > 0 && (
-          <>
-            <Button
-              variant="link"
-              onClick={(event) => {
-                event.preventDefault();
-                reset({ [name]: '' });
-                setFiles(undefined);
-              }}
-            >
-              {t('upload.reset_file')}
-            </Button>
-          </>
-        )}
+        {filenames !== undefined &&
+          filenames?.length > 0 &&
+          !extra?.noResetButton && (
+            <>
+              <Button
+                variant={extra?.resetButtonProps?.variant || 'link'}
+                onClick={handleReset}
+                color={extra?.resetButtonProps?.color || 'secondary'}
+              >
+                {t('upload.reset_file')}
+              </Button>
+            </>
+          )}
       </FileUploadContainer>
     </>
   );

package/src/inputs/ImageInput/ImageInput.stories.js

@@ -1,9 +1,13 @@
 import ImageInput from '@digigov/form/inputs/ImageInput';
+import doc from './doc.mdx?raw';
 export default {
   title: 'Digigov Form/inputs/ImageInput',
   component: ImageInput,
+  tags: ['autodocs'],
+  markdown: doc,
   displayName: 'ImageInput',
 };
 export { Default } from '@digigov/form/inputs/ImageInput/__stories__/Default';
-export { WithInvalidImageDimension } from '@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension';
 export { MaxSize } from '@digigov/form/inputs/ImageInput/__stories__/MaxSize';
+export { WithInvalidImageDimension } from '@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension';
+export { WithInitialValues } from '@digigov/form/inputs/ImageInput/__stories__/WithInitialValues';

package/src/inputs/ImageInput/__stories__/Default.tsx

@@ -13,7 +13,7 @@ const FIELDS: FieldSpec[] = [
   },
 ];
 
-export const Default = () => (
+export const Default = (_: any) => (
   <FormBuilder
     fields={FIELDS}
     onSubmit={(data) => {

package/src/inputs/ImageInput/__stories__/MaxSize.tsx

@@ -9,17 +9,18 @@ const FIELDS: FieldSpec[] = [
     required: true,
     label: {
       primary: 'Ανέβασμα φωτογραφίας',
-      secondary: 'Μέγιστο μέγεθος φωτογραφίας: 10KB.',
+      secondary: 'Μέγιστο μέγεθος φωτογραφίας: 1KB.',
     },
     extra: {
       limit: {
+        // bytes
         maxSize: 1000,
       },
     },
   },
 ];
 
-export const MaxSize = () => (
+export const MaxSize = (_: any) => (
   <FormBuilder
     fields={FIELDS}
     onSubmit={(data) => {

package/src/inputs/ImageInput/__stories__/{WithInvalidImageSize.tsx → WithInitialValues.tsx}

@@ -1,5 +1,6 @@
 import React from 'react';
 import FormBuilder, { Field, Fieldset } from '@digigov/form';
+import logo from '@digigov/form/inputs/ImageInput/__stories__/logo.png';
 import { FieldSpec } from '@digigov/form/types';
 import { Button } from '@digigov/ui/form/Button';
 const FIELDS: FieldSpec[] = [
@@ -9,18 +10,26 @@ const FIELDS: FieldSpec[] = [
     required: true,
     label: {
       primary: 'Ανέβασμα φωτογραφίας',
+      secondary:
+        'Οι επιτρεπόμενες διαστάσεις είναι για το ύψος από 100 μέχρι 400 και για το πλάτος από 100 μέχρι 400.',
     },
     extra: {
       limit: {
-        maxSize: 300,
+        maxHeight: 400,
+        maxWidth: 400,
+        minHeight: 100,
+        minWidth: 100,
       },
     },
   },
 ];
 
-export const WithInvalidImageSize = () => (
+export const WithInitialValues = (_: any) => (
   <FormBuilder
     fields={FIELDS}
+    initial={{
+      image: { src: logo, filename: 'logo.png' },
+    }}
     onSubmit={(data) => {
       console.log(data);
     }}
@@ -33,4 +42,4 @@ export const WithInvalidImageSize = () => (
     <Button type="submit">Συνέχεια</Button>
   </FormBuilder>
 );
-export default WithInvalidImageSize;
+export default WithInitialValues;

package/src/inputs/ImageInput/__stories__/WithInvalidImageDimension.tsx

@@ -23,7 +23,7 @@ const FIELDS: FieldSpec[] = [
   },
 ];
 
-export const WithInvalidImageDimension = () => (
+export const WithInvalidImageDimension = (_: any) => (
   <FormBuilder
     fields={FIELDS}
     onSubmit={(data) => {

package/src/inputs/ImageInput/__stories__/logo.d.ts

@@ -0,0 +1,4 @@
+declare module '*.png' {
+  const value: any;
+  export default value;
+}

package/src/inputs/ImageInput/index.test.tsx

@@ -3,8 +3,8 @@ import { test, expect } from '@playwright/experimental-ct-react';
 import TestVariant from '@digigov/ui/utils/TestVariant'
 import { Default } from '@digigov/form/inputs/ImageInput/__stories__/Default';
 import { MaxSize } from '@digigov/form/inputs/ImageInput/__stories__/MaxSize';
+import { WithInitialValues } from '@digigov/form/inputs/ImageInput/__stories__/WithInitialValues';
 import { WithInvalidImageDimension } from '@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageDimension';
-import { WithInvalidImageSize } from '@digigov/form/inputs/ImageInput/__stories__/WithInvalidImageSize';
 
 test('renders the All ImageInput variants', async ({ mount, page }) => {
   await mount(
@@ -16,16 +16,20 @@ test('renders the All ImageInput variants', async ({ mount, page }) => {
     <TestVariant title="MaxSize">
       <MaxSize />
     </TestVariant>
+    <TestVariant title="WithInitialValues">
+      <WithInitialValues />
+    </TestVariant>
     <TestVariant title="WithInvalidImageDimension">
       <WithInvalidImageDimension />
     </TestVariant>
-    <TestVariant title="WithInvalidImageSize">
-      <WithInvalidImageSize />
-    </TestVariant>
   </div>
   )
   await page.evaluate(() => document.fonts.ready);
 
+  // Move the mouse to the top-left corner to avoid random hover issues
+  await page.mouse.move(0, 0);
+
+
   const screenshot = await page.screenshot({ fullPage: true, animations: 'disabled' });
   expect(screenshot).toMatchSnapshot();
 });