@faasjs/ant-design 0.0.2-beta.375 → 0.0.2-beta.378

package/README.md

@@ -305,7 +305,7 @@ ___
 
 ### FormProps
 
-Ƭ **FormProps**<`Values`, `ExtendItemProps`\>: { `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `items?`: ([`FormItemProps`](#formitemprops) \| `ExtendItemProps`)[] ; `submit?`: ``false`` \| { `text?`: `string` ; `to?`: { `action`: `string` ; `params?`: `Record`<`string`, `any`\>  }  } ; `onFinish?`: (`values`: `Values`, `submit?`: (`values`: `any`) => `Promise`<`any`\>) => `Promise`<`any`\>  } & `Omit`<`AntdFormProps`<`Values`\>, ``"onFinish"``\>
+Ƭ **FormProps**<`Values`, `ExtendItemProps`\>: { `beforeItems?`: `JSX.Element` \| `JSX.Element`[] ; `extendTypes?`: { `[type: string]`: [`ExtendFormTypeProps`](#extendformtypeprops);  } ; `items?`: ([`FormItemProps`](#formitemprops) \| `ExtendItemProps`)[] ; `submit?`: ``false`` \| { `text?`: `string` ; `to?`: { `action`: `string` ; `params?`: `Record`<`string`, `any`\>  }  } ; `onFinish?`: (`values`: `Values`, `submit?`: (`values`: `any`) => `Promise`<`any`\>) => `Promise`<`any`\>  } & `Omit`<`AntdFormProps`<`Values`\>, ``"onFinish"``\>
 
 #### Type parameters
 
@@ -318,7 +318,7 @@ ___
 
 ### ModalProps
 
-Ƭ **ModalProps**: `AntdModalProps` & { `children?`: `JSX.Element` \| `JSX.Element`[]  }
+Ƭ **ModalProps**: `AntdModalProps` & { `children?`: `JSX.Element` \| `JSX.Element`[] \| `string`  }
 
 ___
 
@@ -425,13 +425,13 @@ ___
 
 ### DatePicker
 
-• **DatePicker**: `PickerComponentClass`<`PickerProps`<`Dayjs`\>, `unknown`\> & {}
+• `Const` **DatePicker**: `PickerComponentClass`<`PickerProps`<`Dayjs`\>, `unknown`\> & {}
 
 ___
 
 ### TimePicker
 
-• **TimePicker**: `ForwardRefExoticComponent`<[`TimePickerProps`](#timepickerprops) & `RefAttributes`<`any`\>\>
+• `Const` **TimePicker**: `ForwardRefExoticComponent`<[`TimePickerProps`](#timepickerprops) & `RefAttributes`<`any`\>\>
 
 ## Functions
 
@@ -459,7 +459,7 @@ ___
 
 ### Calendar
 
-▸ `Const` **Calendar**(`props`): `Element`
+▸ **Calendar**(`props`): `Element`
 
 #### Parameters
 
@@ -691,7 +691,7 @@ ___
 
 ### useFaasState
 
-▸ `Const` **useFaasState**(): [[`FaasState`](#faasstate), (`state`: `IHookStateSetAction`<[`FaasState`](#faasstate)\>) => `void`]
+▸ **useFaasState**(): [[`FaasState`](#faasstate), (`state`: `IHookStateSetAction`<[`FaasState`](#faasstate)\>) => `void`]
 
 #### Returns
 
@@ -709,7 +709,7 @@ Hook style modal.
 
 | Name | Type | Description |
 | :------ | :------ | :------ |
-| `init?` | [`ModalProps`](#modalprops) | initial props  ```ts function Example() {   const { modal, setModalProps } = useModal()    return <>{modal}</> } ``` |
+| `init?` | [`ModalProps`](#modalprops) | initial props  ```ts function Example() {   const { modal, setModalProps } = useModal()    return <>     <Button onClick={() => setModalProps({ visible: true })}>Open Modal</Button>     {modal}</> } ``` |
 
 #### Returns
 

package/dist/index.d.ts

@@ -263,6 +263,7 @@ declare type FormProps<Values = any, ExtendItemProps = any> = {
         };
     };
     onFinish?: (values: Values, submit?: (values: any) => Promise<any>) => Promise<any>;
+    beforeItems?: JSX.Element | JSX.Element[];
     extendTypes?: {
         [type: string]: ExtendFormTypeProps;
     };
@@ -274,7 +275,7 @@ declare namespace Form {
 }
 
 declare type ModalProps = ModalProps$1 & {
-    children?: JSX.Element | JSX.Element[];
+    children?: JSX.Element | JSX.Element[] | string;
 };
 declare type setModalProps = (changes: Partial<ModalProps>) => void;
 /**
@@ -285,7 +286,9 @@ declare type setModalProps = (changes: Partial<ModalProps>) => void;
  * function Example() {
  *   const { modal, setModalProps } = useModal()
  *
- *   return <>{modal}</>
+ *   return <>
+ *     <Button onClick={() => setModalProps({ visible: true })}>Open Modal</Button>
+ *     {modal}</>
  * }
  * ```
  */

package/dist/index.js

@@ -178,22 +178,22 @@ function DescriptionItemContent(props) {
         values: computedProps.values
       });
     else if (computedProps.extendTypes[computedProps.item.type].render)
