fix: 🐛 arco type, and popconfirm#popVisible -> open

charlzyx · Jan 23, 2024 · fb45425 · fb45425
1 parent db4f928
commit fb45425
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/src/pro-array-table/mixin.base.tsx b/src/pro-array-table/mixin.base.tsx
@@ -66,6 +66,7 @@ export const Addition = (
   return (
     <Button
       type={BUTTON_TYPE}
+      // @ts-ignore
       block
       {...props}
       disabled={self?.disabled}
@@ -123,7 +124,7 @@ export const Copy = React.forwardRef(
           props.className,
         )}
         ref={ref}
-        onClick={(e) => {
+        onClick={(e: any) => {
           if (self?.disabled) return;
           e.stopPropagation();
           if (array.props?.disabled) return;
@@ -227,7 +228,7 @@ export const MoveDown = React.forwardRef(
           props.className,
         )}
         ref={ref}
-        onClick={(e) => {
+        onClick={(e: any) => {
           if (self?.disabled) return;
           e.stopPropagation();
           if (props.onClick) {
@@ -268,7 +269,7 @@ export const MoveUp = React.forwardRef(
           props.className,
         )}
         ref={ref}
-        onClick={(e) => {
+        onClick={(e: any) => {
           if (self?.disabled) return;
           e.stopPropagation();
           if (props.onClick) {

diff --git a/src/pro-array-table/types.tsx b/src/pro-array-table/types.tsx
@@ -1,4 +1,3 @@
-import { ArrayBase } from "@formily/antd";
 import { ArrayField, FieldDisplayTypes, GeneralField } from "@formily/core";
 import { Schema } from "@formily/json-schema";
 import type { Table } from "../adaptor";

diff --git a/src/shadow-form/modal.tsx b/src/shadow-form/modal.tsx
@@ -83,7 +83,7 @@ export const ShadowModal: React.FC<
         <Modal
           {...props}
           open={visible}
-          onCancel={(e) => {
+          onCancel={(e: any) => {
             if (pending.current) return;
             return form
               ?.reset()

diff --git a/src/shadow-form/popconfirm.tsx b/src/shadow-form/popconfirm.tsx
@@ -42,7 +42,7 @@ export const ShadowPopconfirm: React.FC<
   return (
     <Popconfirm
       {...props}
-      popupVisible={visible}
+      open={visible}
       onOpenChange={(o) => {
         if (o !== visible) {
           return setVisible(o);

diff --git a/ui/arco/commonfiy/pops.tsx b/ui/arco/commonfiy/pops.tsx
@@ -35,8 +35,9 @@ export const Drawer = ({
 
 export type ModalProps = Omit<
   React.ComponentProps<typeof ArcoModal>,
-  "visible"
+  "visible" | "onCancel"
 > & {
+  onCancel?: (e?: any) => any | Promise<any>;
   open?: React.ComponentProps<typeof ArcoModal>["visible"];
   destroyOnClose?: React.ComponentProps<typeof ArcoModal>["unmountOnExit"];
 };
@@ -47,7 +48,11 @@ export const Modal = ({
   ...props
 }: React.PropsWithChildren<ModalProps>) => {
   return (
-    <ArcoModal {...props} visible={open} unmountOnExit={destroyOnClose}>
+    <ArcoModal
+      {...(props as any)}
+      visible={open}
+      unmountOnExit={destroyOnClose}
+    >
       {props.children}
     </ArcoModal>
   );