feat(Dialog): throw Error when occur in onOk

alibaba-fusion · Jan 8, 2019 · 35e1a9a · 35e1a9a
1 parent 75b01ea
commit 35e1a9a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/src/dialog/show.jsx b/src/dialog/show.jsx
@@ -74,8 +74,9 @@ class Modal extends Component {
                     if (result !== false) {
                         callback();
                     }
-                }).catch(() => {
+                }).catch((e) => {
                     this.loading(false);
+                    throw e;
                 });
             } else if (res !== false) {
                 callback();

diff --git a/test/dialog/index-spec.js b/test/dialog/index-spec.js
@@ -231,7 +231,7 @@ describe('inner', () => {
             content: 'Content',
             animation: false
         });
-        assert(hasClass(document.querySelector('.next-dialog-message.next-message.next-addon.next-large'), 'next-message-help'));        assert(!document.querySelector('.next-dialog-header'));
+        assert(hasClass(document.querySelector('.next-dialog-message.next-message.next-addon.next-large'), 'next-message-help')); assert(!document.querySelector('.next-dialog-header'));
         assert(document.querySelector('.next-message-title').textContent.trim() === 'Title');
         assert(document.querySelector('.next-message-content').textContent.trim() === 'Content');
         const btns = document.querySelectorAll('.next-dialog-btn');
@@ -300,7 +300,6 @@ describe('inner', () => {
                 });
             }
         });
-
         ReactTestUtils.Simulate.click(document.querySelector('.next-btn-primary'));
 
         setTimeout(() => {
@@ -348,7 +347,7 @@ describe('inner', () => {
                         cancel: 'near cancel'
                     }
                 }}>
-                    <Demo locale={{ok: 'my ok'}} animation={false} />
+                    <Demo locale={{ ok: 'my ok' }} animation={false} />
                 </ConfigProvider>
             </ConfigProvider>
         );
@@ -415,6 +414,40 @@ describe('inner', () => {
 
         assert(!document.querySelector('.far-overlay-wrapper'));
     });
+
+    it('should throw error (async)', () => {
+        const { hide } = Dialog.show({
+            title: 'Title',
+            content: 'Content',
+            onOk: async () => {
+                throw Error();
+            }
+        });
+        try {
+            ReactTestUtils.Simulate.click(document.querySelector('.next-btn-primary'));
+            assert(false);
+        } catch (e) {
+            assert(true);
+        }
+        hide();
+    });
+
+    it('should throw error', () => {
+        const { hide } = Dialog.show({
+            title: 'Title',
+            content: 'Content',
+            onOk: () => {
+                throw Error();
+            }
+        });
+        try {
+            ReactTestUtils.Simulate.click(document.querySelector('.next-btn-primary'));
+            assert(false);
+        } catch (e) {
+            assert(true);
+        }
+        hide();
+    });
 });
 
 function assertOkBtn(btn) {