Fix primefaces#1879: Input focus() should not scroll unless autoFocus…

…=true
melloware · Apr 22, 2022 · 5f1988b · 5f1988b
1 parent a281c28
commit 5f1988b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/components/lib/autocomplete/AutoComplete.js b/components/lib/autocomplete/AutoComplete.js
@@ -199,7 +199,7 @@ export const AutoComplete = React.memo(React.forwardRef((props, ref) => {
 
     const onDropdownClick = (event) => {
         if (props.dropdownAutoFocus) {
-            DomHandler.focus(inputRef, false);
+            DomHandler.focus(inputRef, props.dropdownAutoFocus);
         }
 
         if (props.dropdownMode === 'blank')
@@ -423,7 +423,7 @@ export const AutoComplete = React.memo(React.forwardRef((props, ref) => {
         }
 
         if (props.autoFocus) {
-            DomHandler.focus(inputRef, false);
+            DomHandler.focus(inputRef, props.autoFocus);
         }
     });
 

diff --git a/components/lib/dropdown/Dropdown.js b/components/lib/dropdown/Dropdown.js
@@ -554,7 +554,7 @@ export const Dropdown = React.memo(React.forwardRef((props, ref) => {
 
     useMountEffect(() => {
         if (props.autoFocus) {
-            DomHandler.focus(focusInputRef, false);
+            DomHandler.focus(focusInputRef, props.autoFocus);
         }
     });
 

diff --git a/components/lib/inputnumber/InputNumber.js b/components/lib/inputnumber/InputNumber.js
@@ -191,7 +191,7 @@ export const InputNumber = React.memo(React.forwardRef((props, ref) => {
 
     const onUpButtonMouseDown = (event) => {
         if (!props.disabled && !props.readOnly) {
-            DomHandler.focus(inputRef);
+            DomHandler.focus(inputRef, props.autoFocus);
             repeat(event, null, 1);
             event.preventDefault();
         }
@@ -223,7 +223,7 @@ export const InputNumber = React.memo(React.forwardRef((props, ref) => {
 
     const onDownButtonMouseDown = (event) => {
         if (!props.disabled && !props.readOnly) {
-            DomHandler.focus(inputRef);
+            DomHandler.focus(inputRef, props.autoFocus);
             repeat(event, null, -1);
 
             event.preventDefault();

diff --git a/components/lib/utils/DomHandler.js b/components/lib/utils/DomHandler.js
@@ -792,11 +792,11 @@ export default class DomHandler {
      * Focus an input element.
      * 
      * @param {MutableRefObject} inputRef the input reference
-     * @param {boolean} preventScroll flag to control whether to scroll to the element, true by default
+     * @param {boolean} autoFocus flag to control whether to scroll to the element, false by default
      */
-    static focus(inputRef, preventScroll) {
-        const flag = ObjectUtils.isEmpty(preventScroll) ? true : preventScroll;
-        inputRef && inputRef.current && inputRef.current.focus({ preventScroll: flag });
+    static focus(inputRef, autoFocus) {
+        const scroll = ObjectUtils.isEmpty(autoFocus) ? true : !autoFocus;
+        inputRef && inputRef.current && inputRef.current.focus({ preventScroll: scroll });
     }
 
     static getCursorOffset(el, prevText, nextText, currentText) {