@refinedev/antd 5.36.15 → 5.36.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@refinedev/antd",
-  "version": "5.36.15",
+  "version": "5.36.17",
   "description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
   "private": false,
   "sideEffects": [
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@refinedev/cli": "^2.16.6",
     "@refinedev/ui-tests": "^1.13.0",
-    "@refinedev/core": "^4.42.4",
+    "@refinedev/core": "^4.44.10",
     "@esbuild-plugins/node-resolve": "^0.1.4",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.1.1",

package/src/hooks/fields/useCheckboxGroup/index.ts

@@ -1,6 +1,6 @@
 import { QueryObserverResult } from "@tanstack/react-query";
+import type { Checkbox } from "antd";
 
-import { CheckboxGroupProps } from "antd/lib/checkbox";
 import {
     BaseRecord,
     GetListResponse,
@@ -9,13 +9,21 @@ import {
     useSelect,
     BaseKey,
     pickNotDeprecated,
+    BaseOption,
 } from "@refinedev/core";
 
-export type UseCheckboxGroupReturnType<TData extends BaseRecord = BaseRecord> =
-    {
-        checkboxGroupProps: CheckboxGroupProps;
-        queryResult: QueryObserverResult<GetListResponse<TData>>;
+export type UseCheckboxGroupReturnType<
+    TData extends BaseRecord = BaseRecord,
+    TOption extends BaseOption = BaseOption,
+> = {
+    checkboxGroupProps: Omit<
+        React.ComponentProps<typeof Checkbox.Group>,
+        "options"
+    > & {
+        options: TOption[];
     };
+    queryResult: QueryObserverResult<GetListResponse<TData>>;
+};
 
 type UseCheckboxGroupProps<TQueryFnData, TError, TData> = Omit<
     UseSelectProps<TQueryFnData, TError, TData>,
@@ -42,6 +50,7 @@ export const useCheckboxGroup = <
     TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TData extends BaseRecord = TQueryFnData,
+    TOption extends BaseOption = BaseOption,
 >({
     resource,
     sort,
@@ -63,8 +72,13 @@ export const useCheckboxGroup = <
     TQueryFnData,
     TError,
     TData
->): UseCheckboxGroupReturnType<TData> => {
-    const { queryResult, options } = useSelect({
+>): UseCheckboxGroupReturnType<TData, TOption> => {
+    const { queryResult, options } = useSelect<
+        TQueryFnData,
+        TError,
+        TData,
+        TOption
+    >({
         resource,
         sort,
         sorters,

package/src/hooks/fields/useRadioGroup/index.ts

@@ -1,8 +1,9 @@
 import { QueryObserverResult } from "@tanstack/react-query";
+import type { Radio } from "antd";
 
-import { RadioGroupProps } from "antd/lib/radio";
 import {
     BaseKey,
+    BaseOption,
     BaseRecord,
     GetListResponse,
     HttpError,
@@ -11,8 +12,16 @@ import {
     UseSelectProps,
 } from "@refinedev/core";
 
-export type UseRadioGroupReturnType<TData extends BaseRecord = BaseRecord> = {
-    radioGroupProps: RadioGroupProps;
+export type UseRadioGroupReturnType<
+    TData extends BaseRecord = BaseRecord,
+    TOption extends BaseOption = BaseOption,
+> = {
+    radioGroupProps: Omit<
+        React.ComponentProps<typeof Radio.Group>,
+        "options"
+    > & {
+        options: TOption[];
+    };
     queryResult: QueryObserverResult<GetListResponse<TData>>;
 };
 
@@ -41,6 +50,7 @@ export const useRadioGroup = <
     TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TData extends BaseRecord = TQueryFnData,
+    TOption extends BaseOption = BaseOption,
 >({
     resource,
     sort,
@@ -58,12 +68,16 @@ export const useRadioGroup = <
     meta,
     metaData,
     dataProviderName,
-}: UseRadioGroupProps<
-    TQueryFnData,
-    TError,
-    TData
->): UseRadioGroupReturnType<TData> => {
-    const { queryResult, options } = useSelect({
+}: UseRadioGroupProps<TQueryFnData, TError, TData>): UseRadioGroupReturnType<
+    TData,
+    TOption
+> => {
+    const { queryResult, options } = useSelect<
+        TQueryFnData,
+        TError,
+        TData,
+        TOption
+    >({
         resource,
         sort,
         sorters,

package/src/hooks/fields/useSelect/index.ts

@@ -8,10 +8,14 @@ import {
     GetListResponse,
     HttpError,
     UseSelectProps,
+    BaseOption,
 } from "@refinedev/core";
 
-export type UseSelectReturnType<TData extends BaseRecord = BaseRecord> = {
-    selectProps: SelectProps<{ value: string; label: string }>;
+export type UseSelectReturnType<
+    TData extends BaseRecord = BaseRecord,
+    TOption extends BaseOption = BaseOption,
+> = {
+    selectProps: SelectProps<TOption>;
     queryResult: QueryObserverResult<GetListResponse<TData>>;
     defaultValueQueryResult: QueryObserverResult<GetManyResponse<TData>>;
 };
@@ -31,11 +35,12 @@ export const useSelect = <
     TQueryFnData extends BaseRecord = BaseRecord,
     TError extends HttpError = HttpError,
     TData extends BaseRecord = TQueryFnData,
+    TOption extends BaseOption = BaseOption,
 >(
     props: UseSelectProps<TQueryFnData, TError, TData>,
-): UseSelectReturnType<TData> => {
+): UseSelectReturnType<TData, TOption> => {
     const { queryResult, defaultValueQueryResult, onSearch, options } =
-        useSelectCore(props);
+        useSelectCore<TQueryFnData, TError, TData, TOption>(props);
 
     return {
         selectProps: {

package/src/hooks/form/useForm.ts

@@ -1,7 +1,11 @@
 import React from "react";
 import { FormInstance, FormProps, Form, ButtonProps } from "antd";
 import { useForm as useFormSF } from "sunflower-antd";
-import { AutoSaveProps } from "@refinedev/core";
+import {
+    AutoSaveProps,
+    flattenObjectKeys,
+    propertyPathToArray,
+} from "@refinedev/core";
 
 import {
     HttpError,
@@ -172,13 +176,16 @@ export const useForm = <
 
             // reset antd errors before setting new errors
             const fieldsValue = form.getFieldsValue() as unknown as object;
-            const fields = Object.keys(fieldsValue);
+
+            const fields = Object.keys(flattenObjectKeys(fieldsValue));
+
             parsedErrors = fields.map((field) => {
                 return {
-                    name: field,
+                    name: propertyPathToArray(field),
                     errors: undefined,
                 };
             });
+
             form.setFields(parsedErrors);
 
             const errors = error?.errors;
@@ -209,18 +216,8 @@ export const useForm = <
                     newError = [translatedMessage];
                 }
 
-                // antd form expects the key to be an array.
-                // if the key is a number, it will be parsed to a number because.
-                const newKey = key.split(".").map((item) => {
-                    // check if item is a number
-                    if (!isNaN(Number(item))) {
-                        return Number(item);
-                    }
-                    return item;
-                });
-
                 parsedErrors.push({
-                    name: newKey,
+                    name: propertyPathToArray(key),
                     errors: newError,
                 });
             }