Enable AntD SelectField tests suite

vazco · Mar 23, 2024 · c7a9c37 · c7a9c37
1 parent 85268e5
commit c7a9c37
Show file tree

Hide file tree

Showing 3 changed files with 256 additions and 188 deletions.
diff --git a/packages/uniforms-antd/__tests__/index.ts b/packages/uniforms-antd/__tests__/index.ts
@@ -58,7 +58,7 @@ describe('@RTL', () => {
   // FIXME: AntD has problem with toHaveValue check
   suites.testSubmitField(theme.SubmitField, { skipValueTest: true });
   // FIXME: AntD select does not work with new RTL test implementation
-  // suites.testSelectField(theme.SelectField, { antdTests: true });
+  suites.testSelectField(theme.SelectField, { theme: 'antd' });
   suites.testTextField(theme.TextField);
   suites.testValidatedForm(theme.ValidatedForm);
   suites.testValidatedQuickForm(theme.ValidatedQuickForm);

diff --git a/packages/uniforms-antd/src/SelectField.tsx b/packages/uniforms-antd/src/SelectField.tsx
@@ -41,30 +41,33 @@ export type SelectFieldProps = CheckboxesProps | SelectProps;
 
 function Select(props: SelectFieldProps) {
   const Group = props.fieldType === Array ? CheckboxGroup : RadioGroup;
+  const filteredDOMProps = filterDOMProps(props);
   return wrapField(
     props,
     props.checkboxes ? (
-      // @ts-expect-error: Incorrect `value` type.
-      <Group
-        {...filterDOMProps(props)}
-        disabled={props.disabled}
-        name={props.name}
-        onChange={(eventOrValue: any) => {
-          if (!props.readOnly) {
-            props.onChange(
-              // FIXME: Argument type depends on `props.fieldType`.
-              props.fieldType === Array
-                ? eventOrValue
-                : eventOrValue.target.value,
-            );
-          }
-        }}
-        options={props.options?.map(option => ({
-          ...option,
-          label: option.label ?? option.value,
-        }))}
-        value={props.value}
-      />
+      <span {...filteredDOMProps}>
+        {/* @ts-expect-error: Incorrect `value` type. */}
+        <Group
+          {...filteredDOMProps}
+          disabled={props.disabled}
+          name={props.name}
+          onChange={(eventOrValue: any) => {
+            if (!props.readOnly) {
+              props.onChange(
+                // FIXME: Argument type depends on `props.fieldType`.
+                props.fieldType === Array
+                  ? eventOrValue
+                  : eventOrValue.target.value,
+              );
+            }
+          }}
+          options={props.options?.map(option => ({
+            ...option,
+            label: option.label ?? option.value,
+          }))}
+          value={props.value}
+        />
+      </span>
     ) : (
       <SelectAntD<any>
         allowClear={!props.required}
@@ -86,13 +89,14 @@ function Select(props: SelectFieldProps) {
               : []
             : props.value
         }
-        {...filterDOMProps(props)}
+        {...filteredDOMProps}
       >
         {props.options?.map(option => (
           <SelectAntD.Option
             disabled={option.disabled}
             key={option.key ?? option.value}
             value={option.value}
+            id={`${props.id}-${option.key ?? escape(option.value)}`}
           >
             {option.label ?? option.value}
           </SelectAntD.Option>