@jetbrains/ring-ui-built 6.0.56 → 6.0.58

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

@@ -1,4 +1,4 @@
-import { PureComponent } from 'react';
+import { PureComponent, ButtonHTMLAttributes } from 'react';
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import type { Locale } from 'date-fns';
@@ -29,6 +29,7 @@ export type DatePickerProps = Omit<DatePopupProps, 'translations' | 'parseDateIn
     disabled?: boolean | null | undefined;
     parseDateInput: (input: string | null | undefined) => Date | null;
     size?: Size;
+    buttonAttributes?: Pick<ButtonHTMLAttributes<HTMLButtonElement>, 'aria-label'>;
 };
 /**
  * @name Date Picker
@@ -61,6 +62,7 @@ export default class DatePicker extends PureComponent<DatePickerProps> {
         translations: PropTypes.Requireable<object>;
         locale: PropTypes.Requireable<object>;
         size: PropTypes.Requireable<Size>;
+        buttonAttributes: PropTypes.Requireable<object>;
     };
     static defaultProps: DatePickerProps;
     static contextType: React.Context<import("../i18n/i18n-context").I18nContextProps>;

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

@@ -290,13 +290,14 @@ var DatePicker = /*#__PURE__*/function (_PureComponent) {
           disabled: (_this$props$disabled = this.props.disabled) !== null && _this$props$disabled !== void 0 ? _this$props$disabled : false,
           pseudo: true,
           children: this.getAnchorText()
-        }) : /*#__PURE__*/jsx(Button, {
+        }) : /*#__PURE__*/jsx(Button, _objectSpread2(_objectSpread2({
           "data-test-ring-dropdown-anchor": true,
           className: modules_0c7b7d96.anchor,
           text: false,
-          disabled: (_this$props$disabled2 = this.props.disabled) !== null && _this$props$disabled2 !== void 0 ? _this$props$disabled2 : false,
+          disabled: (_this$props$disabled2 = this.props.disabled) !== null && _this$props$disabled2 !== void 0 ? _this$props$disabled2 : false
+        }, this.props.buttonAttributes), {}, {
           children: anchorContent
-        })
+        }))
       }, dropdownProps), {}, {
         children: /*#__PURE__*/jsx(PopupComponent, {
           className: popupClassName,
@@ -340,7 +341,8 @@ _defineProperty(DatePicker, "propTypes", {
   maxDate: dateType,
   translations: PropTypes.object,
   locale: PropTypes.object,
-  size: PropTypes.oneOf(Object.values(Size))
+  size: PropTypes.oneOf(Object.values(Size)),
+  buttonAttributes: PropTypes.object
 });
 _defineProperty(DatePicker, "defaultProps", {
   className: '',

package/components/dialog/dialog.d.ts

@@ -21,6 +21,7 @@ export interface DialogProps extends Partial<TabTrapProps> {
     dense?: boolean | null | undefined;
     native?: boolean;
     modal?: boolean;
+    preventBodyScroll?: boolean;
 }
 export default class Dialog extends PureComponent<DialogProps> {
     static propTypes: {
@@ -41,6 +42,7 @@ export default class Dialog extends PureComponent<DialogProps> {
         portalTarget: PropTypes.Requireable<HTMLElement>;
         autoFocusFirst: PropTypes.Requireable<boolean>;
         'data-test': PropTypes.Requireable<string>;
+        preventBodyScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: Partial<DialogProps>;
     state: {

package/components/dialog/dialog.js

@@ -60,7 +60,7 @@ import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
 import 'scrollbar-width';
 
-var _excluded = ["show", "showCloseButton", "onOverlayClick", "onCloseAttempt", "onEscPress", "onCloseClick", "children", "className", "contentClassName", "trapFocus", "data-test", "closeButtonInside", "portalTarget", "label", "closeButtonTitle", "dense", "shortcutOptions", "native", "modal"];
+var _excluded = ["show", "showCloseButton", "onOverlayClick", "onCloseAttempt", "onEscPress", "onCloseClick", "children", "className", "contentClassName", "trapFocus", "data-test", "closeButtonInside", "portalTarget", "label", "closeButtonTitle", "dense", "shortcutOptions", "native", "modal", "preventBodyScroll"];
 function noop() {}
 var Dialog = /*#__PURE__*/function (_PureComponent) {
   function Dialog() {
@@ -149,6 +149,9 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "toggleScrollPreventer",
     value: function toggleScrollPreventer() {
+      if (!this.props.preventBodyScroll) {
+        return;
+      }
       if (this.props.show) {
         this.scrollPreventer.prevent();
       } else {
@@ -179,6 +182,7 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
         _this$props4.shortcutOptions;
         var native = _this$props4.native;
         _this$props4.modal;
+        _this$props4.preventBodyScroll;
         var restProps = _objectWithoutProperties(_this$props4, _excluded);
       var classes = classNames(modules_5e9b8c03.container, className);
       var shortcutsMap = this.getShortcutsMap();
@@ -269,7 +273,8 @@ _defineProperty(Dialog, "propTypes", {
   trapFocus: PropTypes.bool,
   portalTarget: PropTypes.instanceOf(HTMLElement),
   autoFocusFirst: PropTypes.bool,
-  'data-test': PropTypes.string
+  'data-test': PropTypes.string,
+  preventBodyScroll: PropTypes.bool
 });
 _defineProperty(Dialog, "defaultProps", {
   label: 'Dialog',
@@ -284,7 +289,8 @@ _defineProperty(Dialog, "defaultProps", {
   },
   trapFocus: false,
   autoFocusFirst: true,
-  modal: true
+  modal: true,
+  preventBodyScroll: true
 });
 
 export { Dialog as default };

package/components/select/select.d.ts

@@ -213,6 +213,9 @@ export default class Select<T = unknown> extends Component<SelectProps<T>, Selec
     shortcutsScope: string;
     listId: string;
     private _focusHandler;
+    isClickingSelect: boolean;
+    mouseDownHandler: () => void;
+    mouseUpHandler: () => void;
     private _blurHandler;
     node?: HTMLElement | null;
     nodeRef: (el: HTMLElement | null) => void;

package/components/select/select.js

@@ -307,10 +307,17 @@ var Select = /*#__PURE__*/function (_Component) {
         focused: true
       });
     });
+    _defineProperty(_this, "isClickingSelect", false);
+    _defineProperty(_this, "mouseDownHandler", function () {
+      _this.isClickingSelect = true;
+    });
+    _defineProperty(_this, "mouseUpHandler", function () {
+      _this.isClickingSelect = false;
+    });
     _defineProperty(_this, "_blurHandler", function () {
       var _this$_popup;
       _this.props.onBlur();
-      if (_this._popup && _this._popup.isVisible() && !_this._popup.isClickingPopup) {
+      if (_this._popup && _this._popup.isVisible() && !_this._popup.isClickingPopup && !_this.isClickingSelect) {
         window.setTimeout(function () {
           _this.setState({
             showPopup: false
@@ -1012,6 +1019,10 @@ var Select = /*#__PURE__*/function (_Component) {
               ref: this.nodeRef,
               className: classNames(classes, modules_9d0de074.inputMode),
               "data-test": joinDataTestAttributes('ring-select', dataTest),
+              role: "presentation" // has interactive elements inside
+              ,
+              onMouseDown: this.mouseDownHandler,
+              onMouseUp: this.mouseUpHandler,
               children: [shortcutsEnabled && /*#__PURE__*/jsx(Shortcuts, {
                 map: this.getShortcutsMap(),
                 scope: this.shortcutsScope

package/package.json

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