Use preventScroll option on deactivation (#499)

* Use preventScroll option on deactivation * Add changeset * Implement PR feedback * Format code
focus-trap · Oct 14, 2021 · 08a9449 · 08a9449
1 parent 105808f
commit 08a9449
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/big-baboons-count.md b/.changeset/big-baboons-count.md
@@ -0,0 +1,5 @@
+---
+'focus-trap-react': patch
+---
+
+Use preventScroll option on deactivation
diff --git a/src/focus-trap-react.js b/src/focus-trap-react.js
@@ -97,7 +97,8 @@ class FocusTrap extends React.Component {
   }
 
   deactivateTrap() {
-    const { checkCanReturnFocus } = this.tailoredFocusTrapOptions;
+    const { checkCanReturnFocus, preventScroll = false } =
+      this.tailoredFocusTrapOptions;
 
     if (this.focusTrap) {
       // NOTE: we never let the trap return the focus since we do that ourselves
@@ -111,7 +112,9 @@ class FocusTrap extends React.Component {
 
       if (canReturnFocus) {
         /** Returns focus to the element that had focus when the trap was activated. */
-        returnFocusNode.focus();
+        returnFocusNode.focus({
+          preventScroll,
+        });
       }
 
       if (this.onPostDeactivate) {