From b0e71d5403c1fc41d6ccc75a7b4333252bda7213 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari <olivier.tassinari@gmail.com>
Date: Thu, 21 Mar 2019 13:41:53 +0100
Subject: [PATCH] [Modal] Remove the defaultPrevented logic

---
 packages/material-ui/src/Modal/Modal.js      | 11 ++++-------
 packages/material-ui/src/Modal/Modal.test.js | 10 +++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/material-ui/src/Modal/Modal.js b/packages/material-ui/src/Modal/Modal.js
index 2b03161c58c013..b49ba446b5faf8 100644
--- a/packages/material-ui/src/Modal/Modal.js
+++ b/packages/material-ui/src/Modal/Modal.js
@@ -156,16 +156,13 @@ class Modal extends React.Component {
   };
 
   handleKeyDown = event => {
-    // event.defaultPrevented:
+    // We don't take event.defaultPrevented into account:
     //
-    // Ignore events that have been `event.preventDefault()` marked.
-    // preventDefault() is meant to stop default behaviours like
+    // event.preventDefault() is meant to stop default behaviours like
     // clicking a checkbox to check it, hitting a button to submit a form,
     // and hitting left arrow to move the cursor in a text input etc.
-    // Only special HTML elements have these default bahaviours.
-    //
-    // To remove in v4.
-    if (event.key !== 'Escape' || !this.isTopModal() || event.defaultPrevented) {
+    // Only special HTML elements have these default behaviors.
+    if (event.key !== 'Escape' || !this.isTopModal()) {
       return;
     }
 
diff --git a/packages/material-ui/src/Modal/Modal.test.js b/packages/material-ui/src/Modal/Modal.test.js
index d82497272b9a39..e496f09cf5e9f3 100644
--- a/packages/material-ui/src/Modal/Modal.test.js
+++ b/packages/material-ui/src/Modal/Modal.test.js
@@ -324,15 +324,15 @@ describe('<Modal />', () => {
       assert.strictEqual(onCloseSpy.callCount, 0);
     });
 
-    it('should not be call when defaultPrevented', () => {
+    it('should be call when defaultPrevented', () => {
       topModalStub.returns(true);
-      wrapper.setProps({ disableEscapeKeyDown: true, manager: { isTopModal: topModalStub } });
-      event = { key: 'Escape', defaultPrevented: true };
+      wrapper.setProps({ manager: { isTopModal: topModalStub } });
+      event = { key: 'Escape', defaultPrevented: true, stopPropagation: () => {} };
 
       instance.handleKeyDown(event);
       assert.strictEqual(topModalStub.callCount, 1);
-      assert.strictEqual(onEscapeKeyDownSpy.callCount, 0);
-      assert.strictEqual(onCloseSpy.callCount, 0);
+      assert.strictEqual(onEscapeKeyDownSpy.callCount, 1);
+      assert.strictEqual(onCloseSpy.callCount, 1);
     });
   });