@faasjs/ant-design 2.0.0 → 2.2.0

package/dist/index.d.mts

@@ -18,7 +18,7 @@ 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';
 import * as antd_es_form from 'antd/es/form';
-import * as rc_field_form_es_useWatch from 'rc-field-form/es/useWatch';
+import * as rc_field_form from 'rc-field-form';
 import * as antd_es_form_hooks_useFormInstance from 'antd/es/form/hooks/useFormInstance';
 import * as antd_es_form_Form from 'antd/es/form/Form';
 import { Tab } from 'rc-tabs/es/interface';
@@ -159,9 +159,9 @@ interface useAppProps {
     message: MessageInstance;
     notification: NotificationInstance;
     modalProps: ModalProps;
-    setModalProps: (changes: Partial<ModalProps>) => void;
+    setModalProps: setModalProps;
     drawerProps: DrawerProps;
-    setDrawerProps: (changes: Partial<DrawerProps>) => void;
+    setDrawerProps: setDrawerProps;
 }
 /**
  * App component with Ant Design & FaasJS
@@ -192,7 +192,10 @@ interface useAppProps {
  */
 declare function App(props: AppProps): react_jsx_runtime.JSX.Element;
 declare namespace App {
-    var useApp: typeof useApp;
+    var useApp: {
+        (): Readonly<useAppProps>;
+        whyDidYouRender: boolean;
+    };
     var whyDidYouRender: boolean;
 }
 /**
@@ -204,7 +207,10 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare function useApp(): Readonly<useAppProps>;
+declare const useApp: {
+    (): Readonly<useAppProps>;
+    whyDidYouRender: boolean;
+};
 
 interface BlankProps {
     value?: any;
@@ -535,7 +541,7 @@ declare namespace Form {
     var whyDidYouRender: boolean;
     var useForm: typeof antd_es_form_Form.useForm;
     var useFormInstance: typeof antd_es_form_hooks_useFormInstance.default;
-    var useWatch: typeof rc_field_form_es_useWatch.default;
+    var useWatch: typeof rc_field_form.useWatch;
     var Item: typeof FormItem;
     var List: react.FC<antd_es_form.FormListProps>;
     var ErrorList: react.FC<antd_es_form.ErrorListProps>;

package/dist/index.d.ts

@@ -18,7 +18,7 @@ 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';
 import * as antd_es_form from 'antd/es/form';
-import * as rc_field_form_es_useWatch from 'rc-field-form/es/useWatch';
+import * as rc_field_form from 'rc-field-form';
 import * as antd_es_form_hooks_useFormInstance from 'antd/es/form/hooks/useFormInstance';
 import * as antd_es_form_Form from 'antd/es/form/Form';
 import { Tab } from 'rc-tabs/es/interface';
@@ -159,9 +159,9 @@ interface useAppProps {
     message: MessageInstance;
     notification: NotificationInstance;
     modalProps: ModalProps;
-    setModalProps: (changes: Partial<ModalProps>) => void;
+    setModalProps: setModalProps;
     drawerProps: DrawerProps;
-    setDrawerProps: (changes: Partial<DrawerProps>) => void;
+    setDrawerProps: setDrawerProps;
 }
 /**
  * App component with Ant Design & FaasJS
@@ -192,7 +192,10 @@ interface useAppProps {
  */
 declare function App(props: AppProps): react_jsx_runtime.JSX.Element;
 declare namespace App {
-    var useApp: typeof useApp;
+    var useApp: {
+        (): Readonly<useAppProps>;
+        whyDidYouRender: boolean;
+    };
     var whyDidYouRender: boolean;
 }
 /**
@@ -204,7 +207,10 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare function useApp(): Readonly<useAppProps>;
+declare const useApp: {
+    (): Readonly<useAppProps>;
+    whyDidYouRender: boolean;
+};
 
 interface BlankProps {
     value?: any;
@@ -535,7 +541,7 @@ declare namespace Form {
     var whyDidYouRender: boolean;
     var useForm: typeof antd_es_form_Form.useForm;
     var useFormInstance: typeof antd_es_form_hooks_useFormInstance.default;
-    var useWatch: typeof rc_field_form_es_useWatch.default;
+    var useWatch: typeof rc_field_form.useWatch;
     var Item: typeof FormItem;
     var List: react.FC<antd_es_form.FormListProps>;
     var ErrorList: react.FC<antd_es_form.ErrorListProps>;

package/dist/index.js

@@ -19,7 +19,7 @@ var Modal = antd.Modal;
 Modal.whyDidYouRender = true;
 function useModal(init) {
   const [props, setProps] = react$1.useState({ open: false, ...init });
-  const setModalProps2 = react$1.useCallback(
+  const setModalProps = react$1.useCallback(
     (changes) => {
       const changed = typeof changes === "function" ? changes(props) : changes;
       setProps((prev) => ({ ...prev, ...changed }));
@@ -38,7 +38,7 @@ function useModal(init) {
       }
     ),
     modalProps: props,
-    setModalProps: setModalProps2
+    setModalProps
   };
 }
 var Drawer = antd.Drawer;
@@ -48,7 +48,7 @@ function useDrawer(init) {
     open: false,
     ...init
   });
-  const setDrawerProps2 = react$1.useCallback(
+  const setDrawerProps = react$1.useCallback(
     (changes) => {
       const changed = typeof changes === "function" ? changes(props) : changes;
       setProps((prev) => ({ ...prev, ...changed }));
@@ -67,7 +67,7 @@ function useDrawer(init) {
       }
     ),
     drawerProps: props,
-    setDrawerProps: setDrawerProps2
+    setDrawerProps
   };
 }
 function ErrorChildren(props) {
@@ -162,31 +162,31 @@ function ConfigProvider(props) {
 function useConfigContext() {
   return react$1.useContext(ConfigContext);
 }
-var MessageContext = react$1.createContext({});
-var NotificationContext = react$1.createContext(
-  {}
-);
-var ModalPropsContext = react$1.createContext({});
-var SetModalPropsContext = react$1.createContext(() => void 0);
-var DrawerPropsContext = react$1.createContext({});
-var SetDrawerPropsContext = react$1.createContext(() => void 0);
+var AppContext = react.createSplitedContext({
+  message: {},
+  notification: {},
+  modalProps: {},
+  setModalProps: () => void 0,
+  drawerProps: {},
+  setDrawerProps: () => void 0
+});
 function RoutesApp(props) {
   const location = reactRouterDom.useLocation();
-  const { drawerProps, setDrawerProps: setDrawerProps2, modalProps, setModalProps: setModalProps2 } = useApp();
+  const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
   react$1.useEffect(() => {
     console.debug("location", location);
     if (drawerProps.open)
-      setDrawerProps2({ open: false });
+      setDrawerProps({ open: false });
     if (modalProps.open)
-      setModalProps2({ open: false });
+      setModalProps({ open: false });
   }, [location]);
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: props.children });
 }
 function App(props) {
   const [messageApi, messageContextHolder] = antd.message.useMessage();
   const [notificationApi, notificationContextHolder] = antd.notification.useNotification();
-  const { modal, modalProps, setModalProps: setModalProps2 } = useModal();
-  const { drawer, drawerProps, setDrawerProps: setDrawerProps2 } = useDrawer();
+  const { modal, modalProps, setModalProps } = useModal();
+  const { drawer, drawerProps, setDrawerProps } = useDrawer();
   const styleProviderProps = react$1.useMemo(
     () => ({
       ...props.styleProviderProps,
@@ -195,38 +195,28 @@ function App(props) {
     }),
     [props.styleProviderProps]
   );
-  return /* @__PURE__ */ jsxRuntime.jsx(cssinjs.StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(antd.ConfigProvider, { ...props.configProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(MessageContext.Provider, { value: messageApi, children: /* @__PURE__ */ jsxRuntime.jsx(NotificationContext.Provider, { value: notificationApi, children: /* @__PURE__ */ jsxRuntime.jsx(DrawerPropsContext.Provider, { value: drawerProps, children: /* @__PURE__ */ jsxRuntime.jsx(SetDrawerPropsContext.Provider, { value: setDrawerProps2, children: /* @__PURE__ */ jsxRuntime.jsx(ModalPropsContext.Provider, { value: modalProps, children: /* @__PURE__ */ jsxRuntime.jsx(SetModalPropsContext.Provider, { value: setModalProps2, children: /* @__PURE__ */ jsxRuntime.jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxRuntime.jsxs(reactRouterDom.BrowserRouter, { ...props.browserRouterProps, children: [
-    messageContextHolder,
-    notificationContextHolder,
-    modal,
-    drawer,
-    /* @__PURE__ */ jsxRuntime.jsx(RoutesApp, { children: props.children })
-  ] }) }) }) }) }) }) }) }) }) }) });
-}
-function useApp() {
-  return react.useConstant(() => {
-    const obj = /* @__PURE__ */ Object.create(null);
-    Object.defineProperty(obj, "message", {
-      get: () => react$1.useContext(MessageContext)
-    });
-    Object.defineProperty(obj, "notification", {
-      get: () => react$1.useContext(NotificationContext)
-    });
-    Object.defineProperty(obj, "modalProps", {
-      get: () => react$1.useContext(ModalPropsContext)
-    });
-    Object.defineProperty(obj, "setModalProps", {
-      get: () => react$1.useContext(SetModalPropsContext)
-    });
-    Object.defineProperty(obj, "drawerProps", {
-      get: () => react$1.useContext(DrawerPropsContext)
-    });
-    Object.defineProperty(obj, "setDrawerProps", {
-      get: () => react$1.useContext(SetDrawerPropsContext)
-    });
-    return Object.freeze(obj);
-  });
+  return /* @__PURE__ */ jsxRuntime.jsx(cssinjs.StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(antd.ConfigProvider, { ...props.configProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(
+    AppContext.Provider,
+    {
+      value: {
+        message: messageApi,
+        notification: notificationApi,
+        drawerProps,
+        setDrawerProps,
+        modalProps,
+        setModalProps
+      },
+      children: /* @__PURE__ */ jsxRuntime.jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxRuntime.jsxs(reactRouterDom.BrowserRouter, { ...props.browserRouterProps, children: [
+        messageContextHolder,
+        notificationContextHolder,
+        modal,
+        drawer,
+        /* @__PURE__ */ jsxRuntime.jsx(RoutesApp, { children: props.children })
+      ] }) }) })
+    }
+  ) }) });
 }