-      return computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values);
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values));
     else
       throw Error(computedProps.item.type + " requires children or render");
   if (computedProps.item.children)
     return (0, import_react3.cloneElement)(computedProps.item.children, { value: computedProps.value });
   if (computedProps.item.render)
-    return computedProps.item.render(computedProps.value, computedProps.values);
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, computedProps.item.render(computedProps.value, computedProps.values));
   if (typeof computedProps.value === "undefined" || computedProps.value === null)
     return null;
   switch (computedProps.item.type) {
     case "string[]":
-      return computedProps.value.join(", ");
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, computedProps.value.join(", "));
     case "number":
-      return computedProps.value;
+      return computedProps.value || null;
     case "number[]":
-      return computedProps.value.join(", ");
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, computedProps.value.join(", "));
     case "boolean":
       return computedProps.value ? /* @__PURE__ */ import_react.default.createElement(import_icons.CheckOutlined, {
         style: {
@@ -207,11 +207,11 @@ function DescriptionItemContent(props) {
         }
       });
     case "time":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD HH:mm:ss"));
     case "date":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD");
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? import_dayjs3.default.unix(computedProps.value).format("YYYY-MM-DD") : (0, import_dayjs3.default)(computedProps.value).format("YYYY-MM-DD"));
     default:
-      return computedProps.value;
+      return computedProps.value || null;
   }
 }
 function Description(props) {
@@ -444,13 +444,14 @@ function Form(props) {
   const [computedProps, setComputedProps] = (0, import_react9.useState)();
   const [config] = useFaasState();
   (0, import_react9.useEffect)(() => {
+    var _a2;
     const propsCopy = __spreadValues({}, props);
     if (propsCopy.onFinish) {
       propsCopy.onFinish = async (values) => {
-        var _a2;
+        var _a3;
         setLoading(true);
         try {
-          if (propsCopy.submit && ((_a2 = propsCopy.submit.to) == null ? void 0 : _a2.action)) {
+          if (propsCopy.submit && ((_a3 = propsCopy.submit.to) == null ? void 0 : _a3.action)) {
             await props.onFinish(values, async (values2) => (0, import_react8.faas)(propsCopy.submit.to.action, propsCopy.submit.to.params ? __spreadValues(__spreadValues({}, values2), propsCopy.submit.to.params) : values2));
           } else
             await propsCopy.onFinish(values);
@@ -459,12 +460,16 @@ function Form(props) {
         }
         setLoading(false);
       };
+    } else if (propsCopy.submit && ((_a2 = propsCopy.submit.to) == null ? void 0 : _a2.action)) {
+      propsCopy.onFinish = async (values) => {
+        return await (0, import_react8.faas)(propsCopy.submit.to.action, propsCopy.submit.to.params ? __spreadValues(__spreadValues({}, values), propsCopy.submit.to.params) : values);
+      };
     }
     setComputedProps(propsCopy);
   }, []);
   if (!computedProps)
     return null;
-  return /* @__PURE__ */ import_react.default.createElement(import_antd5.Form, __spreadValues({}, computedProps), (_a = computedProps.items) == null ? void 0 : _a.map((item) => /* @__PURE__ */ import_react.default.createElement(FormItem, __spreadProps(__spreadValues({
+  return /* @__PURE__ */ import_react.default.createElement(import_antd5.Form, __spreadValues({}, computedProps), computedProps.beforeItems, (_a = computedProps.items) == null ? void 0 : _a.map((item) => /* @__PURE__ */ import_react.default.createElement(FormItem, __spreadProps(__spreadValues({
     key: item.id
   }, item), {
     extendTypes: computedProps.extendTypes

package/dist/index.mjs

@@ -138,22 +138,22 @@ function DescriptionItemContent(props) {
         values: computedProps.values
       });
     else if (computedProps.extendTypes[computedProps.item.type].render)
-      return computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values);
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, computedProps.extendTypes[computedProps.item.type].render(computedProps.value, computedProps.values));
     else
       throw Error(computedProps.item.type + " requires children or render");
   if (computedProps.item.children)
     return cloneElement(computedProps.item.children, { value: computedProps.value });
   if (computedProps.item.render)
-    return computedProps.item.render(computedProps.value, computedProps.values);
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, computedProps.item.render(computedProps.value, computedProps.values));
   if (typeof computedProps.value === "undefined" || computedProps.value === null)
     return null;
   switch (computedProps.item.type) {
     case "string[]":
-      return computedProps.value.join(", ");
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, computedProps.value.join(", "));
     case "number":
-      return computedProps.value;
+      return computedProps.value || null;
     case "number[]":
-      return computedProps.value.join(", ");
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, computedProps.value.join(", "));
     case "boolean":
       return computedProps.value ? /* @__PURE__ */ React.createElement(CheckOutlined, {
         style: {
@@ -167,11 +167,11 @@ function DescriptionItemContent(props) {
         }
       });
     case "time":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : dayjs(computedProps.value).format("YYYY-MM-DD HH:mm:ss");
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD HH:mm:ss") : dayjs(computedProps.value).format("YYYY-MM-DD HH:mm:ss"));
     case "date":
-      return typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD") : dayjs(computedProps.value).format("YYYY-MM-DD");
+      return /* @__PURE__ */ React.createElement(React.Fragment, null, typeof computedProps.value === "number" && computedProps.value.toString().length === 10 ? dayjs.unix(computedProps.value).format("YYYY-MM-DD") : dayjs(computedProps.value).format("YYYY-MM-DD"));
     default:
-      return computedProps.value;
+      return computedProps.value || null;
   }
 }
 function Description(props) {
@@ -416,13 +416,14 @@ function Form(props) {
   const [computedProps, setComputedProps] = useState4();
   const [config] = useFaasState();
   useEffect4(() => {
+    var _a2;
     const propsCopy = __spreadValues({}, props);
     if (propsCopy.onFinish) {
       propsCopy.onFinish = async (values) => {
-        var _a2;
+        var _a3;
         setLoading(true);
         try {
-          if (propsCopy.submit && ((_a2 = propsCopy.submit.to) == null ? void 0 : _a2.action)) {
+          if (propsCopy.submit && ((_a3 = propsCopy.submit.to) == null ? void 0 : _a3.action)) {
             await props.onFinish(values, async (values2) => faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? __spreadValues(__spreadValues({}, values2), propsCopy.submit.to.params) : values2));
           } else
             await propsCopy.onFinish(values);
@@ -431,12 +432,16 @@ function Form(props) {
         }
         setLoading(false);
       };
+    } else if (propsCopy.submit && ((_a2 = propsCopy.submit.to) == null ? void 0 : _a2.action)) {
+      propsCopy.onFinish = async (values) => {
+        return await faas(propsCopy.submit.to.action, propsCopy.submit.to.params ? __spreadValues(__spreadValues({}, values), propsCopy.submit.to.params) : values);
+      };
     }
     setComputedProps(propsCopy);
   }, []);
   if (!computedProps)
     return null;
-  return /* @__PURE__ */ React.createElement(AntdForm2, __spreadValues({}, computedProps), (_a = computedProps.items) == null ? void 0 : _a.map((item) => /* @__PURE__ */ React.createElement(FormItem, __spreadProps(__spreadValues({
+  return /* @__PURE__ */ React.createElement(AntdForm2, __spreadValues({}, computedProps), computedProps.beforeItems, (_a = computedProps.items) == null ? void 0 : _a.map((item) => /* @__PURE__ */ React.createElement(FormItem, __spreadProps(__spreadValues({
     key: item.id
   }, item), {
     extendTypes: computedProps.extendTypes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "0.0.2-beta.375",
+  "version": "0.0.2-beta.378",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -28,7 +28,7 @@
     "lodash": "*",
     "react": "*",
     "react-dom": "*",
-    "@faasjs/react": "^0.0.2-beta.375",
+    "@faasjs/react": "^0.0.2-beta.378",
     "react-use": "*",
     "react-router-dom": "*",
     "dayjs": "*"