@digigov/form 2.0.0-cbc56209 → 2.0.0-d16ded05

package/src/inputs/Label/index.tsx

@@ -1,24 +1,21 @@
 import React from 'react';
-import { FieldLabelProps } from '@digigov/form/types';
-import Hint from '@digigov/react-core/Hint';
-import LabelTitle from '@digigov/react-core/LabelTitle';
+import type { FieldLabelProps } from '@digigov/form/types';
+import { LabelTitle } from '@digigov/ui/form/LabelContainer';
 import { useTranslation } from '@digigov/ui/i18n';
+import { Hint } from '@digigov/ui/typography/Hint';
 
 export interface FieldOptionProps {
   label?: FieldLabelProps;
   value: string;
   show?: string[];
   disabled?: boolean;
-  selected?: () => React.FC;
+  selected?: () => React.ReactNode;
   divider?: string;
 }
 
 export interface LabelProps {
   primary?: string;
   secondary?: string;
-}
-
-export interface LabelProps {
   className?: string;
   value?: string;
   label?: FieldLabelProps;
@@ -39,8 +36,4 @@ export const Label: React.FC<LabelProps> = ({ className, label, value }) => {
   );
 };
 
-Label.defaultProps = {
-  label: {},
-};
-
 export default Label;

package/src/inputs/OtpInput/OtpInput.stories.js

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

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

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

package/src/inputs/OtpInput/doc.mdx

@@ -0,0 +1,16 @@
+---
+title: OTP Input
+---
+ 
+# OTP input
+
+
+
+A one-time password (OTP) input element of type `otp`, also known as a one-time PIN, one-time authorization code (OTAC) or dynamic password, is a password that is valid for only one login session or transaction, 
+on a computer system or other digital device.
+
+## How to use
+
+### Default
+
+<code src="@digigov/form/inputs/OtpInput/__stories__/Default.tsx" />

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

