@faasjs/ant-design 2.7.0 → 2.8.1

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)
@@ -109,3 +109,4 @@ type FaasItemProps = {
 - [useDrawer](functions/useDrawer.md)
 - [useFaas](functions/useFaas.md)
 - [useModal](functions/useModal.md)
+- [withFaasData](functions/withFaasData.md)

package/dist/index.d.mts

@@ -16,6 +16,7 @@ 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 { FaasAction } from '@faasjs/types';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
 import * as antd_es_form_context from 'antd/es/form/context';
 import * as antd_es_form from 'antd/es/form';
@@ -384,6 +385,15 @@ declare function FaasDataWrapper<T = any>(props: FaasDataWrapperProps<T>): JSX.E
 declare namespace FaasDataWrapper {
     var whyDidYouRender: boolean;
 }
+/**
+ * HOC to wrap a component with FaasDataWrapper and Loading
+ *
+ * @example
+ * ```tsx
+ * 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>): react.FC<Omit<any, keyof FaasDataInjection$1<any>> & Record<string, any>>;
 
 interface ExtendDescriptionTypeProps<T = any> {
     children?: UnionFaasItemElement<T>;
@@ -604,7 +614,7 @@ interface LinkProps {
     text?: string | number;
     children?: ReactNode;
     style?: CSSProperties;
-    button?: ButtonProps;
+    button?: ButtonProps | boolean;
     block?: boolean;
     /** only use for text without button */
     copyable?: boolean;
@@ -737,4 +747,4 @@ declare namespace Title {
     var whyDidYouRender: boolean;
 }
 
-export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal };
+export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };

package/dist/index.d.ts

@@ -16,6 +16,7 @@ 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 { FaasAction } from '@faasjs/types';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
 import * as antd_es_form_context from 'antd/es/form/context';
 import * as antd_es_form from 'antd/es/form';
@@ -384,6 +385,15 @@ declare function FaasDataWrapper<T = any>(props: FaasDataWrapperProps<T>): JSX.E
 declare namespace FaasDataWrapper {
     var whyDidYouRender: boolean;
 }
+/**
+ * HOC to wrap a component with FaasDataWrapper and Loading
+ *
+ * @example
+ * ```tsx
+ * 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>): react.FC<Omit<any, keyof FaasDataInjection$1<any>> & Record<string, any>>;
 
 interface ExtendDescriptionTypeProps<T = any> {
     children?: UnionFaasItemElement<T>;
@@ -604,7 +614,7 @@ interface LinkProps {
     text?: string | number;
     children?: ReactNode;
     style?: CSSProperties;
-    button?: ButtonProps;
+    button?: ButtonProps | boolean;
     block?: boolean;
     /** only use for text without button */
     copyable?: boolean;
@@ -737,4 +747,4 @@ declare namespace Title {
     var whyDidYouRender: boolean;
 }
 
-export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal };
+export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };

package/dist/index.js

@@ -307,6 +307,12 @@ function FaasDataWrapper(props) {
   );
 }
 FaasDataWrapper.whyDidYouRender = true;
