@faasjs/ant-design 2.3.0 → 2.4.0

package/dist/index.d.mts

@@ -9,11 +9,12 @@ import * as antd_es_modal_PurePanel from 'antd/es/modal/PurePanel';
 import * as antd_es_modal_useModal from 'antd/es/modal/useModal';
 import * as antd_es_modal_confirm from 'antd/es/modal/confirm';
 import * as react from 'react';
-import { CSSProperties, ReactNode, ReactElement, LazyExoticComponent, ComponentType } from 'react';
+import { Dispatch, SetStateAction, CSSProperties, ReactNode, ReactElement, LazyExoticComponent, ComponentType } from 'react';
 export { lazy } from 'react';
 import { ModalProps as ModalProps$1, DrawerProps as DrawerProps$1, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, DatePickerProps, FormInstance, DescriptionsProps, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1, FormProps as FormProps$1, ButtonProps, TabsProps as TabsProps$1 } from 'antd';
 import { BrowserRouterProps, RouteProps } from 'react-router-dom';
 import { Dayjs } from 'dayjs';
+import * as antd_es_form_FormItem from 'antd/es/form/FormItem';
 import { RuleObject } from 'rc-field-form/lib/interface';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
 import * as antd_es_form_context from 'antd/es/form/context';
@@ -32,7 +33,7 @@ declare const Modal: react.FC<ModalProps$1> & antd_es_modal_confirm.ModalStaticF
 interface ModalProps extends ModalProps$1 {
     children?: JSX.Element | JSX.Element[] | string;
 }
