fix(modal): disable backdrop even if actions missing

geist-org · May 3, 2021 · 9014ff6 · 9014ff6
1 parent 019d2a5
commit 9014ff6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/modal/__tests__/index.test.tsx b/components/modal/__tests__/index.test.tsx
@@ -63,7 +63,7 @@ describe('Modal', () => {
     expect(closeHandler).not.toHaveBeenCalled()
   })
 
-  it('should ignore backdrop disabled when actions missing', async () => {
+  it('should disable backdrop even if actions missing', async () => {
     const closeHandler = jest.fn()
     const wrapper = mount(
       <Modal open={true} disableBackdropClick onClose={closeHandler}>
@@ -72,8 +72,8 @@ describe('Modal', () => {
     )
     wrapper.find('.backdrop').simulate('click', nativeEvent)
     await updateWrapper(wrapper, 500)
-    expectModalIsClosed(wrapper)
-    expect(closeHandler).toHaveBeenCalled()
+    expectModalIsOpened(wrapper)
+    expect(closeHandler).not.toHaveBeenCalled()
   })
 
   it('should ignore event when action disabled', () => {

diff --git a/components/modal/modal.tsx b/components/modal/modal.tsx
@@ -66,7 +66,7 @@ const Modal: React.FC<React.PropsWithChildren<ModalProps>> = ({
   }, [open])
 
   const closeFromBackdrop = () => {
-    if (disableBackdropClick && hasActions) return
+    if (disableBackdropClick) return
     closeModal()
   }