Only focus if scrolling is not disabled, fix precommit

gilbarbara · Jun 25, 2022 · 932c9a8 · 932c9a8
1 parent 520c1fc
commit 932c9a8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-./node_modules/.bin/repo-tools check-remote && lint-staged && flow
+./node_modules/.bin/repo-tools check-remote && ./node_modules/.bin/lint-staged && ./node_modules/.bin/flow
diff --git a/src/components/Step.js b/src/components/Step.js
@@ -103,6 +103,7 @@ export default class JoyrideStep extends React.Component {
       status,
       step,
       update,
+      shouldScroll,
     } = this.props;
     const { changed, changedFrom } = treeChanges(prevProps, this.props);
     const state = { action, controlled, index, lifecycle, size, status };
@@ -202,8 +203,10 @@ export default class JoyrideStep extends React.Component {
         type: EVENTS.TOOLTIP,
       });
 
-      this.scope = new Scope(this.tooltip, { selector: '[data-action=primary]' });
-      this.scope.setFocus();
+      this.scope = new Scope(this.tooltip, {
+        selector: '[data-action=primary]',
+        initialSetFocus: shouldScroll,
+      });
     }
 
     if (changedFrom('lifecycle', [LIFECYCLE.TOOLTIP, LIFECYCLE.INIT], LIFECYCLE.INIT)) {

diff --git a/src/modules/scope.js b/src/modules/scope.js
@@ -14,7 +14,9 @@ export default class Scope {
 
     window.addEventListener('keydown', this.handleKeyDown, false);
 
-    this.setFocus();
+    if (this.options.initialSetFocus !== false) {
+      this.setFocus();
+    }
   }
 
   canBeTabbed = (element: HTMLElement): boolean => {