-type setModalProps = (changes: Partial<ModalProps> | ((prev: Partial<ModalProps>) => Partial<ModalProps>)) => void;
+type setModalProps = Dispatch<SetStateAction<ModalProps>>;
 /**
  * Hook style modal
  *
@@ -53,13 +54,13 @@ declare function useModal(init?: ModalProps): {
     setModalProps: setModalProps;
 };
 
-declare const Drawer: react.FC<DrawerProps> & {
+declare const Drawer: React.FC<DrawerProps> & {
     whyDidYouRender?: boolean;
 };
 interface DrawerProps extends DrawerProps$1 {
     children?: JSX.Element | JSX.Element[];
 }
-type setDrawerProps = (changes: Partial<DrawerProps> | ((prev: Partial<DrawerProps>) => Partial<DrawerProps>)) => void;
+type setDrawerProps = Dispatch<SetStateAction<DrawerProps>>;
 /**
  * Hook style drawer
  *
@@ -274,9 +275,9 @@ declare function FormItem<T = any>(props: FormItemProps<T>): react_jsx_runtime.J
 declare namespace FormItem {
     var whyDidYouRender: boolean;
     var useStatus: () => {
-        status?: "" | "success" | "error" | "warning" | "validating";
-        errors: react.ReactNode[];
-        warnings: react.ReactNode[];
+        status?: antd_es_form_FormItem.ValidateStatus;
+        errors: React.ReactNode[];
+        warnings: React.ReactNode[];
     };
 }
 

package/dist/index.d.ts

@@ -9,11 +9,12 @@ import * as antd_es_modal_PurePanel from 'antd/es/modal/PurePanel';
 import * as antd_es_modal_useModal from 'antd/es/modal/useModal';
 import * as antd_es_modal_confirm from 'antd/es/modal/confirm';
 import * as react from 'react';
-import { CSSProperties, ReactNode, ReactElement, LazyExoticComponent, ComponentType } from 'react';
+import { Dispatch, SetStateAction, CSSProperties, ReactNode, ReactElement, LazyExoticComponent, ComponentType } from 'react';
 export { lazy } from 'react';
 import { ModalProps as ModalProps$1, DrawerProps as DrawerProps$1, FormItemProps as FormItemProps$1, InputProps, InputNumberProps, SwitchProps, SelectProps, DatePickerProps, FormInstance, DescriptionsProps, TableColumnProps, TablePaginationConfig, TableProps as TableProps$1, FormProps as FormProps$1, ButtonProps, TabsProps as TabsProps$1 } from 'antd';
 import { BrowserRouterProps, RouteProps } from 'react-router-dom';
 import { Dayjs } from 'dayjs';
+import * as antd_es_form_FormItem from 'antd/es/form/FormItem';
 import { RuleObject } from 'rc-field-form/lib/interface';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
 import * as antd_es_form_context from 'antd/es/form/context';
@@ -32,7 +33,7 @@ declare const Modal: react.FC<ModalProps$1> & antd_es_modal_confirm.ModalStaticF
 interface ModalProps extends ModalProps$1 {
     children?: JSX.Element | JSX.Element[] | string;
 }
-type setModalProps = (changes: Partial<ModalProps> | ((prev: Partial<ModalProps>) => Partial<ModalProps>)) => void;
+type setModalProps = Dispatch<SetStateAction<ModalProps>>;
 /**
  * Hook style modal
  *
@@ -53,13 +54,13 @@ declare function useModal(init?: ModalProps): {
     setModalProps: setModalProps;
 };
 
-declare const Drawer: react.FC<DrawerProps> & {
+declare const Drawer: React.FC<DrawerProps> & {
     whyDidYouRender?: boolean;
 };
 interface DrawerProps extends DrawerProps$1 {
     children?: JSX.Element | JSX.Element[];
 }
-type setDrawerProps = (changes: Partial<DrawerProps> | ((prev: Partial<DrawerProps>) => Partial<DrawerProps>)) => void;
+type setDrawerProps = Dispatch<SetStateAction<DrawerProps>>;
 /**
  * Hook style drawer
  *
@@ -274,9 +275,9 @@ declare function FormItem<T = any>(props: FormItemProps<T>): react_jsx_runtime.J
 declare namespace FormItem {
     var whyDidYouRender: boolean;
     var useStatus: () => {
-        status?: "" | "success" | "error" | "warning" | "validating";
-        errors: react.ReactNode[];
-        warnings: react.ReactNode[];
+        status?: antd_es_form_FormItem.ValidateStatus;
+        errors: React.ReactNode[];
+        warnings: React.ReactNode[];
     };
 }
 

package/dist/index.js

@@ -150,13 +150,10 @@ function ConfigProvider(props) {
           baseTheme
         )
       );
-    } else
-      setTheme(lodashEs.defaultsDeep(props.theme, baseTheme));
-    if (props.faasClientOptions)
-      react.FaasReactClient(props.faasClientOptions);
+    } else setTheme(lodashEs.defaultsDeep(props.theme, baseTheme));
+    if (props.faasClientOptions) react.FaasReactClient(props.faasClientOptions);
   }, [JSON.stringify(props.theme)]);
-  if (!theme)
-    return null;
+  if (!theme) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(ConfigContext.Provider, { value: { theme }, children: props.children });
 }
 function useConfigContext() {
@@ -175,10 +172,8 @@ function RoutesApp(props) {
   const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
   react$1.useEffect(() => {
     console.debug("location", location);
-    if (drawerProps.open)
-      setDrawerProps({ open: false });
-    if (modalProps.open)
-      setModalProps({ open: false });
+    if (drawerProps.open) setDrawerProps({ open: false });
+    if (modalProps.open) setModalProps({ open: false });
   }, [location]);
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: props.children });
 }
@@ -225,8 +220,7 @@ function Blank(options) {
 }
 Blank.whyDidYouRender = true;
 function transferOptions(options) {
-  if (!options)
-    return [];
+  if (!options) return [];
   return options.map(
     (item) => typeof item === "object" ? item : {
       label: lodashEs.upperFirst(item.toString()),
@@ -235,43 +229,35 @@ function transferOptions(options) {
   );
 }
 function transferValue(type, value) {
-  if (!type)
-    type = "string";
+  if (!type) type = "string";
   if (!type.endsWith("[]") && (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined"))
     return null;
   if (type.endsWith("[]")) {
-    if (!value)
-      value = [];
-    if (typeof value === "string")
-      value = value.split(",").filter(Boolean);
-    if (!Array.isArray(value))
-      value = [value];
+    if (!value) value = [];
+    if (typeof value === "string") value = value.split(",").filter(Boolean);
+    if (!Array.isArray(value)) value = [value];
     value = value.map(
       (item) => transferValue(type.replace("[]", ""), item)
     );
   }
   switch (type) {
     case "boolean":
-      if (typeof value === "string")
-        value = value === "true";
+      if (typeof value === "string") value = value === "true";
       break;
     case "number":
-      if (typeof value === "string")
-        value = Number(value);
+      if (typeof value === "string") value = Number(value);
       break;
     case "date":
     case "time":
       if (typeof value === "number" && value.toString().length === 10)
         value = value * 1e3;
-      if (!dayjs2__default.default.isDayjs(value))
-        value = dayjs2__default.default(value);
+      if (!dayjs2__default.default.isDayjs(value)) value = dayjs2__default.default(value);
       break;
   }
   return value;
 }
 function Loading(props) {
-  if (props.loading === false)
-    return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: props.children });
+  if (props.loading === false) return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: props.children });
   return /* @__PURE__ */ jsxRuntime.jsx(
     "div",
     {
@@ -305,8 +291,7 @@ function DescriptionItemContent(props) {
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
       propsCopy.item.title = lodashEs.upperFirst(propsCopy.item.id);
-    if (!propsCopy.item.type)
-      propsCopy.item.type = "string";
+    if (!propsCopy.item.type) propsCopy.item.type = "string";
     if ((_a2 = propsCopy.item.options) == null ? void 0 : _a2.length) {
       propsCopy.item.options = transferOptions(propsCopy.item.options);
     }
@@ -324,8 +309,7 @@ function DescriptionItemContent(props) {
     }
     setComputedProps(propsCopy);
   }, [props]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   if ((_a = computedProps.extendTypes) == null ? void 0 : _a[computedProps.item.type]) {
     if (computedProps.extendTypes[computedProps.item.type].children)
       return react$1.cloneElement(
@@ -345,16 +329,14 @@ function DescriptionItemContent(props) {
       ) });
     throw Error(`${computedProps.item.type} requires children or render`);
   }
-  if (computedProps.item.descriptionChildren === null)
-    return null;
+  if (computedProps.item.descriptionChildren === null) return null;
   if (computedProps.item.descriptionChildren)
     return react$1.cloneElement(computedProps.item.descriptionChildren, {
       scene: "description",
       value: computedProps.value,
       values: computedProps.values
     });
-  if (computedProps.item.children === null)
-    return null;
+  if (computedProps.item.children === null) return null;
   if (computedProps.item.children)
     return react$1.cloneElement(computedProps.item.children, {
       scene: "description",
@@ -407,8 +389,7 @@ function DescriptionItemContent(props) {
     case "date":
       return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: computedProps.value.format("YYYY-MM-DD") });
     case "object":
-      if (!computedProps.value)
-        return /* @__PURE__ */ jsxRuntime.jsx(Blank, {});
+      if (!computedProps.value) return /* @__PURE__ */ jsxRuntime.jsx(Blank, {});
       return /* @__PURE__ */ jsxRuntime.jsx(
         Description,
         {
@@ -469,16 +450,12 @@ function Description(props) {
 }
 Description.whyDidYouRender = true;
 function processProps(propsCopy, config) {
-  if (!propsCopy.title)
-    propsCopy.title = lodashEs.upperFirst(propsCopy.id);
+  if (!propsCopy.title) propsCopy.title = lodashEs.upperFirst(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
     propsCopy.label = propsCopy.title;
-  if (!propsCopy.name)
-    propsCopy.name = propsCopy.id;
-  if (!propsCopy.type)
-    propsCopy.type = "string";
-  if (!propsCopy.rules)
-    propsCopy.rules = [];
+  if (!propsCopy.name) propsCopy.name = propsCopy.id;
+  if (!propsCopy.type) propsCopy.type = "string";
+  if (!propsCopy.rules) propsCopy.rules = [];
   if (propsCopy.required) {
     if (propsCopy.type.endsWith("[]"))
       propsCopy.rules.push({
@@ -496,8 +473,7 @@ function processProps(propsCopy, config) {
         message: `${propsCopy.label || propsCopy.title} ${config.required}`
       });
   }
-  if (!propsCopy.input)
-    propsCopy.input = {};
+  if (!propsCopy.input) propsCopy.input = {};
   if (propsCopy.options)
     propsCopy.input.options = transferOptions(
       propsCopy.options
@@ -507,8 +483,7 @@ function processProps(propsCopy, config) {
       propsCopy.valuePropName = "checked";
       break;
     case "object":
-      if (!Array.isArray(propsCopy.name))
-        propsCopy.name = [propsCopy.name];
+      if (!Array.isArray(propsCopy.name)) propsCopy.name = [propsCopy.name];
       for (const sub of propsCopy.object) {
         if (!sub.name)
           sub.name = propsCopy.name.concat(sub.id);
@@ -545,18 +520,15 @@ function FormItem(props) {
     }
     setComputedProps(processProps(propsCopy, theme.common));
   }, [props]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   if (hidden)
     return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsxRuntime.jsx(antd.Input, { hidden: true }) });
   if (extendTypes == null ? void 0 : extendTypes[computedProps.type])
     return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, children: extendTypes[computedProps.type].children });
-  if (computedProps.formChildren === null)
-    return null;
+  if (computedProps.formChildren === null) return null;
   if (computedProps.formChildren)
     return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, children: react$1.cloneElement(computedProps.formChildren, { scene: "form" }) });
-  if (computedProps.children === null)
-    return null;
+  if (computedProps.children === null) return null;
   if (computedProps.children)
     return /* @__PURE__ */ jsxRuntime.jsx(antd.Form.Item, { ...computedProps, children: react$1.cloneElement(computedProps.children, { scene: "form" }) });
   if (computedProps.formRender)
@@ -784,12 +756,10 @@ function Form(props) {
           propsCopy.initialValues[key]
         );
         const item = propsCopy.items.find((item2) => item2.id === key);
-        if (item == null ? void 0 : item.if)
-          item.hidden = !item.if(propsCopy.initialValues);
+        if (item == null ? void 0 : item.if) item.hidden = !item.if(propsCopy.initialValues);
       }
       for (const item of propsCopy.items) {
-        if (item.if)
-          item.hidden = !item.if(propsCopy.initialValues);
+        if (item.if) item.hidden = !item.if(propsCopy.initialValues);
       }
       setInitialValues(propsCopy.initialValues);
       delete propsCopy.initialValues;
@@ -810,8 +780,7 @@ function Form(props) {
                 } : values2
               )
             );
