@digigov/form 2.0.0-d57821ba → 2.0.0-e20fed09

package/src/inputs/Radio/index.tsx

@@ -2,17 +2,20 @@ import React from 'react';
 import { useWatch } from 'react-hook-form';
 import { UncontrolledFieldProps } from '@digigov/form/Field/types';
 import { FieldOptionProps } from '@digigov/form/inputs/Label';
-import Hint from '@digigov/react-core/Hint';
-import { RadioConditional } from '@digigov/react-core/RadioConditional';
-import RadioContainer from '@digigov/react-core/RadioContainer';
-import RadioItem from '@digigov/react-core/RadioItem';
+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'>>;
@@ -24,13 +27,13 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
   register,
   extra: { options, className },
   disabled,
-  fieldComponent: Field,
+  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,
@@ -40,7 +43,7 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
           selected,
           ...option
         }) => (
-          <div key={`${name}.${v}`}>
+          <Base as="div" key={`${name}.${v}`}>
             <RadioItem
               {...register(name)}
               id={`${name}.${v}`}
@@ -56,7 +59,9 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
                 type: 'radio',
               }}
             >
-              {(label && label.primary && t(label.primary)) || v}
+              {label && label.primary && (
+                <Base as="span">{t(label.primary) || v}</Base>
+              )}
               {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
             </RadioItem>
             {selected && selected()}
@@ -67,7 +72,69 @@ export const RadioButtonsGroup: React.FC<RadioButtonsGroupProps> = ({
                 ))}
               </RadioConditional>
             )}
-          </div>
+          </Base>
+        )
+      )}
+    </RadioContainer>
+  );
+};
+export const ControlledRadioButtonsGroup: React.FC<
+  RadioButtonsGroupProps & { onChange: (e: any) => void; value: any }
+> = ({
+  name,
+  extra: { options, className },
+  disabled,
+  onChange,
+  value,
+  Field,
+  ...props
+}) => {
+  const currentValue: string | undefined = value;
+  const { t } = useTranslation();
+  return (
+    <RadioContainer className={className} id={name}>
+      {options.map(
+        ({
+          label,
+          value: v,
+          show,
+          disabled: optionDisabled,
+          selected,
+          ...option
+        }) => (
+          <React.Fragment key={`${name}.${v}`}>
+            <RadioItem
+              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',
+              }}
+            >
+              {(label && label.primary && t(label.primary)) || v}
+              {label && label.secondary && <Hint>{t(label.secondary)}</Hint>}
+            </RadioItem>
+            {selected && selected()}
+            {currentValue === v && show && (
+              <RadioConditional>
+                {show.map((fieldName) => (
+                  <Field name={fieldName} key={fieldName} />
+                ))}
+              </RadioConditional>
+            )}
+          </React.Fragment>
         )
       )}
     </RadioContainer>

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 { 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/{index.mdx → doc.mdx}

@@ -10,8 +10,4 @@ The select element represents a control that provides a menu of options.
 
 ### Default
 
-<Story
-  packageName="@digigov/form"
-  component="inputs/Select"
-  story="Default.tsx"
-/>
+<code src="@digigov/form/inputs/Select/__stories__/Default.tsx" />

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

@@ -14,6 +14,10 @@ test('renders the All Select variants', async ({ mount, page }) => {
   )
   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 {
+  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>
         ))}