listpage-next 0.0.233 → 0.0.235

package/dist/components/PageLayout/components/PageModal/index.d.ts

@@ -1,14 +1,8 @@
 import { ModalProps } from 'antd';
 import { ReactNode } from 'react';
-export interface PageModalProps extends Omit<ModalProps, 'visible' | 'open' | 'onOk' | 'onCancel' | 'footer' | 'title' | 'children' | 'okText' | 'cancelText' | 'closeIcon' | 'closeable'> {
-    visible: boolean;
-    onOk?: () => void;
-    onCancel?: () => void;
-    okText?: string;
-    cancelText?: string;
+export interface PageModalProps extends Omit<ModalProps, 'footer' | 'title'> {
     icon?: ReactNode;
     title: string;
-    children?: ReactNode;
     actionPosition?: 'top' | 'bottom' | 'none';
     extraActions?: ReactNode;
 }

package/dist/components/PageLayout/components/PageModal/index.js

@@ -3,15 +3,13 @@ import { Modal } from "antd";
 import styled_components from "styled-components";
 import { useActions } from "./useActions.js";
 const PageModal = (props)=>{
-    const { icon, visible, children, extraActions, actionPosition = 'bottom', ...modalProps } = props;
+    const { icon, children, extraActions, actionPosition = 'bottom', ...modalProps } = props;
     const { footer, header } = useActions(props);
     return /*#__PURE__*/ jsx(ModalStyled, {
         ...modalProps,
-        open: visible,
         title: header,
-        closeIcon: null,
         footer: footer,
-        closable: 'top' !== actionPosition,
+        closable: false,
         children: children
     });
 };

package/dist/components/PageLayout/components/PageModal/useActions.js

@@ -2,28 +2,11 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "antd";
 import { useMemo } from "react";
 import { styled } from "styled-components";
-import { CloseOutlined } from "@ant-design/icons";
 import { AsyncButton } from "../../../AsyncButton/index.js";
+import { useCloseButton } from "./useCloseButton.js";
 function useActions(props) {
-    const { actionPosition = 'bottom', okText, cancelText, onOk, icon, title, onCancel, extraActions, closable = true } = props;
-    const closeButton = useMemo(()=>{
-        if (true === closable) return /*#__PURE__*/ jsx(CloseButton, {
-            type: "text",
-            icon: /*#__PURE__*/ jsx(CloseOutlined, {}),
-            onClick: onCancel
-        });
-        if (false === closable) return null;
-        const { closeIcon, disabled } = closable;
-        return /*#__PURE__*/ jsx(CloseButton, {
-            type: "text",
-            disabled: disabled,
-            icon: closeIcon || /*#__PURE__*/ jsx(CloseOutlined, {}),
-            onClick: onCancel
-        });
-    }, [
-        closable,
-        onCancel
-    ]);
+    const { actionPosition = 'bottom', okText, cancelText, onOk, icon, title, onCancel, extraActions } = props;
+    const { closeButton } = useCloseButton(props);
     const actions = 'none' === actionPosition ? null : /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(Button, {
@@ -39,12 +22,12 @@ function useActions(props) {
         ]
     });
     const footer = useMemo(()=>{
-        if ('bottom' === actionPosition) return /*#__PURE__*/ jsxs(ExtraContainer, {
+        if ('bottom' === actionPosition) return /*#__PURE__*/ jsxs(Fragment, {
             children: [
-                /*#__PURE__*/ jsx(Fragment, {
+                /*#__PURE__*/ jsx(FlexContainer, {
                     children: extraActions
                 }),
-                /*#__PURE__*/ jsx(Fragment, {
+                /*#__PURE__*/ jsx(ExtraContainer, {
                     children: actions
                 })
             ]
@@ -126,10 +109,4 @@ const ExtraContainer = styled.div`
   gap: 8px;
   justify-content: flex-end;
 `;
-const CloseButton = styled(Button)`
-  color: rgba(0, 0, 0, 0.45);
-  :hover {
-    color: rgba(0, 0, 0, 0.88);
-  }
-`;
 export { useActions };

package/dist/components/PageLayout/components/PageModal/useCloseButton.d.ts

@@ -0,0 +1,8 @@
+import type { PageModalProps } from '.';
+export declare function useCloseButton(props: PageModalProps): {
+    closeButton: import("react/jsx-runtime").JSX.Element | null;
+    closable: boolean;
+} | {
+    closeButton: import("react/jsx-runtime").JSX.Element | null;
+    closable?: undefined;
+};

package/dist/components/PageLayout/components/PageModal/useCloseButton.js

@@ -0,0 +1,40 @@
+import { jsx } from "react/jsx-runtime";
+import { useMemo } from "react";
+import { CloseOutlined } from "@ant-design/icons";
+import { styled } from "styled-components";
+import { Button } from "antd";
+function useCloseButton(props) {
+    const { actionPosition, onCancel, closable = true } = props;
+    const closeButton = useMemo(()=>{
+        if (true === closable) return /*#__PURE__*/ jsx(CloseButton, {
+            type: "text",
+            icon: /*#__PURE__*/ jsx(CloseOutlined, {}),
+            onClick: onCancel
+        });
+        if (false === closable) return null;
+        const { closeIcon, disabled } = closable;
+        return /*#__PURE__*/ jsx(CloseButton, {
+            type: "text",
+            disabled: disabled,
+            icon: closeIcon || /*#__PURE__*/ jsx(CloseOutlined, {}),
+            onClick: onCancel
+        });
+    }, [
+        closable,
+        onCancel
+    ]);
+    if ('top' === actionPosition) return {
+        closeButton,
+        closable: false
+    };
+    return {
+        closeButton
+    };
+}
+const CloseButton = styled(Button)`
+  color: rgba(0, 0, 0, 0.45);
+  :hover {
+    color: rgba(0, 0, 0, 0.88);
+  }
+`;
+export { useCloseButton };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.233",
+  "version": "0.0.235",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",