@@ -0,0 +1,24 @@
+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/OtpInput/__stories__/Default';
+
+test('renders the All OtpInput variants', async ({ mount, page }) => {
+  await mount(
+    
+  <div>
+    <TestVariant title="Default">
+      <Default />
+    </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/OtpInput/index.tsx

@@ -6,7 +6,7 @@ import SingleCharacterInputs, {
 export const RE_DIGIT = new RegExp(/^\d+$/);
 export const REMOVE_SPACES = new RegExp(/\s+/g);
 
-function useOtp(onChange, maxLength) {
+export function useOtp(onChange, maxLength) {
   const [otpValues, setOtpValues] = useState(Array<string>(maxLength).fill(''));
   const handleChange = useCallback(
     (otp: string[]) => {
@@ -40,7 +40,8 @@ function useOtp(onChange, maxLength) {
   }, []);
 
   const focusToPrevInput = useCallback((target: HTMLElement) => {
-    const previousElement = target.previousElementSibling as HTMLInputElement | null;
+    const previousElement =
+      target.previousElementSibling as HTMLInputElement | null;
     if (previousElement) {
       previousElement.focus();
     }
@@ -119,39 +120,49 @@ function useOtp(onChange, maxLength) {
   };
 }
 
-const SingleCharacterInputPart = ({ ...props }) => {
-  return <SingleCharacterInput {...props} />;
-};
+const SingleCharacterInputPart = React.forwardRef<
+  HTMLInputElement,
+  Record<string, any>
+>(({ ...props }, ref) => {
+  return <SingleCharacterInput {...props} ref={ref} />;
+});
+SingleCharacterInputPart.displayName = 'SingleCharacterInputPart';
 
-export const OtpInput = function OtpInput({ name, maxLength = 6, ...props }) {
-  const otp = useOtp(props.onChange, maxLength);
-  return (
-    <SingleCharacterInputs>
-      {otp.otpValues.map((digit, idx) => (
-        <SingleCharacterInputPart
-          name={`${name}-${idx}`}
-          type="text"
-          key={idx}
-          autoComplete="one-time-code"
-          pattern="\d{1}"
-          maxLength={maxLength}
-          value={digit}
-          disabled={props.disabled}
-          aria-required={props['aria-required']}
-          onChange={(e) => otp.handleOtpChange(e, idx)}
-          onInput={(e) => {
-            if (e.target.value === digit) {
-              otp.handleOtpChange(e, idx);
-            }
-          }}
-          onKeyDown={(e) => otp.handleKeyDown(e, idx)}
-          onFocus={otp.handleFocus}
-          onPaste={otp.handlePaste}
-          error={!digit ? props.error : false}
-        />
-      ))}
-    </SingleCharacterInputs>
-  );
-};
+export const OtpInput = React.forwardRef<HTMLInputElement, Record<string, any>>(
+  ({ name, maxLength = 6, ...props }, ref) => {
+    const otp = useOtp(props.onChange, maxLength);
+    return (
+      <SingleCharacterInputs>
+        {otp.otpValues.map((digit, idx) => (
+          <SingleCharacterInputPart
+            ref={idx === 0 ? ref : null}
+            name={`${name}-${idx}`}
+            id={`${name}-${idx}`}
+            type="text"
+            key={idx}
+            autoComplete="one-time-code"
+            pattern="\d{1}"
+            maxLength={maxLength}
+            value={digit}
+            disabled={props.disabled}
+            aria-required={props['aria-required']}
+            onChange={(e) => otp.handleOtpChange(e, idx)}
+            onInput={(e) => {
+              if (e.target.value === digit) {
+                otp.handleOtpChange(e, idx);
+              }
+            }}
+            onKeyDown={(e) => otp.handleKeyDown(e, idx)}
+            onFocus={otp.handleFocus}
+            onPaste={otp.handlePaste}
+            error={!digit ? props.error : false}
+          />
+        ))}
+      </SingleCharacterInputs>
+    );
+  }
+);
+
+OtpInput.displayName = 'OtpInput';
 
 export default OtpInput;

package/src/inputs/Radio/Radio.stories.js

@@ -1,9 +1,12 @@
 import Radio from '@digigov/form/inputs/Radio';
+import doc from './doc.mdx?raw';
 export default {
   title: 'Digigov Form/inputs/Radio',
   component: Radio,
+  tags: ['autodocs'],
+  markdown: doc,
   displayName: 'Radio',
 };
-export * from '@digigov/form/inputs/Radio/__stories__/Default';
-export * from '@digigov/form/inputs/Radio/__stories__/WithDivider';
-export * from '@digigov/form/inputs/Radio/__stories__/Conditional';
+export { Default } from '@digigov/form/inputs/Radio/__stories__/Default';
+export { WithDivider } from '@digigov/form/inputs/Radio/__stories__/WithDivider';
+export { Conditional } from '@digigov/form/inputs/Radio/__stories__/Conditional';

package/src/inputs/Radio/__stories__/Conditional.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import FormBuilder, { Field, FieldSpec } from '@digigov/form';
+import FormBuilder, { Field } from '@digigov/form';
+import { FieldSpec } from '@digigov/form/types';
 import { Button } from '@digigov/ui/form/Button';
 
 const fields: FieldSpec[] = [
@@ -84,7 +85,7 @@ const fields: FieldSpec[] = [
   },
 ];
 
-export const Conditional = () => (
+export const Conditional = (_: any) => (
   <FormBuilder
     onSubmit={(data) => {
       console.log(data);
@@ -95,3 +96,5 @@ export const Conditional = () => (
     <Button type="submit">Συνέχεια</Button>
   </FormBuilder>
 );
+
+export default Conditional;

package/src/inputs/Radio/__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/Radio/__stories__/WithDivider.tsx

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

package/src/inputs/Radio/doc.mdx

@@ -0,0 +1,23 @@
+---
+title: Radio
+---
+ 
+# Radio
+Input element of type `radio` are generally used in radio groups—collections of radio buttons describing a set of related options.
+Radios are used to let a user select one option of a limited number of choices.
+
+## How to use
+
+### Default
+
+<code src="@digigov/form/inputs/Radio/__stories__/Default.tsx" />
+
+
+### Conditional
+
+<code src="@digigov/form/inputs/Radio/__stories__/Conditional.tsx" />
+
+
+### With divider
+
+<code src="@digigov/form/inputs/Radio/__stories__/WithDivider.tsx" />

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

@@ -0,0 +1,32 @@
+import React from 'react';
+import { test, expect } from '@playwright/experimental-ct-react';
+import TestVariant from '@digigov/ui/utils/TestVariant'
+import { Conditional } from '@digigov/form/inputs/Radio/__stories__/Conditional';
+import { Default } from '@digigov/form/inputs/Radio/__stories__/Default';
+import { WithDivider } from '@digigov/form/inputs/Radio/__stories__/WithDivider';
+
+test('renders the All Radio variants', async ({ mount, page }) => {
+  await mount(
+    
+  <div>
+    <TestVariant title="Conditional">
+      <Conditional />
+    </TestVariant>
+    <TestVariant title="Default">
+      <Default />
+    </TestVariant>
+    <TestVariant title="WithDivider">
+      <WithDivider />
+    </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/Radio/index.tsx

@@ -1,21 +1,24 @@
 import React from 'react';
 import { useWatch } from 'react-hook-form';
-import { Field } from '@digigov/form';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
-import { FieldOptionProps } from '@digigov/form/inputs/Label';
-import { RadioConditional } from '@digigov/react-core/RadioConditional';
-import Hint from '@digigov/react-core/Hint';
-import RadioContainer from '@digigov/react-core/RadioContainer';
-import RadioItem from '@digigov/react-core/RadioItem';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { FieldOptionProps } from '@digigov/form/inputs/Label';
+import {
+  RadioContainer,
+  RadioItem,
+  RadioConditional,
+} from '@digigov/ui/form/RadioContainer';
 import { useTranslation } from '@digigov/ui/i18n';
+import { Hint } from '@digigov/ui/typography/Hint';
+import { Base } from '@digigov/ui/utils/Base';
 
 export interface RadioButtonsGroupProps
   extends Omit<UncontrolledFieldProps, 'extra'> {
   extra: {
     className?: string;
-    options: Array<FieldOptionProps>;
+    options: FieldOptionProps[];
     dense?: boolean;
   };
+  fieldComponent?: React.FC<Omit<UncontrolledFieldProps, 'register'>>;
 }
 
 export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
@@ -24,12 +27,13 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
   register,
   extra: { options, className },
   disabled,
+  Field,
   ...props
 }) => {
   const currentValue: string | undefined = useWatch({ control, name });
   const { t } = useTranslation();
   return (
-    <RadioContainer className={className} defaultValue={currentValue} id={name}>
+    <RadioContainer className={className} id={name}>
       {options.map(
         ({
           label,
@@ -39,9 +43,10 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
           selected,
           ...option
         }) => (
-          <div key={`${name}.${v}`}>
+          <Base as="div" key={`${name}.${v}`}>
             <RadioItem
               {...register(name)}
+              id={`${name}.${v}`}
               value={v}
               disabled={disabled || optionDisabled}
               {...option}
@@ -49,6 +54,79 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
                 ...props,
                 reset: undefined,
                 required: undefined,
+                error: undefined,
+                'aria-describedby': undefined,
+                type: 'radio',
+              }}
+            >
+              {label && label.primary && (
+                <Base as="span">{t(label.primary) || v}</Base>
+              )}
+              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
+            </RadioItem>
+            {selected && selected()}
+            {currentValue === v && show && Field && (
+              <RadioConditional>
+                {show.map((fieldName) => (
+                  <Field name={fieldName} key={fieldName} />
+                ))}
+              </RadioConditional>
+            )}
+          </Base>
+        )
+      )}
+    </RadioContainer>
+  );
+};
+export const ControlledRadioButtonsGroup = React.forwardRef<
+  HTMLInputElement,
+  RadioButtonsGroupProps & { onChange: (e: any) => void; value: any }
+>(function ControlledRadioButtonsGroup(
+  {
+    name,
+    extra: { options, className },
+    disabled,
+    onChange,
+    value,
+    Field,
+    ...props
+  },
+  ref
+) {
+  const currentValue: string | undefined = value;
+  const { t } = useTranslation();
+  return (
+    <RadioContainer className={className} id={name}>
+      {options.map(
+        (
+          {
+            label,
+            value: v,
+            show,
+            disabled: optionDisabled,
+            selected,
+            ...option
+          },
+          index
+        ) => (
+          <React.Fragment key={`${name}.${v}`}>
+            <RadioItem
+              ref={index === 0 ? ref : undefined}
+              onChange={(e) => {
+                console.log(e);
+                onChange(e);
+              }}
+              id={`${name}.${v}`}
+              value={v}
+              checked={currentValue === v}
+              disabled={disabled || optionDisabled}
+              {...option}
+              {...{
+                ...props,
+                reset: undefined,
+                required: undefined,
+                error: undefined,
+                Field: undefined,
                 'aria-describedby': undefined,
                 type: 'radio',
               }}
@@ -64,11 +142,11 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
                 ))}
               </RadioConditional>
             )}
-          </div>
+          </React.Fragment>
         )
       )}
     </RadioContainer>
   );
-};
+});
 
 export default RadioButtonsGroup;

package/src/inputs/Select/Select.stories.js

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

package/src/inputs/Select/__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/Select/doc.mdx

@@ -0,0 +1,13 @@
+---
+title: Select
+---
+ 
+# Select
+
+The select element represents a control that provides a menu of options.
+
+## How to use
+
+### Default
+
+<code src="@digigov/form/inputs/Select/__stories__/Default.tsx" />

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

@@ -0,0 +1,24 @@
+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/Select/__stories__/Default';
+
+test('renders the All Select variants', async ({ mount, page }) => {
+  await mount(
+    
+  <div>
+    <TestVariant title="Default">
+      <Default />
+    </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/Select/index.tsx

@@ -1,14 +1,18 @@
 import React from 'react';
-import { UncontrolledFieldProps } from '@digigov/form/Field/types';
-import { FieldOptionProps } from '@digigov/form/inputs/Label';
-import SelectContainer from '@digigov/react-core/SelectContainer';
-import SelectOption from '@digigov/react-core/SelectOption';
+import type { UncontrolledFieldProps } from '@digigov/form/Field/types';
+import type { FieldOptionProps } from '@digigov/form/inputs/Label';
+import {
+  SelectContainer,
+  SelectOption,
+} from '@digigov/ui/form/SelectContainer';
 
-export interface SelectProps extends Omit<UncontrolledFieldProps, 'extra'> {
+export interface SelectProps
+  extends Omit<UncontrolledFieldProps, 'extra' | 'Field'> {
   extra: {
     className?: string;
-    options: Array<FieldOptionProps>;
+    options: FieldOptionProps[];
   };
+  Field?: UncontrolledFieldProps['Field'];
 }
 
 export const Select: React.ExoticComponent<SelectProps> = React.forwardRef(
@@ -16,16 +20,23 @@ export const Select: React.ExoticComponent<SelectProps> = React.forwardRef(
     { name, extra: { options, className }, disabled, ...props },
     ref: never
   ) {
+    delete props.Field;
     return (
       <SelectContainer
         className={className}
         ref={ref}
         name={name}
+        id={name}
         disabled={disabled}
-        {...{ ...props, reset: undefined, required: undefined }}
+        {...{
+          ...props,
+          reset: undefined,
+          error: undefined,
+          required: undefined,
+        }}
       >
-        {options.map(({ value, label }) => (
-          <SelectOption key={value} value={value}>
+        {options.map(({ value, label }, index) => (
+          <SelectOption key={index} value={value}>
             {label && label.primary ? label.primary : value}
           </SelectOption>
         ))}