+var useApp = AppContext.use;
 App.useApp = useApp;
 App.whyDidYouRender = true;
 function Blank(options) {
@@ -938,18 +928,15 @@ function Link(props) {
         }
       );
     if (props.children)
-      return (
-        // biome-ignore lint/a11y/useValidAnchor: <explanation>
-        /* @__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(
+        "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,

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ErrorBoundary as ErrorBoundary$1, FaasReactClient, useConstant, FaasDataWrapper as FaasDataWrapper$1, faas } from '@faasjs/react';
+import { createSplitedContext, ErrorBoundary as ErrorBoundary$1, FaasReactClient, FaasDataWrapper as FaasDataWrapper$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';
@@ -15,7 +15,7 @@ var Modal = Modal$1;
 Modal.whyDidYouRender = true;
 function useModal(init) {
   const [props, setProps] = useState({ open: false, ...init });
-  const setModalProps2 = useCallback(
+  const setModalProps = useCallback(
     (changes) => {
       const changed = typeof changes === "function" ? changes(props) : changes;
       setProps((prev) => ({ ...prev, ...changed }));
@@ -34,7 +34,7 @@ function useModal(init) {
       }
     ),
     modalProps: props,
-    setModalProps: setModalProps2
+    setModalProps
   };
 }
 var Drawer = Drawer$1;
@@ -44,7 +44,7 @@ function useDrawer(init) {
     open: false,
     ...init
   });
-  const setDrawerProps2 = useCallback(
+  const setDrawerProps = useCallback(
     (changes) => {
       const changed = typeof changes === "function" ? changes(props) : changes;
       setProps((prev) => ({ ...prev, ...changed }));
@@ -63,7 +63,7 @@ function useDrawer(init) {
       }
     ),
     drawerProps: props,
-    setDrawerProps: setDrawerProps2
+    setDrawerProps
   };
 }
 function ErrorChildren(props) {
@@ -158,31 +158,31 @@ function ConfigProvider(props) {
 function useConfigContext() {
   return useContext(ConfigContext);
 }
-var MessageContext = createContext({});
-var NotificationContext = createContext(
-  {}
-);
-var ModalPropsContext = createContext({});
-var SetModalPropsContext = createContext(() => void 0);
-var DrawerPropsContext = createContext({});
-var SetDrawerPropsContext = createContext(() => void 0);
+var AppContext = createSplitedContext({
+  message: {},
+  notification: {},
+  modalProps: {},
+  setModalProps: () => void 0,
+  drawerProps: {},
+  setDrawerProps: () => void 0
+});
 function RoutesApp(props) {
   const location = useLocation();
-  const { drawerProps, setDrawerProps: setDrawerProps2, modalProps, setModalProps: setModalProps2 } = useApp();
+  const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
   useEffect(() => {
     console.debug("location", location);
     if (drawerProps.open)
-      setDrawerProps2({ open: false });
+      setDrawerProps({ open: false });
     if (modalProps.open)
-      setModalProps2({ open: false });
+      setModalProps({ open: false });
   }, [location]);
   return /* @__PURE__ */ jsx(Fragment, { children: props.children });
 }
 function App(props) {
   const [messageApi, messageContextHolder] = message.useMessage();
   const [notificationApi, notificationContextHolder] = notification.useNotification();
-  const { modal, modalProps, setModalProps: setModalProps2 } = useModal();
-  const { drawer, drawerProps, setDrawerProps: setDrawerProps2 } = useDrawer();
+  const { modal, modalProps, setModalProps } = useModal();
+  const { drawer, drawerProps, setDrawerProps } = useDrawer();
   const styleProviderProps = useMemo(
     () => ({
       ...props.styleProviderProps,
@@ -191,38 +191,28 @@ function App(props) {
     }),
     [props.styleProviderProps]
   );
-  return /* @__PURE__ */ jsx(StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsx(ConfigProvider$1, { ...props.configProviderProps, children: /* @__PURE__ */ jsx(MessageContext.Provider, { value: messageApi, children: /* @__PURE__ */ jsx(NotificationContext.Provider, { value: notificationApi, children: /* @__PURE__ */ jsx(DrawerPropsContext.Provider, { value: drawerProps, children: /* @__PURE__ */ jsx(SetDrawerPropsContext.Provider, { value: setDrawerProps2, children: /* @__PURE__ */ jsx(ModalPropsContext.Provider, { value: modalProps, children: /* @__PURE__ */ jsx(SetModalPropsContext.Provider, { value: setModalProps2, children: /* @__PURE__ */ jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxs(BrowserRouter, { ...props.browserRouterProps, children: [
-    messageContextHolder,
-    notificationContextHolder,
-    modal,
-    drawer,
-    /* @__PURE__ */ jsx(RoutesApp, { children: props.children })
-  ] }) }) }) }) }) }) }) }) }) }) });
-}
-function useApp() {
-  return useConstant(() => {
-    const obj = /* @__PURE__ */ Object.create(null);
-    Object.defineProperty(obj, "message", {
-      get: () => useContext(MessageContext)
-    });
-    Object.defineProperty(obj, "notification", {
-      get: () => useContext(NotificationContext)
-    });
-    Object.defineProperty(obj, "modalProps", {
-      get: () => useContext(ModalPropsContext)
-    });
-    Object.defineProperty(obj, "setModalProps", {
-      get: () => useContext(SetModalPropsContext)
-    });
-    Object.defineProperty(obj, "drawerProps", {
-      get: () => useContext(DrawerPropsContext)
-    });
-    Object.defineProperty(obj, "setDrawerProps", {
-      get: () => useContext(SetDrawerPropsContext)
-    });
-    return Object.freeze(obj);
-  });
+  return /* @__PURE__ */ jsx(StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsx(ConfigProvider$1, { ...props.configProviderProps, children: /* @__PURE__ */ jsx(
+    AppContext.Provider,
+    {
+      value: {
+        message: messageApi,
+        notification: notificationApi,
+        drawerProps,
+        setDrawerProps,
+        modalProps,
+        setModalProps
+      },
+      children: /* @__PURE__ */ jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxs(BrowserRouter, { ...props.browserRouterProps, children: [
+        messageContextHolder,
+        notificationContextHolder,
+        modal,
+        drawer,
+        /* @__PURE__ */ jsx(RoutesApp, { children: props.children })
+      ] }) }) })
+    }
+  ) }) });
 }
+var useApp = AppContext.use;
 App.useApp = useApp;
 App.whyDidYouRender = true;
 function Blank(options) {
@@ -934,18 +924,15 @@ function Link(props) {
         }
       );
     if (props.children)
-      return (
-        // biome-ignore lint/a11y/useValidAnchor: <explanation>
-        /* @__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(
+        "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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -26,7 +26,7 @@
     "lodash-es": "*"
   },
   "peerDependencies": {
-    "@faasjs/react": "2.0.0",
+    "@faasjs/react": "2.2.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.0.0",
+    "@faasjs/react": "2.2.0",
     "antd": "*",
     "react": "*",
     "react-dom": "*",