refactor(lookup)

DevExpress · Oct 9, 2024 · fbceb05 · fbceb05
1 parent 8bc4fd5
commit fbceb05
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/devextreme/js/__internal/ui/m_lookup.ts b/packages/devextreme/js/__internal/ui/m_lookup.ts
@@ -549,10 +549,9 @@ const Lookup = DropDownList.inherit({
       _scrollToSelectedItemEnabled,
     } = this.option();
 
-    const shouldInputBeIncludedInFocusOrder = (usePopover && !_scrollToSelectedItemEnabled)
-      || !dropDownCentered;
+    const isInputFocusable = (usePopover && !_scrollToSelectedItemEnabled) || !dropDownCentered;
 
-    if (shouldInputBeIncludedInFocusOrder) {
+    if (isInputFocusable) {
       this.callBase(e);
     }
   },
@@ -637,9 +636,9 @@ const Lookup = DropDownList.inherit({
       _scrollToSelectedItemEnabled,
     } = this.option();
 
-    const shouldLoopFocusInsidePopup = (!usePopover && !_scrollToSelectedItemEnabled)
-      || (_scrollToSelectedItemEnabled && dropDownCentered);
-      // || dropDownCentered;
+    const shouldLoopFocusInsidePopup = _scrollToSelectedItemEnabled
+      ? dropDownCentered
+      : !usePopover;
 
     const result = extend(this.callBase(), {
       toolbarItems: this._getPopupToolbarItems(),