@jetbrains/ring-ui-built 6.0.41 → 6.0.43

package/components/date-picker/date-input.d.ts

@@ -43,6 +43,6 @@ export default class DateInput extends React.PureComponent<DateInputProps> {
     inputRef: (el: HTMLInputElement | null) => void;
     updateInput({ text, active }: UpdateInputConfig): void;
     handleChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
-    handleKeyDown: (e: React.KeyboardEvent) => false | void;
+    handleKeyDown: (e: React.KeyboardEvent) => void;
     render(): React.JSX.Element;
 }

package/components/date-picker/date-input.js

@@ -59,7 +59,14 @@ var DateInput = /*#__PURE__*/function (_React$PureComponent) {
       return _this.props.onInput(e.currentTarget.value, e.currentTarget.dataset.name);
     });
     _defineProperty(_this, "handleKeyDown", function (e) {
-      return e.key === 'Enter' && _this.props.onConfirm();
+      if (e.key === 'Enter') {
+        // We have to prevent the default behavior, because restoring focus by TabTrap caused by
+        // pressing Enter will trigger the onClick event on the DatePicker Dropdown anchor,
+        // so DatePicker will be open again.
+        // https://youtrack.jetbrains.com/issue/RG-2450/Anchor-should-be-focused-after-closing-datepicker#focus=Comments-27-10044234.0-0.
+        e.preventDefault();
+        _this.props.onConfirm();
+      }
     });
     return _this;
   }

package/components/select/select.js

@@ -982,12 +982,16 @@ var Select = /*#__PURE__*/function (_Component) {
         [modules_9d0de074["size".concat(this.props.size)]]: this.props.type !== Type.INLINE,
         [modules_9d0de074.disabled]: this.props.disabled
       });
-      var icons = this._getIcons();
-      var style = getStyle(icons.length);
-      var iconsNode = /*#__PURE__*/jsx("div", {
-        className: modules_9d0de074.icons,
-        children: icons
-      });
+      var style;
+      var iconsNode;
+      if (this.props.type === Type.INPUT || this.props.type === Type.BUTTON) {
+        var icons = this._getIcons();
+        style = getStyle(icons.length);
+        iconsNode = /*#__PURE__*/jsx("div", {
+          className: modules_9d0de074.icons,
+          children: icons
+        });
+      }
       var ariaProps = this.state.showPopup ? {
         'aria-owns': this.listId,
         'aria-activedescendant': activeItemId,
@@ -1029,7 +1033,7 @@ var Select = /*#__PURE__*/function (_Component) {
                 "data-test": "ring-select__focus",
                 enableShortcuts: shortcutsEnabled ? Object.keys(_objectSpread2(_objectSpread2({}, this.getShortcutsMap()), (_this$_popup5 = this._popup) === null || _this$_popup5 === void 0 || (_this$_popup5 = _this$_popup5.list) === null || _this$_popup5 === void 0 ? void 0 : _this$_popup5.shortcutsMap)) : undefined,
                 icon: this.props.filterIcon,
-                afterInput: this.props.type === Type.INPUT && iconsNode
+                afterInput: iconsNode
               })), this._renderPopup()]
             }), this.props.error && /*#__PURE__*/jsx("div", {
               className: classNames(modules_88cfaf40.errorText, modules_88cfaf40["size".concat(this.props.size)]),

package/components/tab-trap/tab-trap.js

@@ -83,18 +83,13 @@ var TabTrap = /*#__PURE__*/forwardRef(function TabTrap(_ref, ref) {
   function restoreFocus() {
     var previousFocusedNode = previousFocusedNodeRef.current;
     if (previousFocusedNode instanceof HTMLElement && previousFocusedNode.focus && isNodeInVisiblePartOfPage(previousFocusedNode)) {
-      // If no delay is added, restoring focus caused by pressing Enter will trigger
-      // the onClick event on the previousFocusedNode, e.g.
-      // https://youtrack.jetbrains.com/issue/RG-2450/Anchor-should-be-focused-after-closing-datepicker#focus=Comments-27-10044234.0-0.
-      setTimeout(function () {
-        // This is to prevent the focus from being restored the first time
-        // componentWillUnmount is called in StrictMode.
-        if (!mountedRef.current) {
-          previousFocusedNode.focus({
-            preventScroll: true
-          });
-        }
-      });
+      // This is to prevent the focus from being restored the first time
+      // componentWillUnmount is called in StrictMode.
+      if (!mountedRef.current) {
+        previousFocusedNode.focus({
+          preventScroll: true
+        });
+      }
     }
   }
   function focusElement() {

package/package.json

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