From 7432ebc665042a7381a0682879996b049abb1ff6 Mon Sep 17 00:00:00 2001
From: Roni Diwan <ronidiwan@gmail.com>
Date: Sat, 11 Feb 2023 10:35:10 +0200
Subject: [PATCH] Unify `offcanvas` `keydown` event logic with `modal` (#38025)

---
 js/src/modal.js     | 1 -
 js/src/offcanvas.js | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/src/modal.js b/js/src/modal.js
index 0a38586cef..a5adc8466e 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -208,7 +208,6 @@ class Modal extends BaseComponent {
       }
 
       if (this._config.keyboard) {
-        event.preventDefault()
         this.hide()
         return
       }
diff --git a/js/src/offcanvas.js b/js/src/offcanvas.js
index 54adf86ccb..4d5975c0f6 100644
--- a/js/src/offcanvas.js
+++ b/js/src/offcanvas.js
@@ -198,12 +198,12 @@ class Offcanvas extends BaseComponent {
         return
       }
 
-      if (!this._config.keyboard) {
-        EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED)
+      if (this._config.keyboard) {
+        this.hide()
         return
       }
 
-      this.hide()
+      EventHandler.trigger(this._element, EVENT_HIDE_PREVENTED)
     })
   }