feat: Call separately

Author: 刘欢

src/Dialog/index.tsx

@@ -95,9 +95,7 @@ const Dialog: React.FC<IDialogPropTypes> = (props) => {
 
     // Trigger afterClose only when change visible from true to false
     if (animatedVisible) {
-      const { afterClose: closableAfterClose = undefined } =
-        typeof closable === 'object' ? closable : {};
-      (closableAfterClose ?? afterClose)?.();
+      afterClose?.();
     }
   }
 

src/DialogWrap.tsx

@@ -52,7 +52,8 @@ const DialogWrap: React.FC<IDialogPropTypes> = (props) => {
           afterClose={() => {
             const { afterClose: closableAfterClose = undefined } =
               typeof closable === 'object' ? closable : {};
-            (closableAfterClose ?? afterClose)?.();
+            closableAfterClose?.();
+            afterClose?.();
             setAnimatedVisible(false);
           }}
         />

tests/index.spec.tsx

@@ -553,21 +553,6 @@ describe('dialog', () => {
       expect(afterClose).toHaveBeenCalledTimes(0);
     });
 
-    it('should trigger closable.afterClose when using new API', () => {
-      const afterClose = jest.fn();
-
-      const { rerender } = render(<Dialog closable={{ afterClose }} visible />);
-      act(() => {
-        jest.runAllTimers();
-      });
-
-      rerender(<Dialog closable={{ afterClose }} visible={false} />);
-      act(() => {
-        jest.runAllTimers();
-      });
-      expect(afterClose).toHaveBeenCalledTimes(1);
-    });
-
     it('should prioritize closable.afterClose when both exist', () => {
       const afterClose = jest.fn();
       const legacyAfterClose = jest.fn();
@@ -584,7 +569,7 @@ describe('dialog', () => {
         jest.runAllTimers();
       });
       expect(afterClose).toHaveBeenCalledTimes(1);
-      expect(legacyAfterClose).toHaveBeenCalledTimes(0);
+      expect(legacyAfterClose).toHaveBeenCalledTimes(1);
     });
   });