amssui 1.0.1 → 1.0.2

package/es/button-modal/index.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import type { ModalProps } from 'antd/lib/modal';
+import type { DialogProps } from 'react-vant/lib/dialog/PropsType';
 export interface ModalAction {
     open: () => void;
     close: () => void;
 }
-export interface ButtonModalProps extends Omit<ModalProps, 'children'> {
+export interface ButtonModalProps extends Omit<DialogProps, 'children'> {
     onClose?: () => void;
     onOpen?: () => void;
     trigger?: React.ReactElement;

package/es/button-modal/index.js

@@ -52,12 +52,11 @@ var __read = this && this.__read || function (o, n) {
   }
 
   return ar;
-}; // @ts-nocheck
-
+};
 
 import * as React from 'react';
 import isFunction from 'lodash/isFunction';
-import Modal from 'react-vant/lib/dialog';
+import Dialog from 'react-vant/lib/dialog';
 
 var ButtonModal = function ButtonModal(props, ref) {
   var _a = __read(React.useState(false), 2),
@@ -68,9 +67,9 @@ var ButtonModal = function ButtonModal(props, ref) {
       trigger = props.trigger,
       onOpen = props.onOpen,
       onClose = props.onClose,
-      onOk = props.onOk,
+      onConfirm = props.onConfirm,
       onCancel = props.onCancel,
-      restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onOk", "onCancel"]);
+      restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onConfirm", "onCancel"]);
 
   var openModal = function openModal() {
     if (onOpen) {
@@ -97,8 +96,8 @@ var ButtonModal = function ButtonModal(props, ref) {
   });
 
   var handleModalOk = function handleModalOk(e) {
-    if (onOk) {
-      return onOk(e);
+    if (onConfirm) {
+      return onConfirm(e);
     }
 
     closeModal();
@@ -116,12 +115,10 @@ var ButtonModal = function ButtonModal(props, ref) {
   var buttonNode = trigger && /*#__PURE__*/React.cloneElement(trigger, {
     onClick: openModal
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, buttonNode, /*#__PURE__*/React.createElement(Modal, __assign({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, buttonNode, /*#__PURE__*/React.createElement(Dialog, __assign({
     visible: visible,
     onConfirm: handleModalOk,
-    onCancel: handleModalCancel,
-    centered: true,
-    maskClosable: false
+    onCancel: handleModalCancel
   }, restModalProps), isFunction(children) ? children(modalActionRef.current) : /*#__PURE__*/React.cloneElement(children, {
     modalAction: modalActionRef.current
   })));

package/es/button-modal/style/index.d.ts

@@ -1 +1 @@
-import 'antd/lib/modal/style';
+import 'react-vant/lib/dialog/style/index.css';

package/es/button-modal/style/index.js

@@ -1 +1 @@
-import 'antd/lib/modal/style';
+import 'react-vant/lib/dialog/style/index.css';

package/lib/button-modal/index.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import type { ModalProps } from 'antd/lib/modal';
+import type { DialogProps } from 'react-vant/lib/dialog/PropsType';
 export interface ModalAction {
     open: () => void;
     close: () => void;
 }
-export interface ButtonModalProps extends Omit<ModalProps, 'children'> {
+export interface ButtonModalProps extends Omit<DialogProps, 'children'> {
     onClose?: () => void;
     onOpen?: () => void;
     trigger?: React.ReactElement;

package/lib/button-modal/index.js

@@ -104,7 +104,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-}); // @ts-nocheck
+});
 
 var React = __importStar(require("react"));
 
@@ -121,9 +121,9 @@ var ButtonModal = function ButtonModal(props, ref) {
       trigger = props.trigger,
       onOpen = props.onOpen,
       onClose = props.onClose,
-      onOk = props.onOk,
+      onConfirm = props.onConfirm,
       onCancel = props.onCancel,
-      restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onOk", "onCancel"]);
+      restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onConfirm", "onCancel"]);
 
   var openModal = function openModal() {
     if (onOpen) {
@@ -150,8 +150,8 @@ var ButtonModal = function ButtonModal(props, ref) {
   });
 
   var handleModalOk = function handleModalOk(e) {
-    if (onOk) {
-      return onOk(e);
+    if (onConfirm) {
+      return onConfirm(e);
     }
 
     closeModal();
@@ -172,9 +172,7 @@ var ButtonModal = function ButtonModal(props, ref) {
   return React.createElement(React.Fragment, null, buttonNode, React.createElement(dialog_1["default"], __assign({
     visible: visible,
     onConfirm: handleModalOk,
-    onCancel: handleModalCancel,
-    centered: true,
-    maskClosable: false
+    onCancel: handleModalCancel
   }, restModalProps), (0, isFunction_1["default"])(children) ? children(modalActionRef.current) : React.cloneElement(children, {
     modalAction: modalActionRef.current
   })));

package/lib/button-modal/style/index.d.ts

@@ -1 +1 @@
-import 'antd/lib/modal/style';
+import 'react-vant/lib/dialog/style/index.css';

package/lib/button-modal/style/index.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-require("antd/lib/modal/style");
+require("react-vant/lib/dialog/style/index.css");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amssui",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -33,11 +33,11 @@
     "@ahooksjs/use-url-state": "^2.5.8",
     "a-icons": "^1.0.71",
     "aa-utils": "^2.0.25",
-    "ahooks": "^3.0.8",
-    "react-vant": "^2.0.0-alpha.41"
+    "ahooks": "^3.0.8"
   },
   "peerDependencies": {
-    "react": "^16.8.6 || ^17.0 || ^18.0"
+    "react": "^16.8.6 || ^17.0 || ^18.0",
+    "react-vant": "^2.0.0-alpha.41"
   },
   "devDependencies": {
     "@types/enzyme": "^3.10.5",
@@ -48,5 +48,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "50e2603d97efe6f8c3eaf2852011051e1ba60b5b"
+  "gitHead": "b2189ac1e58ae8629ba7ca6a88c43281c18312ef"
 }