+function withFaasData(Component, faasProps) {
+  return react.withFaasData(Component, {
+    fallback: faasProps.loading || /* @__PURE__ */ jsxRuntime.jsx(Loading, { ...faasProps.loadingProps }),
+    ...faasProps
+  });
+}
 function DescriptionItemContent(props) {
   var _a, _b;
   const [computedProps, setComputedProps] = react$1.useState();
@@ -891,9 +897,10 @@ Form.List = antd.Form.List;
 Form.ErrorList = antd.Form.ErrorList;
 Form.Provider = antd.Form.Provider;
 function Link(props) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c;
   const { theme } = useConfigContext();
   const navigate = reactRouterDom.useNavigate();
+  const target = props.target || ((_a = theme.Link) == null ? void 0 : _a.target) || (props.href.startsWith("http") ? "_blank" : void 0);
   let computedStyle = {
     ...theme.Link.style || {},
     cursor: "pointer",
@@ -907,85 +914,39 @@ function Link(props) {
       },
       computedStyle
     );
-  if (props.href.startsWith("http")) {
-    if (props.button)
-      return /* @__PURE__ */ jsxRuntime.jsx(
-        antd.Button,
-        {
-          ...props.button,
-          target: props.target || ((_a = theme.Link) == null ? void 0 : _a.target) || "_blank",
-          style: computedStyle,
-          href: props.href,
-          onClick: props.onClick,
-          children: (_b = props.text) != null ? _b : props.children
-        }
-      );
-    if (props.children)
-      return /* @__PURE__ */ jsxRuntime.jsx(
-        "a",
-        {
-          href: props.href,
-          target: props.target || ((_c = theme.Link) == null ? void 0 : _c.target),
-          style: computedStyle,
-          onClick: props.onClick,
-          children: props.children
-        }
-      );
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      antd.Typography.Link,
-      {
-        href: props.href,
-        target: props.target || ((_d = theme.Link) == null ? void 0 : _d.target) || "_blank",
-        style: computedStyle,
-        copyable: props.copyable,
-        onClick: props.onClick,
-        children: props.text
-      }
-    );
-  }
   if (props.button)
     return /* @__PURE__ */ jsxRuntime.jsx(
       antd.Button,
       {
-        ...props.button,
+        ...props.button || {},
         style: computedStyle,
         onClick: (e) => {
-          var _a2;
-          return props.onClick ? props.onClick(e) : (props.target || ((_a2 = theme.Link) == null ? void 0 : _a2.target)) === "_blank" ? window.open(props.href) : navigate(props.href);
+          props.onClick ? props.onClick(e) : target === "_blank" ? window.open(props.href) : navigate(props.href);
+          e.preventDefault();
         },
-        children: (_e = props.text) != null ? _e : props.children
-      }
-    );
-  if (props.children)
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      reactRouterDom.Link,
-      {
-        to: props.href,
-        target: props.target || ((_f = theme.Link) == null ? void 0 : _f.target),
-        style: computedStyle,
-        onClick: props.onClick,
-        children: props.children
+        children: (_b = props.children) != null ? _b : props.text
       }
     );
   return /* @__PURE__ */ jsxRuntime.jsx(
     antd.Typography.Link,
     {
       href: props.href,
-      target: props.target || ((_g = theme.Link) == null ? void 0 : _g.target),
+      target,
       style: computedStyle,
       copyable: props.copyable,
       onClick: (e) => {
-        var _a2;
+        e.preventDefault();
         if (props.onClick) {
           props.onClick(e);
           return;
         }
-        if ((props.target || ((_a2 = theme.Link) == null ? void 0 : _a2.target)) !== "_blank") {
-          e.preventDefault();
-          navigate(props.href);
+        if (target === "_blank") {
+          window.open(props.href);
+          return;
         }
+        navigate(props.href);
       },
-      children: props.text
+      children: (_c = props.children) != null ? _c : props.text
     }
   );
 }
@@ -1649,3 +1610,4 @@ exports.useApp = useApp;
 exports.useConfigContext = useConfigContext;
 exports.useDrawer = useDrawer;
 exports.useModal = useModal;
+exports.withFaasData = withFaasData;

package/dist/index.mjs

@@ -1,11 +1,11 @@
-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';
 import { createContext, useState, useCallback, useEffect, useContext, useMemo, cloneElement, Suspense } from 'react';
 export { lazy } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { BrowserRouter, useNavigate, Link as Link$1, Routes as Routes$1, Route, useLocation } from 'react-router-dom';
+import { BrowserRouter, useNavigate, Routes as Routes$1, Route, useLocation } from 'react-router-dom';
 import { defaultsDeep, isNil, upperFirst, isFunction, cloneDeep, uniqBy } from 'lodash-es';
 import dayjs2 from 'dayjs';
 import { PlusOutlined, MinusCircleOutlined, CheckOutlined, CloseOutlined } from '@ant-design/icons';
@@ -303,6 +303,12 @@ function FaasDataWrapper(props) {
   );
 }
 FaasDataWrapper.whyDidYouRender = true;