-          } else
-            await props.onFinish(values);
+          } else await props.onFinish(values);
         } catch (error) {
           console.error(error);
         }
@@ -853,8 +822,7 @@ function Form(props) {
       if (props.onValuesChange) {
         props.onValuesChange(changedValues, allValues);
       }
-      if (!props.items)
-        return;
+      if (!props.items) return;
       for (const key in changedValues) {
         const item = computedProps.items.find((i) => i.id === key);
         if (item == null ? void 0 : item.onValueChange)
@@ -864,14 +832,12 @@ function Form(props) {
     [computedProps]
   );
   react$1.useEffect(() => {
-    if (!initialValues)
-      return;
+    if (!initialValues) return;
     console.debug("Form:initialValues", initialValues);
     form.setFieldsValue(initialValues);
     setInitialValues(null);
   }, [computedProps]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   return /* @__PURE__ */ jsxRuntime.jsxs(antd.Form, { ...computedProps, onValuesChange, children: [
     computedProps.beforeItems,
     (_a = computedProps.items) == null ? void 0 : _a.map(
@@ -1037,8 +1003,7 @@ function processValue(item, value) {
     if (["string", "number", "boolean"].includes(item.type))
       return ((_a = item.options.find((option) => option.value === transferred)) == null ? void 0 : _a.label) || transferred;
   }
-  if (item.type.endsWith("[]"))
-    return transferred.join(", ");
+  if (item.type.endsWith("[]")) return transferred.join(", ");
   if (["date", "time"].includes(item.type))
     return transferred.format(
       item.type === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss"
@@ -1049,8 +1014,7 @@ function Table(props) {
   const [columns, setColumns] = react$1.useState();
   const { theme } = useConfigContext();
   const generateFilterDropdown = (item) => {
-    if (item.filterDropdown && item.filterDropdown !== true)
-      return;
+    if (item.filterDropdown && item.filterDropdown !== true) return;
     if (item.options.length < 11) {
       if (!item.filters)
         item.filters = item.options.map((o) => ({
@@ -1082,8 +1046,7 @@ function Table(props) {
             },
             mode: "multiple",
             filterOption: (input, option) => {
-              if (!input || !option || !option.label)
-                return true;
+              if (!input || !option || !option.label) return true;
               input = input.trim();
               return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
             }
@@ -1097,14 +1060,10 @@ function Table(props) {
     var _a, _b, _c;
     const items = lodashEs.cloneDeep(props.items);
     for (const item of items) {
-      if (!item.key)
-        item.key = item.id;
-      if (!item.dataIndex)
-        item.dataIndex = item.id;
-      if (!item.title)
-        item.title = lodashEs.upperFirst(item.id);
-      if (!item.type)
-        item.type = "string";
+      if (!item.key) item.key = item.id;
+      if (!item.dataIndex) item.dataIndex = item.id;
+      if (!item.title) item.title = lodashEs.upperFirst(item.id);
+      if (!item.type) item.type = "string";
       if ((_a = item.options) == null ? void 0 : _a.length) {
         item.options = transferOptions(item.options);
         item.filters = item.options.map((o) => ({
@@ -1116,16 +1075,14 @@ function Table(props) {
         });
         generateFilterDropdown(item);
       }
-      if (item.tableChildren === null)
-        item.render = () => null;
+      if (item.tableChildren === null) item.render = () => null;
       else if (item.tableChildren)
         item.render = (value, values) => react$1.cloneElement(item.tableChildren, {
           scene: "table",
           value,
           values
         });
-      else if (item.children === null)
-        item.render = () => null;
+      else if (item.children === null) item.render = () => null;
       else if (item.children)
         item.render = (value, values) => react$1.cloneElement(item.children, {
           scene: "table",
@@ -1141,21 +1098,17 @@ function Table(props) {
           });
         else if (props.extendTypes[item.type].render)
           item.render = props.extendTypes[item.type].render;
-        else
-          throw Error(`${item.type} requires children or render`);
+        else throw Error(`${item.type} requires children or render`);
         continue;
       }
       switch (item.type) {
         case "string":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (!value || lodashEs.isNil(value))
-                  return true;
-                if (lodashEs.isNil(row[item.id]))
-                  return false;
+                if (!value || lodashEs.isNil(value)) return true;
+                if (lodashEs.isNil(row[item.id])) return false;
                 return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto")
@@ -1182,8 +1135,7 @@ function Table(props) {
           }
           break;
         case "string[]":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
@@ -1219,17 +1171,14 @@ function Table(props) {
           }
           break;
         case "number":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (value === null)
-                  return true;
-                if (lodashEs.isNil(row[item.id]))
-                  return false;
+                if (value === null) return true;
+                if (lodashEs.isNil(row[item.id])) return false;
                 return value == row[item.id];
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters)
@@ -1263,8 +1212,7 @@ function Table(props) {
               item.onFilter = (value, row) => {
                 if (value === null && (!row[item.id] || !row[item.id].length))
                   return true;
-                if (!row[item.id] || !row[item.id].length)
-                  return false;
+                if (!row[item.id] || !row[item.id].length) return false;
                 return row[item.id].includes(Number(value));
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters)
@@ -1370,14 +1318,11 @@ function Table(props) {
           }
           break;
         case "date":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b, order) => {
-              if (lodashEs.isNil(a[item.id]))
-                return order === "ascend" ? 1 : -1;
-              if (lodashEs.isNil(b[item.id]))
-                return order === "ascend" ? -1 : 1;
+              if (lodashEs.isNil(a[item.id])) return order === "ascend" ? 1 : -1;
+              if (lodashEs.isNil(b[item.id])) return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
           if (item.filterDropdown !== false) {
@@ -1400,24 +1345,19 @@ function Table(props) {
               );
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (lodashEs.isNil(value[0]))
-                  return true;
-                if (lodashEs.isNil(row[item.id]))
-                  return false;
+                if (lodashEs.isNil(value[0])) return true;
+                if (lodashEs.isNil(row[item.id])) return false;
                 return dayjs2__default.default(row[item.id]) >= dayjs2__default.default(value[0]) && dayjs2__default.default(row[item.id]) <= dayjs2__default.default(value[1]);
               };
           }
           break;
         case "time":
           item.width = (_c = item.width) != null ? _c : 200;
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b, order) => {
-              if (lodashEs.isNil(a[item.id]))
-                return order === "ascend" ? 1 : -1;
-              if (lodashEs.isNil(b[item.id]))
-                return order === "ascend" ? -1 : 1;
+              if (lodashEs.isNil(a[item.id])) return order === "ascend" ? 1 : -1;
+              if (lodashEs.isNil(b[item.id])) return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
           if (item.filterDropdown !== false) {
@@ -1440,10 +1380,8 @@ function Table(props) {
               );
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (lodashEs.isNil(value[0]))
-                  return true;
-                if (lodashEs.isNil(row[item.id]))
-                  return false;
+                if (lodashEs.isNil(value[0])) return true;
+                if (lodashEs.isNil(row[item.id])) return false;
                 return dayjs2__default.default(row[item.id]) >= dayjs2__default.default(value[0]) && dayjs2__default.default(row[item.id]) <= dayjs2__default.default(value[1]);
               };
           }
@@ -1472,12 +1410,10 @@ function Table(props) {
             )) });
           break;
         default:
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false && !item.onFilter && !props.faasData)
             item.onFilter = (value, row) => {
-              if (value === null && lodashEs.isNil(row[item.id]))
-                return true;
+              if (value === null && lodashEs.isNil(row[item.id])) return true;
               return value === row[item.id];
             };
           break;
@@ -1486,8 +1422,7 @@ function Table(props) {
     setColumns(items);
   }, [props.items]);
   react$1.useEffect(() => {
-    if (!props.dataSource || !columns)
-      return;
+    if (!props.dataSource || !columns) return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
         const options = lodashEs.uniqBy(props.dataSource, column.id).map((v) => ({
@@ -1505,8 +1440,7 @@ function Table(props) {
       }
     }
   }, [props.dataSource, columns]);
-  if (!columns)
-    return null;
+  if (!columns) return null;
   if (props.dataSource)
     return /* @__PURE__ */ jsxRuntime.jsx(
       antd.Table,
@@ -1529,8 +1463,7 @@ function FaasDataTable({
 }) {
   const [currentColumns, setCurrentColumns] = react$1.useState(columns);
   react$1.useEffect(() => {
-    if (!data || Array.isArray(data))
-      return;
+    if (!data || Array.isArray(data)) return;
     setCurrentColumns((prev) => {
       var _a;
       const newColumns = [...prev];
@@ -1545,8 +1478,7 @@ function FaasDataTable({
             value: null
           });
           column.render = (value) => processValue(column, value);
-          if (column.filterDropdown)
-            delete column.filterDropdown;
+          if (column.filterDropdown) delete column.filterDropdown;
           continue;
         }
         if (column.optionsType === "auto" && !column.options && !column.filters) {

package/dist/index.mjs

@@ -146,13 +146,10 @@ function ConfigProvider(props) {
           baseTheme
         )
       );
-    } else
-      setTheme(defaultsDeep(props.theme, baseTheme));
-    if (props.faasClientOptions)
-      FaasReactClient(props.faasClientOptions);
+    } else setTheme(defaultsDeep(props.theme, baseTheme));
+    if (props.faasClientOptions) FaasReactClient(props.faasClientOptions);
   }, [JSON.stringify(props.theme)]);
-  if (!theme)
-    return null;
+  if (!theme) return null;
   return /* @__PURE__ */ jsx(ConfigContext.Provider, { value: { theme }, children: props.children });
 }
 function useConfigContext() {
@@ -171,10 +168,8 @@ function RoutesApp(props) {
   const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
   useEffect(() => {
     console.debug("location", location);
-    if (drawerProps.open)
-      setDrawerProps({ open: false });
-    if (modalProps.open)
-      setModalProps({ open: false });
+    if (drawerProps.open) setDrawerProps({ open: false });
+    if (modalProps.open) setModalProps({ open: false });
   }, [location]);
   return /* @__PURE__ */ jsx(Fragment, { children: props.children });
 }
@@ -221,8 +216,7 @@ function Blank(options) {
 }
 Blank.whyDidYouRender = true;
 function transferOptions(options) {
-  if (!options)
-    return [];
+  if (!options) return [];
   return options.map(
     (item) => typeof item === "object" ? item : {
       label: upperFirst(item.toString()),
@@ -231,43 +225,35 @@ function transferOptions(options) {
   );
 }
 function transferValue(type, value) {
-  if (!type)
-    type = "string";
+  if (!type) type = "string";
   if (!type.endsWith("[]") && (typeof value === "undefined" || value === null || value === "" || value === "null" || value === "undefined"))
     return null;
   if (type.endsWith("[]")) {
-    if (!value)
-      value = [];
-    if (typeof value === "string")
-      value = value.split(",").filter(Boolean);
-    if (!Array.isArray(value))
-      value = [value];
+    if (!value) value = [];
+    if (typeof value === "string") value = value.split(",").filter(Boolean);
+    if (!Array.isArray(value)) value = [value];
     value = value.map(
       (item) => transferValue(type.replace("[]", ""), item)
     );
   }
   switch (type) {
     case "boolean":
-      if (typeof value === "string")
-        value = value === "true";
+      if (typeof value === "string") value = value === "true";
       break;
     case "number":
-      if (typeof value === "string")
-        value = Number(value);
+      if (typeof value === "string") value = Number(value);
       break;
     case "date":
     case "time":
       if (typeof value === "number" && value.toString().length === 10)
         value = value * 1e3;
-      if (!dayjs2.isDayjs(value))
-        value = dayjs2(value);
+      if (!dayjs2.isDayjs(value)) value = dayjs2(value);
       break;
   }
   return value;
 }
 function Loading(props) {
-  if (props.loading === false)
-    return /* @__PURE__ */ jsx(Fragment, { children: props.children });
+  if (props.loading === false) return /* @__PURE__ */ jsx(Fragment, { children: props.children });
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -301,8 +287,7 @@ function DescriptionItemContent(props) {
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
       propsCopy.item.title = upperFirst(propsCopy.item.id);
-    if (!propsCopy.item.type)
-      propsCopy.item.type = "string";
+    if (!propsCopy.item.type) propsCopy.item.type = "string";
     if ((_a2 = propsCopy.item.options) == null ? void 0 : _a2.length) {
       propsCopy.item.options = transferOptions(propsCopy.item.options);
     }
@@ -320,8 +305,7 @@ function DescriptionItemContent(props) {
     }
     setComputedProps(propsCopy);
   }, [props]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   if ((_a = computedProps.extendTypes) == null ? void 0 : _a[computedProps.item.type]) {
     if (computedProps.extendTypes[computedProps.item.type].children)
       return cloneElement(
@@ -341,16 +325,14 @@ function DescriptionItemContent(props) {
       ) });
     throw Error(`${computedProps.item.type} requires children or render`);
   }
-  if (computedProps.item.descriptionChildren === null)
-    return null;
+  if (computedProps.item.descriptionChildren === null) return null;
   if (computedProps.item.descriptionChildren)
     return cloneElement(computedProps.item.descriptionChildren, {
       scene: "description",
       value: computedProps.value,
       values: computedProps.values
     });
-  if (computedProps.item.children === null)
-    return null;
+  if (computedProps.item.children === null) return null;
   if (computedProps.item.children)
     return cloneElement(computedProps.item.children, {
       scene: "description",
@@ -403,8 +385,7 @@ function DescriptionItemContent(props) {
     case "date":
       return /* @__PURE__ */ jsx(Fragment, { children: computedProps.value.format("YYYY-MM-DD") });
     case "object":
-      if (!computedProps.value)
-        return /* @__PURE__ */ jsx(Blank, {});
+      if (!computedProps.value) return /* @__PURE__ */ jsx(Blank, {});
       return /* @__PURE__ */ jsx(
         Description,
         {
@@ -465,16 +446,12 @@ function Description(props) {
 }
 Description.whyDidYouRender = true;
 function processProps(propsCopy, config) {
-  if (!propsCopy.title)
-    propsCopy.title = upperFirst(propsCopy.id);
+  if (!propsCopy.title) propsCopy.title = upperFirst(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
     propsCopy.label = propsCopy.title;
-  if (!propsCopy.name)
-    propsCopy.name = propsCopy.id;
-  if (!propsCopy.type)
-    propsCopy.type = "string";
-  if (!propsCopy.rules)
-    propsCopy.rules = [];
+  if (!propsCopy.name) propsCopy.name = propsCopy.id;
+  if (!propsCopy.type) propsCopy.type = "string";
+  if (!propsCopy.rules) propsCopy.rules = [];
   if (propsCopy.required) {
     if (propsCopy.type.endsWith("[]"))
       propsCopy.rules.push({
@@ -492,8 +469,7 @@ function processProps(propsCopy, config) {
         message: `${propsCopy.label || propsCopy.title} ${config.required}`
       });
   }
-  if (!propsCopy.input)
-    propsCopy.input = {};
+  if (!propsCopy.input) propsCopy.input = {};
   if (propsCopy.options)
     propsCopy.input.options = transferOptions(
       propsCopy.options
@@ -503,8 +479,7 @@ function processProps(propsCopy, config) {
       propsCopy.valuePropName = "checked";
       break;
     case "object":
-      if (!Array.isArray(propsCopy.name))
-        propsCopy.name = [propsCopy.name];
+      if (!Array.isArray(propsCopy.name)) propsCopy.name = [propsCopy.name];
       for (const sub of propsCopy.object) {
         if (!sub.name)
           sub.name = propsCopy.name.concat(sub.id);
@@ -541,18 +516,15 @@ function FormItem(props) {
     }
     setComputedProps(processProps(propsCopy, theme.common));
   }, [props]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   if (hidden)
     return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, noStyle: true, rules: [], children: /* @__PURE__ */ jsx(Input, { hidden: true }) });
   if (extendTypes == null ? void 0 : extendTypes[computedProps.type])
     return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, children: extendTypes[computedProps.type].children });
-  if (computedProps.formChildren === null)
-    return null;
+  if (computedProps.formChildren === null) return null;
   if (computedProps.formChildren)
     return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, children: cloneElement(computedProps.formChildren, { scene: "form" }) });
-  if (computedProps.children === null)
-    return null;
+  if (computedProps.children === null) return null;
   if (computedProps.children)
     return /* @__PURE__ */ jsx(Form$1.Item, { ...computedProps, children: cloneElement(computedProps.children, { scene: "form" }) });
   if (computedProps.formRender)
@@ -780,12 +752,10 @@ function Form(props) {
           propsCopy.initialValues[key]
         );
         const item = propsCopy.items.find((item2) => item2.id === key);
-        if (item == null ? void 0 : item.if)
-          item.hidden = !item.if(propsCopy.initialValues);
+        if (item == null ? void 0 : item.if) item.hidden = !item.if(propsCopy.initialValues);
       }
       for (const item of propsCopy.items) {
-        if (item.if)
-          item.hidden = !item.if(propsCopy.initialValues);
+        if (item.if) item.hidden = !item.if(propsCopy.initialValues);
       }
       setInitialValues(propsCopy.initialValues);
       delete propsCopy.initialValues;
@@ -806,8 +776,7 @@ function Form(props) {
                 } : values2
               )
             );
-          } else
-            await props.onFinish(values);
+          } else await props.onFinish(values);
         } catch (error) {
           console.error(error);
         }
@@ -849,8 +818,7 @@ function Form(props) {
       if (props.onValuesChange) {
         props.onValuesChange(changedValues, allValues);
       }
-      if (!props.items)
-        return;
+      if (!props.items) return;
       for (const key in changedValues) {
         const item = computedProps.items.find((i) => i.id === key);
         if (item == null ? void 0 : item.onValueChange)
@@ -860,14 +828,12 @@ function Form(props) {
     [computedProps]
   );
   useEffect(() => {
-    if (!initialValues)
-      return;
+    if (!initialValues) return;
     console.debug("Form:initialValues", initialValues);
     form.setFieldsValue(initialValues);
     setInitialValues(null);
   }, [computedProps]);
-  if (!computedProps)
-    return null;
+  if (!computedProps) return null;
   return /* @__PURE__ */ jsxs(Form$1, { ...computedProps, onValuesChange, children: [
     computedProps.beforeItems,
     (_a = computedProps.items) == null ? void 0 : _a.map(
@@ -1033,8 +999,7 @@ function processValue(item, value) {
     if (["string", "number", "boolean"].includes(item.type))
       return ((_a = item.options.find((option) => option.value === transferred)) == null ? void 0 : _a.label) || transferred;
   }
-  if (item.type.endsWith("[]"))
-    return transferred.join(", ");
+  if (item.type.endsWith("[]")) return transferred.join(", ");
   if (["date", "time"].includes(item.type))
     return transferred.format(
       item.type === "date" ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss"
@@ -1045,8 +1010,7 @@ function Table(props) {
   const [columns, setColumns] = useState();
   const { theme } = useConfigContext();
   const generateFilterDropdown = (item) => {
-    if (item.filterDropdown && item.filterDropdown !== true)
-      return;
+    if (item.filterDropdown && item.filterDropdown !== true) return;
     if (item.options.length < 11) {
       if (!item.filters)
         item.filters = item.options.map((o) => ({
@@ -1078,8 +1042,7 @@ function Table(props) {
             },
             mode: "multiple",
             filterOption: (input, option) => {
-              if (!input || !option || !option.label)
-                return true;
+              if (!input || !option || !option.label) return true;
               input = input.trim();
               return option.value === input || option.label.toString().toLowerCase().includes(input.toLowerCase());
             }
@@ -1093,14 +1056,10 @@ function Table(props) {
     var _a, _b, _c;
     const items = cloneDeep(props.items);
     for (const item of items) {
-      if (!item.key)
-        item.key = item.id;
-      if (!item.dataIndex)
-        item.dataIndex = item.id;
-      if (!item.title)
-        item.title = upperFirst(item.id);
-      if (!item.type)
-        item.type = "string";
+      if (!item.key) item.key = item.id;
+      if (!item.dataIndex) item.dataIndex = item.id;
+      if (!item.title) item.title = upperFirst(item.id);
+      if (!item.type) item.type = "string";
       if ((_a = item.options) == null ? void 0 : _a.length) {
         item.options = transferOptions(item.options);
         item.filters = item.options.map((o) => ({
@@ -1112,16 +1071,14 @@ function Table(props) {
         });
         generateFilterDropdown(item);
       }
-      if (item.tableChildren === null)
-        item.render = () => null;
+      if (item.tableChildren === null) item.render = () => null;
       else if (item.tableChildren)
         item.render = (value, values) => cloneElement(item.tableChildren, {
           scene: "table",
           value,
           values
         });
-      else if (item.children === null)
-        item.render = () => null;
+      else if (item.children === null) item.render = () => null;
       else if (item.children)
         item.render = (value, values) => cloneElement(item.children, {
           scene: "table",
@@ -1137,21 +1094,17 @@ function Table(props) {
           });
         else if (props.extendTypes[item.type].render)
           item.render = props.extendTypes[item.type].render;
-        else
-          throw Error(`${item.type} requires children or render`);
+        else throw Error(`${item.type} requires children or render`);
         continue;
       }
       switch (item.type) {
         case "string":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (!value || isNil(value))
-                  return true;
-                if (isNil(row[item.id]))
-                  return false;
+                if (!value || isNil(value)) return true;
+                if (isNil(row[item.id])) return false;
                 return row[item.id].trim().toLowerCase().includes(value.trim().toLowerCase());
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters && item.optionsType !== "auto")
@@ -1178,8 +1131,7 @@ function Table(props) {
           }
           break;
         case "string[]":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
@@ -1215,17 +1167,14 @@ function Table(props) {
           }
           break;
         case "number":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b) => a[item.id] - b[item.id];
           if (item.filterDropdown !== false) {
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (value === null)
-                  return true;
-                if (isNil(row[item.id]))
-                  return false;
+                if (value === null) return true;
+                if (isNil(row[item.id])) return false;
                 return value == row[item.id];
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters)
@@ -1259,8 +1208,7 @@ function Table(props) {
               item.onFilter = (value, row) => {
                 if (value === null && (!row[item.id] || !row[item.id].length))
                   return true;
-                if (!row[item.id] || !row[item.id].length)
-                  return false;
+                if (!row[item.id] || !row[item.id].length) return false;
                 return row[item.id].includes(Number(value));
               };
             if (typeof item.filterDropdown === "undefined" && !item.filters)
@@ -1366,14 +1314,11 @@ function Table(props) {
           }
           break;
         case "date":
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b, order) => {
-              if (isNil(a[item.id]))
-                return order === "ascend" ? 1 : -1;
-              if (isNil(b[item.id]))
-                return order === "ascend" ? -1 : 1;
+              if (isNil(a[item.id])) return order === "ascend" ? 1 : -1;
+              if (isNil(b[item.id])) return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
           if (item.filterDropdown !== false) {
@@ -1396,24 +1341,19 @@ function Table(props) {
               );
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (isNil(value[0]))
-                  return true;
-                if (isNil(row[item.id]))
-                  return false;
+                if (isNil(value[0])) return true;
+                if (isNil(row[item.id])) return false;
                 return dayjs2(row[item.id]) >= dayjs2(value[0]) && dayjs2(row[item.id]) <= dayjs2(value[1]);
               };
           }
           break;
         case "time":
           item.width = (_c = item.width) != null ? _c : 200;
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (typeof item.sorter === "undefined")
             item.sorter = (a, b, order) => {
-              if (isNil(a[item.id]))
-                return order === "ascend" ? 1 : -1;
-              if (isNil(b[item.id]))
-                return order === "ascend" ? -1 : 1;
+              if (isNil(a[item.id])) return order === "ascend" ? 1 : -1;
+              if (isNil(b[item.id])) return order === "ascend" ? -1 : 1;
               return new Date(a[item.id]).getTime() < new Date(b[item.id]).getTime() ? -1 : 1;
             };
           if (item.filterDropdown !== false) {
@@ -1436,10 +1376,8 @@ function Table(props) {
               );
             if (!item.onFilter && !props.faasData)
               item.onFilter = (value, row) => {
-                if (isNil(value[0]))
-                  return true;
-                if (isNil(row[item.id]))
-                  return false;
+                if (isNil(value[0])) return true;
+                if (isNil(row[item.id])) return false;
                 return dayjs2(row[item.id]) >= dayjs2(value[0]) && dayjs2(row[item.id]) <= dayjs2(value[1]);
               };
           }
@@ -1468,12 +1406,10 @@ function Table(props) {
             )) });
           break;
         default:
-          if (!item.render)
-            item.render = (value) => processValue(item, value);
+          if (!item.render) item.render = (value) => processValue(item, value);
           if (item.filterDropdown !== false && !item.onFilter && !props.faasData)
             item.onFilter = (value, row) => {
-              if (value === null && isNil(row[item.id]))
-                return true;
+              if (value === null && isNil(row[item.id])) return true;
               return value === row[item.id];
             };
           break;
@@ -1482,8 +1418,7 @@ function Table(props) {
     setColumns(items);
   }, [props.items]);
   useEffect(() => {
-    if (!props.dataSource || !columns)
-      return;
+    if (!props.dataSource || !columns) return;
     for (const column of columns) {
       if (column.optionsType === "auto" && !column.options && !column.filters) {
         const options = uniqBy(props.dataSource, column.id).map((v) => ({
@@ -1501,8 +1436,7 @@ function Table(props) {
       }
     }
   }, [props.dataSource, columns]);
-  if (!columns)
-    return null;
+  if (!columns) return null;
   if (props.dataSource)
     return /* @__PURE__ */ jsx(
       Table$1,
@@ -1525,8 +1459,7 @@ function FaasDataTable({
 }) {
   const [currentColumns, setCurrentColumns] = useState(columns);
   useEffect(() => {
-    if (!data || Array.isArray(data))
-      return;
+    if (!data || Array.isArray(data)) return;
     setCurrentColumns((prev) => {
       var _a;
       const newColumns = [...prev];
@@ -1541,8 +1474,7 @@ function FaasDataTable({
             value: null
           });
           column.render = (value) => processValue(column, value);
-          if (column.filterDropdown)
-            delete column.filterDropdown;
+          if (column.filterDropdown) delete column.filterDropdown;
           continue;
         }
         if (column.optionsType === "auto" && !column.options && !column.filters) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,7 +26,7 @@
     "lodash-es": "*"
   },
   "peerDependencies": {
-    "@faasjs/react": "2.3.0",
+    "@faasjs/react": "2.4.0",
     "antd": "*",
     "react": "*",
     "react-dom": "*",
@@ -38,7 +38,7 @@
     "@testing-library/react": "*",
     "@testing-library/user-event": "*",
     "@welldone-software/why-did-you-render": "*",
-    "@faasjs/react": "2.3.0",
+    "@faasjs/react": "2.4.0",
     "antd": "*",
     "react": "*",
     "react-dom": "*",