@jetbrains/ring-ui 5.0.168 → 5.0.169

package/components/select/select.js

@@ -338,7 +338,9 @@ export default class Select extends Component {
         }
     };
     focus = () => {
-        this.node?.focus();
+        const focusableSelectExists = this.node?.querySelector('[data-test~=ring-select__focus]');
+        const restoreFocusNode = this.props.targetElement || focusableSelectExists;
+        restoreFocusNode?.focus();
     };
     _onEnter = () => {
         if (this.state.addButton && this.state.shownData.length === 0) {
@@ -462,12 +464,7 @@ export default class Select extends Component {
                 filterValue: this.props.allowAny ? prevState.filterValue : ''
             }));
             if (tryFocusAnchor) {
-                const focusableSelectExists = this.node &&
-                    this.node.querySelector('[data-test~=ring-select__focus]');
-                const restoreFocusNode = this.props.targetElement || focusableSelectExists;
-                if (restoreFocusNode) {
-                    restoreFocusNode.focus();
-                }
+                this.focus();
             }
         }
     }

package/dist/select/select.js

@@ -349,7 +349,9 @@ var Select = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "focus", function () {
       var _this$node;
-      (_this$node = _this.node) === null || _this$node === void 0 ? void 0 : _this$node.focus();
+      var focusableSelectExists = (_this$node = _this.node) === null || _this$node === void 0 ? void 0 : _this$node.querySelector('[data-test~=ring-select__focus]');
+      var restoreFocusNode = _this.props.targetElement || focusableSelectExists;
+      restoreFocusNode === null || restoreFocusNode === void 0 ? void 0 : restoreFocusNode.focus();
     });
     _defineProperty(_assertThisInitialized(_this), "_onEnter", function () {
       var _this$_popup2;
@@ -789,11 +791,7 @@ var Select = /*#__PURE__*/function (_Component) {
           };
         });
         if (tryFocusAnchor) {
-          var focusableSelectExists = this.node && this.node.querySelector('[data-test~=ring-select__focus]');
-          var restoreFocusNode = this.props.targetElement || focusableSelectExists;
-          if (restoreFocusNode) {
-            restoreFocusNode.focus();
-          }
+          this.focus();
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "5.0.168",
+  "version": "5.0.169",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",