+function withFaasData(Component, faasProps) {
+  return withFaasData$1(Component, {
+    fallback: faasProps.loading || /* @__PURE__ */ jsx(Loading, { ...faasProps.loadingProps }),
+    ...faasProps
+  });
+}
 function DescriptionItemContent(props) {
   var _a, _b;
   const [computedProps, setComputedProps] = useState();
@@ -887,9 +893,10 @@ Form.List = Form$1.List;
 Form.ErrorList = Form$1.ErrorList;
 Form.Provider = Form$1.Provider;
 function Link(props) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c;
   const { theme } = useConfigContext();
   const navigate = useNavigate();
+  const target = props.target || ((_a = theme.Link) == null ? void 0 : _a.target) || (props.href.startsWith("http") ? "_blank" : void 0);
   let computedStyle = {
     ...theme.Link.style || {},
     cursor: "pointer",
@@ -903,85 +910,39 @@ function Link(props) {
       },
       computedStyle
     );
-  if (props.href.startsWith("http")) {
-    if (props.button)
-      return /* @__PURE__ */ jsx(
-        Button,
-        {
-          ...props.button,
-          target: props.target || ((_a = theme.Link) == null ? void 0 : _a.target) || "_blank",
-          style: computedStyle,
-          href: props.href,
-          onClick: props.onClick,
-          children: (_b = props.text) != null ? _b : props.children
-        }
-      );
-    if (props.children)
-      return /* @__PURE__ */ jsx(
-        "a",
-        {
-          href: props.href,
-          target: props.target || ((_c = theme.Link) == null ? void 0 : _c.target),
-          style: computedStyle,
-          onClick: props.onClick,
-          children: props.children
-        }
-      );
-    return /* @__PURE__ */ jsx(
-      Typography.Link,
-      {
-        href: props.href,
-        target: props.target || ((_d = theme.Link) == null ? void 0 : _d.target) || "_blank",
-        style: computedStyle,
-        copyable: props.copyable,
-        onClick: props.onClick,
-        children: props.text
-      }
-    );
-  }
   if (props.button)
     return /* @__PURE__ */ jsx(
       Button,
       {
-        ...props.button,
+        ...props.button || {},
         style: computedStyle,
         onClick: (e) => {
-          var _a2;
-          return props.onClick ? props.onClick(e) : (props.target || ((_a2 = theme.Link) == null ? void 0 : _a2.target)) === "_blank" ? window.open(props.href) : navigate(props.href);
+          props.onClick ? props.onClick(e) : target === "_blank" ? window.open(props.href) : navigate(props.href);
+          e.preventDefault();
         },
-        children: (_e = props.text) != null ? _e : props.children
-      }
-    );
-  if (props.children)
-    return /* @__PURE__ */ jsx(
-      Link$1,
-      {
-        to: props.href,
-        target: props.target || ((_f = theme.Link) == null ? void 0 : _f.target),
-        style: computedStyle,
-        onClick: props.onClick,
-        children: props.children
+        children: (_b = props.children) != null ? _b : props.text
       }
     );
   return /* @__PURE__ */ jsx(
     Typography.Link,
     {
       href: props.href,
-      target: props.target || ((_g = theme.Link) == null ? void 0 : _g.target),
+      target,
       style: computedStyle,
       copyable: props.copyable,
       onClick: (e) => {
-        var _a2;
+        e.preventDefault();
         if (props.onClick) {
           props.onClick(e);
           return;
         }
-        if ((props.target || ((_a2 = theme.Link) == null ? void 0 : _a2.target)) !== "_blank") {
-          e.preventDefault();
-          navigate(props.href);
+        if (target === "_blank") {
+          window.open(props.href);
+          return;
         }
+        navigate(props.href);
       },
-      children: props.text
+      children: (_c = props.children) != null ? _c : props.text
     }
   );
 }
@@ -1609,4 +1570,4 @@ function Title(props) {
 }
 Title.whyDidYouRender = true;
 
-export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, transferOptions, transferValue, useApp, useConfigContext, useDrawer, useModal };
+export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, transferOptions, transferValue, useApp, useConfigContext, useDrawer, useModal, withFaasData };

package/package.json

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