@faasjs/ant-design 1.5.0 → 1.6.0

package/README.md

@@ -88,12 +88,14 @@ type FaasItemProps = {
 - [Blank](functions/Blank.md)
 - [ConfigProvider](functions/ConfigProvider.md)
 - [Description](functions/Description.md)
+- [Drawer](functions/Drawer.md)
 - [ErrorBoundary](functions/ErrorBoundary.md)
 - [FaasDataWrapper](functions/FaasDataWrapper.md)
 - [Form](functions/Form.md)
 - [FormItem](functions/FormItem.md)
 - [Link](functions/Link.md)
 - [Loading](functions/Loading.md)
+- [Modal](functions/Modal.md)
 - [PageNotFound](functions/PageNotFound.md)
 - [Routes](functions/Routes.md)
 - [Table](functions/Table.md)

package/dist/index.d.mts

@@ -79,7 +79,7 @@ type setDrawerProps = (changes: Partial<DrawerProps> | ((prev: Partial<DrawerPro
 declare function useDrawer(init?: DrawerProps): {
     drawer: react_jsx_runtime.JSX.Element;
     drawerProps: DrawerProps;
-    setDrawerProps(changes: Parameters<setDrawerProps>[0]): void;
+    setDrawerProps: setDrawerProps;
 };
 
 /**
@@ -158,7 +158,9 @@ interface AppProps {
 interface useAppProps {
     message: MessageInstance;
     notification: NotificationInstance;
+    modalProps: ModalProps;
     setModalProps: (changes: Partial<ModalProps>) => void;
+    drawerProps: DrawerProps;
     setDrawerProps: (changes: Partial<DrawerProps>) => void;
 }
 /**
@@ -202,7 +204,7 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare function useApp(): useAppProps;
+declare function useApp(): Readonly<useAppProps>;
 
 interface BlankProps {
     value?: any;

package/dist/index.d.ts

@@ -79,7 +79,7 @@ type setDrawerProps = (changes: Partial<DrawerProps> | ((prev: Partial<DrawerPro
 declare function useDrawer(init?: DrawerProps): {
     drawer: react_jsx_runtime.JSX.Element;
     drawerProps: DrawerProps;
-    setDrawerProps(changes: Parameters<setDrawerProps>[0]): void;
+    setDrawerProps: setDrawerProps;
 };
 
 /**
@@ -158,7 +158,9 @@ interface AppProps {
 interface useAppProps {
     message: MessageInstance;
     notification: NotificationInstance;
+    modalProps: ModalProps;
     setModalProps: (changes: Partial<ModalProps>) => void;
+    drawerProps: DrawerProps;
     setDrawerProps: (changes: Partial<DrawerProps>) => void;
 }
 /**
@@ -202,7 +204,7 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare function useApp(): useAppProps;
+declare function useApp(): Readonly<useAppProps>;
 
 interface BlankProps {
     value?: any;

package/dist/index.js

@@ -19,61 +19,57 @@ var Modal = antd.Modal;
 Modal.whyDidYouRender = true;
 function useModal(init) {
   const [props, setProps] = react$1.useState({ open: false, ...init });
-  const onCancel = react$1.useCallback(() => {
-    setProps((prev) => ({
-      ...prev,
-      open: false
-    }));
-  }, []);
-  const modal = react$1.useMemo(() => /* @__PURE__ */ jsxRuntime.jsx(Modal, { onCancel, ...props }), [props]);
-  const setModalProps = react$1.useCallback((changes) => {
-    if (typeof changes === "function") {
-      setProps((prev) => ({
-        ...prev,
-        ...changes(props)
-      }));
-      return;
-    }
-    setProps((prev) => ({
-      ...prev,
-      ...changes
-    }));
-  }, []);
+  const setModalProps2 = react$1.useCallback(
+    (changes) => {
+      const changed = typeof changes === "function" ? changes(props) : changes;
+      setProps((prev) => ({ ...prev, ...changed }));
+    },
+    [setProps]
+  );
   return {
-    modal,
+    modal: /* @__PURE__ */ jsxRuntime.jsx(
+      Modal,
+      {
+        onCancel: () => setProps((prev) => ({
+          ...prev,
+          open: false
+        })),
+        ...props
+      }
+    ),
     modalProps: props,
-    setModalProps
+    setModalProps: setModalProps2
   };
 }
 var Drawer = antd.Drawer;
+Drawer.whyDidYouRender = true;
 function useDrawer(init) {
   const [props, setProps] = react$1.useState({
     open: false,
-    onClose: () => setProps((prev) => ({
-      ...prev,
-      open: false
-    })),
     ...init
   });
+  const setDrawerProps2 = react$1.useCallback(
+    (changes) => {
+      const changed = typeof changes === "function" ? changes(props) : changes;
+      setProps((prev) => ({ ...prev, ...changed }));
+    },
+    [setProps]
+  );
   return {
-    drawer: /* @__PURE__ */ jsxRuntime.jsx(Drawer, { ...props }),
-    drawerProps: props,
-    setDrawerProps(changes) {
-      if (typeof changes === "function") {
-        setProps((prev) => ({
+    drawer: /* @__PURE__ */ jsxRuntime.jsx(
+      Drawer,
+      {
+        onClose: () => setProps((prev) => ({
           ...prev,
-          ...changes(props)
-        }));
-        return;
+          open: false
+        })),
+        ...props
       }
-      setProps((prev) => ({
-        ...prev,
-        ...changes
-      }));
-    }
+    ),
+    drawerProps: props,
+    setDrawerProps: setDrawerProps2
   };
 }
-Drawer.whyDidYouRender = true;
 function ErrorChildren(props) {
   return /* @__PURE__ */ jsxRuntime.jsx(
     antd.Alert,
@@ -166,36 +162,31 @@ function ConfigProvider(props) {
 function useConfigContext() {
   return react$1.useContext(ConfigContext);
 }
-var AppContext = react$1.createContext({
-  message: {},
-  notification: {},
-  setModalProps: () => void 0,
-  setDrawerProps: () => void 0
-});
+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);
 function RoutesApp(props) {
   const location = reactRouterDom.useLocation();
-  const { setDrawerProps, setModalProps } = useApp();
+  const { drawerProps, setDrawerProps: setDrawerProps2, modalProps, setModalProps: setModalProps2 } = useApp();
   react$1.useEffect(() => {
     console.debug("location", location);
-    setDrawerProps({ open: false });
-    setModalProps({ open: false });
+    if (drawerProps.open)
+      setDrawerProps2({ open: false });
+    if (modalProps.open)
+      setModalProps2({ 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 } = useModal();
-  const { drawer, setDrawerProps } = useDrawer();
-  const memoizedContextValue = react$1.useMemo(
-    () => ({
-      message: messageApi,
-      notification: notificationApi,
-      setModalProps,
-      setDrawerProps
-    }),
-    [messageApi, notificationApi, setModalProps, setDrawerProps]
-  );
+  const { modal, modalProps, setModalProps: setModalProps2 } = useModal();
+  const { drawer, drawerProps, setDrawerProps: setDrawerProps2 } = useDrawer();
   const styleProviderProps = react$1.useMemo(
     () => ({
       ...props.styleProviderProps,
@@ -204,16 +195,37 @@ function App(props) {
     }),
     [props.styleProviderProps]
   );
-  return /* @__PURE__ */ jsxRuntime.jsx(cssinjs.StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(antd.ConfigProvider, { ...props.configProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(AppContext.Provider, { value: memoizedContextValue, children: /* @__PURE__ */ jsxRuntime.jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsxRuntime.jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxRuntime.jsxs(reactRouterDom.BrowserRouter, { ...props.browserRouterProps, children: [
+  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$1.useContext(AppContext);
+  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);
+  });
 }
 App.useApp = useApp;
 App.whyDidYouRender = true;

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { ErrorBoundary as ErrorBoundary$1, FaasReactClient, FaasDataWrapper as FaasDataWrapper$1, faas } from '@faasjs/react';
+import { ErrorBoundary as ErrorBoundary$1, FaasReactClient, useConstant, 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';
-import { createContext, useState, useCallback, useMemo, useEffect, useContext, cloneElement, isValidElement, Suspense } from 'react';
+import { createContext, useState, useCallback, useEffect, useContext, useMemo, cloneElement, isValidElement, 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';
@@ -15,61 +15,57 @@ var Modal = Modal$1;
 Modal.whyDidYouRender = true;
 function useModal(init) {
   const [props, setProps] = useState({ open: false, ...init });
-  const onCancel = useCallback(() => {
-    setProps((prev) => ({
-      ...prev,
-      open: false
-    }));
-  }, []);
-  const modal = useMemo(() => /* @__PURE__ */ jsx(Modal, { onCancel, ...props }), [props]);
-  const setModalProps = useCallback((changes) => {
-    if (typeof changes === "function") {
-      setProps((prev) => ({
-        ...prev,
-        ...changes(props)
-      }));
-      return;
-    }
-    setProps((prev) => ({
-      ...prev,
-      ...changes
-    }));
-  }, []);
+  const setModalProps2 = useCallback(
+    (changes) => {
+      const changed = typeof changes === "function" ? changes(props) : changes;
+      setProps((prev) => ({ ...prev, ...changed }));
+    },
+    [setProps]
+  );
   return {
-    modal,
+    modal: /* @__PURE__ */ jsx(
+      Modal,
+      {
+        onCancel: () => setProps((prev) => ({
+          ...prev,
+          open: false
+        })),
+        ...props
+      }
+    ),
     modalProps: props,
-    setModalProps
+    setModalProps: setModalProps2
   };
 }
 var Drawer = Drawer$1;
+Drawer.whyDidYouRender = true;
 function useDrawer(init) {
   const [props, setProps] = useState({
     open: false,
-    onClose: () => setProps((prev) => ({
-      ...prev,
-      open: false
-    })),
     ...init
   });
+  const setDrawerProps2 = useCallback(
+    (changes) => {
+      const changed = typeof changes === "function" ? changes(props) : changes;
+      setProps((prev) => ({ ...prev, ...changed }));
+    },
+    [setProps]
+  );
   return {
-    drawer: /* @__PURE__ */ jsx(Drawer, { ...props }),
-    drawerProps: props,
-    setDrawerProps(changes) {
-      if (typeof changes === "function") {
-        setProps((prev) => ({
+    drawer: /* @__PURE__ */ jsx(
+      Drawer,
+      {
+        onClose: () => setProps((prev) => ({
           ...prev,
-          ...changes(props)
-        }));
-        return;
+          open: false
+        })),
+        ...props
       }
-      setProps((prev) => ({
-        ...prev,
-        ...changes
-      }));
-    }
+    ),
+    drawerProps: props,
+    setDrawerProps: setDrawerProps2
   };
 }
-Drawer.whyDidYouRender = true;
 function ErrorChildren(props) {
   return /* @__PURE__ */ jsx(
     Alert,
@@ -162,36 +158,31 @@ function ConfigProvider(props) {
 function useConfigContext() {
   return useContext(ConfigContext);
 }
-var AppContext = createContext({
-  message: {},
-  notification: {},
-  setModalProps: () => void 0,
-  setDrawerProps: () => void 0
-});
+var MessageContext = createContext({});
+var NotificationContext = createContext(
+  {}
+);
+var ModalPropsContext = createContext({});
+var SetModalPropsContext = createContext(() => void 0);
+var DrawerPropsContext = createContext({});
+var SetDrawerPropsContext = createContext(() => void 0);
 function RoutesApp(props) {
   const location = useLocation();
-  const { setDrawerProps, setModalProps } = useApp();
+  const { drawerProps, setDrawerProps: setDrawerProps2, modalProps, setModalProps: setModalProps2 } = useApp();
   useEffect(() => {
     console.debug("location", location);
-    setDrawerProps({ open: false });
-    setModalProps({ open: false });
+    if (drawerProps.open)
+      setDrawerProps2({ open: false });
+    if (modalProps.open)
+      setModalProps2({ 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 } = useModal();
-  const { drawer, setDrawerProps } = useDrawer();
-  const memoizedContextValue = useMemo(
-    () => ({
-      message: messageApi,
-      notification: notificationApi,
-      setModalProps,
-      setDrawerProps
-    }),
-    [messageApi, notificationApi, setModalProps, setDrawerProps]
-  );
+  const { modal, modalProps, setModalProps: setModalProps2 } = useModal();
+  const { drawer, drawerProps, setDrawerProps: setDrawerProps2 } = useDrawer();
   const styleProviderProps = useMemo(
     () => ({
       ...props.styleProviderProps,
@@ -200,16 +191,37 @@ function App(props) {
     }),
     [props.styleProviderProps]
   );
-  return /* @__PURE__ */ jsx(StyleProvider, { ...styleProviderProps, children: /* @__PURE__ */ jsx(ConfigProvider$1, { ...props.configProviderProps, children: /* @__PURE__ */ jsx(AppContext.Provider, { value: memoizedContextValue, children: /* @__PURE__ */ jsx(ConfigProvider, { ...props.faasConfigProviderProps, children: /* @__PURE__ */ jsx(ErrorBoundary, { ...props.errorBoundaryProps, children: /* @__PURE__ */ jsxs(BrowserRouter, { ...props.browserRouterProps, children: [
+  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 useContext(AppContext);
+  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);
+  });
 }
 App.useApp = useApp;
 App.whyDidYouRender = true;

package/package.json

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