@faasjs/ant-design 2.8.0 → 2.9.0

package/README.md

@@ -50,8 +50,8 @@ type FaasItemProps = {
 - [LinkProps](interfaces/LinkProps.md)
 - [ModalProps](interfaces/ModalProps.md)
 - [RoutesProps](interfaces/RoutesProps.md)
-- [TabProps](interfaces/TabProps.md)
 - [TableItemProps](interfaces/TableItemProps.md)
+- [TabProps](interfaces/TabProps.md)
 - [TabsProps](interfaces/TabsProps.md)
 - [TitleProps](interfaces/TitleProps.md)
 - [UnionFaasItemProps](interfaces/UnionFaasItemProps.md)
@@ -70,13 +70,13 @@ type FaasItemProps = {
 - [FaasItemTypeValue](type-aliases/FaasItemTypeValue.md)
 - [FormSubmitProps](type-aliases/FormSubmitProps.md)
 - [LoadingProps](type-aliases/LoadingProps.md)
+- [setDrawerProps](type-aliases/setDrawerProps.md)
+- [setModalProps](type-aliases/setModalProps.md)
 - [TableProps](type-aliases/TableProps.md)
 - [UnionFaasItemElement](type-aliases/UnionFaasItemElement.md)
 - [UnionFaasItemInjection](type-aliases/UnionFaasItemInjection.md)
 - [UnionFaasItemRender](type-aliases/UnionFaasItemRender.md)
 - [UnionScene](type-aliases/UnionScene.md)
-- [setDrawerProps](type-aliases/setDrawerProps.md)
-- [setModalProps](type-aliases/setModalProps.md)
 
 ## Variables
 
@@ -90,6 +90,7 @@ type FaasItemProps = {
 - [Description](functions/Description.md)
 - [Drawer](functions/Drawer.md)
 - [ErrorBoundary](functions/ErrorBoundary.md)
+- [faas](functions/faas.md)
 - [FaasDataWrapper](functions/FaasDataWrapper.md)
 - [Form](functions/Form.md)
 - [FormItem](functions/FormItem.md)
@@ -101,7 +102,6 @@ type FaasItemProps = {
 - [Table](functions/Table.md)
 - [Tabs](functions/Tabs.md)
 - [Title](functions/Title.md)
-- [faas](functions/faas.md)
 - [transferOptions](functions/transferOptions.md)
 - [transferValue](functions/transferValue.md)
 - [useApp](functions/useApp.md)

package/dist/index.d.mts

@@ -9,7 +9,7 @@ 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 { Dispatch, SetStateAction, CSSProperties, ComponentProps, 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, FormInstance, InputProps, SelectProps, RadioProps, InputNumberProps, SwitchProps, DatePickerProps, 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';
@@ -29,7 +29,7 @@ declare const Modal: react.FC<ModalProps$1> & antd_es_modal_confirm.ModalStaticF
     useModal: typeof antd_es_modal_useModal.default;
     destroyAll: () => void;
     config: typeof antd_es_modal_confirm.modalGlobalConfig;
-    _InternalPanelDoNotUseOrYouWillBeFired: (props: antd_es_modal_PurePanel.PurePanelProps) => react.JSX.Element;
+    _InternalPanelDoNotUseOrYouWillBeFired: (props: antd_es_modal_PurePanel.PurePanelProps) => React.JSX.Element;
 };
 interface ModalProps extends ModalProps$1 {
     children?: JSX.Element | JSX.Element[] | string;
@@ -390,10 +390,10 @@ declare namespace FaasDataWrapper {
  *
  * @example
  * ```tsx
- * const MyComponent = withFaasData(MyComponent, { action: 'test', params: { a: 1 } })
+ * const MyComponent = withFaasData(({ data }) => <div>{data.name}</div>, { action: 'test', params: { a: 1 } })
  * ```
  */
-declare function withFaasData<TComponent extends React.FC<any>, PathOrData extends FaasAction>(Component: TComponent, faasProps: FaasDataWrapperProps<PathOrData>): (props: ComponentProps<TComponent> & {}) => react_jsx_runtime.JSX.Element;
+declare function withFaasData<TComponent extends React.FC<any>, PathOrData extends FaasAction>(Component: TComponent, faasProps: FaasDataWrapperProps<PathOrData>): react.FC<Omit<any, keyof FaasDataInjection$1<any>> & Record<string, any>>;
 
 interface ExtendDescriptionTypeProps<T = any> {
     children?: UnionFaasItemElement<T>;

package/dist/index.d.ts

@@ -9,7 +9,7 @@ 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 { Dispatch, SetStateAction, CSSProperties, ComponentProps, 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, FormInstance, InputProps, SelectProps, RadioProps, InputNumberProps, SwitchProps, DatePickerProps, 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';
@@ -29,7 +29,7 @@ declare const Modal: react.FC<ModalProps$1> & antd_es_modal_confirm.ModalStaticF
     useModal: typeof antd_es_modal_useModal.default;
     destroyAll: () => void;
     config: typeof antd_es_modal_confirm.modalGlobalConfig;
-    _InternalPanelDoNotUseOrYouWillBeFired: (props: antd_es_modal_PurePanel.PurePanelProps) => react.JSX.Element;
+    _InternalPanelDoNotUseOrYouWillBeFired: (props: antd_es_modal_PurePanel.PurePanelProps) => React.JSX.Element;
 };
 interface ModalProps extends ModalProps$1 {
     children?: JSX.Element | JSX.Element[] | string;
@@ -390,10 +390,10 @@ declare namespace FaasDataWrapper {
  *
  * @example
  * ```tsx
- * const MyComponent = withFaasData(MyComponent, { action: 'test', params: { a: 1 } })
+ * const MyComponent = withFaasData(({ data }) => <div>{data.name}</div>, { action: 'test', params: { a: 1 } })
  * ```
  */
-declare function withFaasData<TComponent extends React.FC<any>, PathOrData extends FaasAction>(Component: TComponent, faasProps: FaasDataWrapperProps<PathOrData>): (props: ComponentProps<TComponent> & {}) => react_jsx_runtime.JSX.Element;
+declare function withFaasData<TComponent extends React.FC<any>, PathOrData extends FaasAction>(Component: TComponent, faasProps: FaasDataWrapperProps<PathOrData>): react.FC<Omit<any, keyof FaasDataInjection$1<any>> & Record<string, any>>;
 
 interface ExtendDescriptionTypeProps<T = any> {
     children?: UnionFaasItemElement<T>;

package/dist/index.js

@@ -308,7 +308,10 @@ function FaasDataWrapper(props) {
 }
 FaasDataWrapper.whyDidYouRender = true;
 function withFaasData(Component, faasProps) {
-  return (props) => /* @__PURE__ */ jsxRuntime.jsx(FaasDataWrapper, { ...faasProps, children: /* @__PURE__ */ jsxRuntime.jsx(Component, { ...props }) });
+  return react.withFaasData(Component, {
+    fallback: faasProps.loading || /* @__PURE__ */ jsxRuntime.jsx(Loading, { ...faasProps.loadingProps }),
+    ...faasProps
+  });
 }
 function DescriptionItemContent(props) {
   var _a, _b;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { createSplittingContext, ErrorBoundary as ErrorBoundary$1, FaasReactClient, OptionalWrapper, FaasDataWrapper as FaasDataWrapper$1, faas } from '@faasjs/react';
+import { createSplittingContext, ErrorBoundary as ErrorBoundary$1, FaasReactClient, OptionalWrapper, FaasDataWrapper as FaasDataWrapper$1, withFaasData as withFaasData$1, faas } from '@faasjs/react';
 export { faas, useFaas } from '@faasjs/react';
 import { Form as Form$1, Modal as Modal$1, Drawer as Drawer$1, message, notification, ConfigProvider as ConfigProvider$1, Typography, Spin, Descriptions, Input, Button, Row, Col, DatePicker, Switch, Select, InputNumber, Radio, Result, Skeleton, Table as Table$1, Tabs as Tabs$1, Alert, Space } from 'antd';
 import { legacyLogicalPropertiesTransformer, StyleProvider } from '@ant-design/cssinjs';
@@ -304,7 +304,10 @@ function FaasDataWrapper(props) {
 }
 FaasDataWrapper.whyDidYouRender = true;
 function withFaasData(Component, faasProps) {
-  return (props) => /* @__PURE__ */ jsx(FaasDataWrapper, { ...faasProps, children: /* @__PURE__ */ jsx(Component, { ...props }) });
+  return withFaasData$1(Component, {
+    fallback: faasProps.loading || /* @__PURE__ */ jsx(Loading, { ...faasProps.loadingProps }),
+    ...faasProps
+  });
 }
 function DescriptionItemContent(props) {
   var _a, _b;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,7 +38,7 @@
     "lodash-es": "*"
   },
   "peerDependencies": {
-    "@faasjs/react": "2.8.0",
+    "@faasjs/react": "2.9.0",
     "antd": "*",
     "react": "*",
     "react-dom": "*",
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "*",
-    "@faasjs/react": "2.8.0",
+    "@faasjs/react": "2.9.0",
     "antd": "*",
     "react": "*",
     "react-dom": "*",