@jetbrains/ring-ui-built 6.0.64 → 6.0.65

package/components/auth/iframe-flow.js

@@ -64,6 +64,10 @@ import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../loader-screen/loader-screen.js';

package/components/auth-dialog/auth-dialog.js

@@ -47,6 +47,10 @@ import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '@jetbrains/icons/chevron-down';

package/components/auth-dialog-service/auth-dialog-service.js

@@ -60,6 +60,10 @@ import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../heading/heading.js';

package/components/confirm/confirm.js

@@ -43,19 +43,23 @@ import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import 'core-js/modules/es.string.replace.js';
+import '../global/schedule-raf.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../island/adaptive-island-hoc.js';
 import '../global/linear-function.js';
 import '../_helpers/island.js';
 import 'element-resize-detector';
-import '../global/schedule-raf.js';
 import '@jetbrains/icons/chevron-down';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/es.string.starts-with.js';
 import '../global/memoize.js';
 import 'core-js/modules/es.map.js';

package/components/confirm-service/confirm-service.js

@@ -63,6 +63,10 @@ import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../panel/panel.js';

package/components/dialog/dialog.d.ts

@@ -1,6 +1,5 @@
 import { PureComponent } from 'react';
 import * as React from 'react';
-import PropTypes from 'prop-types';
 import TabTrap, { TabTrapProps } from '../tab-trap/tab-trap';
 import type { ShortcutsScopeOptions } from '../shortcuts/core';
 export interface DialogProps extends Partial<TabTrapProps> {
@@ -24,26 +23,6 @@ export interface DialogProps extends Partial<TabTrapProps> {
     preventBodyScroll?: boolean;
 }
 export default class Dialog extends PureComponent<DialogProps> {
-    static propTypes: {
-        label: PropTypes.Requireable<string>;
-        className: PropTypes.Requireable<string>;
-        contentClassName: PropTypes.Requireable<string>;
-        children: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;
-        show: PropTypes.Validator<boolean>;
-        showCloseButton: PropTypes.Requireable<boolean>;
-        closeButtonInside: PropTypes.Requireable<boolean>;
-        closeButtonTitle: PropTypes.Requireable<string>;
-        onOverlayClick: PropTypes.Requireable<(...args: any[]) => any>;
-        onEscPress: PropTypes.Requireable<(...args: any[]) => any>;
-        onCloseClick: PropTypes.Requireable<(...args: any[]) => any>;
-        shortcutOptions: PropTypes.Requireable<object>;
-        onCloseAttempt: PropTypes.Requireable<(...args: any[]) => any>;
-        trapFocus: PropTypes.Requireable<boolean>;
-        portalTarget: PropTypes.Requireable<HTMLElement>;
-        autoFocusFirst: PropTypes.Requireable<boolean>;
-        'data-test': PropTypes.Requireable<string>;
-        preventBodyScroll: PropTypes.Requireable<boolean>;
-    };
     static defaultProps: Partial<DialogProps>;
     state: {
         shortcutsScope: string;
@@ -68,4 +47,4 @@ export default class Dialog extends PureComponent<DialogProps> {
     nativeDialog: React.RefObject<HTMLDialogElement>;
     render(): false | React.JSX.Element;
 }
-export type DialogAttrs = JSX.LibraryManagedAttributes<typeof Dialog, DialogProps>;
+export type DialogAttrs = React.JSX.LibraryManagedAttributes<typeof Dialog, DialogProps>;

package/components/dialog/dialog.js

@@ -2,7 +2,6 @@ import { _ as _defineProperty, a as _inherits, b as _createClass, c as _objectWi
 import 'core-js/modules/es.array.concat.js';
 import { PureComponent, createRef } from 'react';
 import { createPortal } from 'react-dom';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import closeIcon from '@jetbrains/icons/close';
 import { AdaptiveIsland } from '../island/island.js';
@@ -11,9 +10,11 @@ import joinDataTestAttributes from '../global/data-tests.js';
 import Shortcuts from '../shortcuts/shortcuts.js';
 import TabTrap from '../tab-trap/tab-trap.js';
 import { Button } from '../button/button.js';
-import { PopupTarget } from '../popup/popup.target.js';
+import { PopupTarget, PopupTargetContext } from '../popup/popup.target.js';
+import { getPopupContainer } from '../popup/popup.js';
 import { m as modules_5e9b8c03, p as preventerFactory } from '../_helpers/dialog__body-scroll-preventer.js';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
+import 'prop-types';
 import '../island/adaptive-island-hoc.js';
 import '../global/linear-function.js';
 import '../_helpers/island.js';
@@ -58,6 +59,9 @@ import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.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", "preventBodyScroll"];
@@ -140,7 +144,11 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
       if (this.nativeDialog.current != null) {
         if (show) {
           this.nativeDialog.current.removeAttribute('open');
-          modal ? this.nativeDialog.current.showModal() : this.nativeDialog.current.show();
+          if (modal) {
+            this.nativeDialog.current.showModal();
+          } else {
+            this.nativeDialog.current.show();
+          }
         } else {
           this.nativeDialog.current.close();
         }
@@ -169,7 +177,7 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
         onCloseAttempt = _this$props4.onCloseAttempt;
         _this$props4.onEscPress;
         _this$props4.onCloseClick;
-        var children = _this$props4.children,
+        var _children = _this$props4.children,
         className = _this$props4.className,
         contentClassName = _this$props4.contentClassName,
         trapFocus = _this$props4.trapFocus,
@@ -195,7 +203,8 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
           // click handler is duplicated in close button
           role: "presentation",
           className: modules_5e9b8c03.clickableOverlay,
-          onClick: this.handleClick
+          onClick: this.handleClick,
+          "data-test": "ring-dialog-overlay"
         }), /*#__PURE__*/jsx("div", {
           className: modules_5e9b8c03.innerContainer,
           children: /*#__PURE__*/jsxs(AdaptiveIsland, {
@@ -205,7 +214,7 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
             "data-test": "ring-dialog",
             role: "dialog",
             "aria-label": label,
-            children: [children, showCloseButton && /*#__PURE__*/jsx(Button, {
+            children: [_children, showCloseButton && /*#__PURE__*/jsx(Button, {
               icon: closeIcon,
               "data-test": "ring-dialog-close-button",
               className: classNames(modules_5e9b8c03.closeButton, {
@@ -235,47 +244,37 @@ var Dialog = /*#__PURE__*/function (_PureComponent) {
           })
         });
       }
-      return show && /*#__PURE__*/createPortal( /*#__PURE__*/jsx(PopupTarget, {
-        id: this.uid,
-        className: modules_5e9b8c03.popupTarget,
-        children: function children(target) {
-          return /*#__PURE__*/jsxs(TabTrap, _objectSpread2(_objectSpread2({
-            trapDisabled: !trapFocus,
-            "data-test": joinDataTestAttributes('ring-dialog-container', dataTest),
-            ref: _this2.dialogRef,
-            className: classes,
-            role: "presentation"
-          }, restProps), {}, {
-            children: [content, target]
-          }));
+      return show && /*#__PURE__*/jsx(PopupTargetContext.Consumer, {
+        children: function children(contextTarget) {
+          var targetElement = document.body;
+          if (portalTarget instanceof HTMLElement) {
+            targetElement = portalTarget;
+          } else if (contextTarget != null) {
+            var container = getPopupContainer(contextTarget);
+            if (container != null) {
+              targetElement = container;
+            }
+          }
+          return /*#__PURE__*/createPortal( /*#__PURE__*/jsx(PopupTarget, {
+            id: _this2.uid,
+            className: modules_5e9b8c03.popupTarget,
+            children: function children(target) {
+              return /*#__PURE__*/jsxs(TabTrap, _objectSpread2(_objectSpread2({
+                trapDisabled: !trapFocus,
+                "data-test": joinDataTestAttributes('ring-dialog-container', dataTest),
+                ref: _this2.dialogRef,
+                className: classes,
+                role: "presentation"
+              }, restProps), {}, {
+                children: [content, target]
+              }));
+            }
+          }), targetElement);
         }
-      }), portalTarget instanceof HTMLElement ? portalTarget : document.body);
+      });
     }
   }]);
 }(PureComponent);
-_defineProperty(Dialog, "propTypes", {
-  label: PropTypes.string,
-  className: PropTypes.string,
-  contentClassName: PropTypes.string,
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
-  show: PropTypes.bool.isRequired,
-  showCloseButton: PropTypes.bool,
-  closeButtonInside: PropTypes.bool,
-  closeButtonTitle: PropTypes.string,
-  onOverlayClick: PropTypes.func,
-  onEscPress: PropTypes.func,
-  onCloseClick: PropTypes.func,
-  shortcutOptions: PropTypes.object,
-  // onCloseAttempt is a common callback for ESC pressing and overlay clicking.
-  // Use it if you don't need different behaviors for this cases.
-  onCloseAttempt: PropTypes.func,
-  // focusTrap may break popups inside dialog, so use it carefully
-  trapFocus: PropTypes.bool,
-  portalTarget: PropTypes.instanceOf(HTMLElement),
-  autoFocusFirst: PropTypes.bool,
-  'data-test': PropTypes.string,
-  preventBodyScroll: PropTypes.bool
-});
 _defineProperty(Dialog, "defaultProps", {
   label: 'Dialog',
   onOverlayClick: noop,

package/components/login-dialog/login-dialog.js

@@ -54,6 +54,11 @@ import '../link/clickableLink.js';
 import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../global/schedule-raf.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../island/adaptive-island-hoc.js';
@@ -61,7 +66,6 @@ import '../global/linear-function.js';
 import '../_helpers/island.js';
 import '../island/header.js';
 import 'element-resize-detector';
-import '../global/schedule-raf.js';
 import '../loader/loader.js';
 import '../loader/loader__core.js';
 import 'core-js/modules/es.array.fill.js';

package/components/login-dialog/service.js

@@ -60,6 +60,10 @@ import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../loader-screen/loader-screen.js';

package/components/user-agreement/user-agreement.js

@@ -42,19 +42,23 @@ import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import '../popup/popup.target.js';
+import '../popup/popup.js';
+import 'core-js/modules/es.string.replace.js';
+import '../global/schedule-raf.js';
+import '../popup/position.js';
+import 'core-js/modules/es.array.sort.js';
+import '../popup/popup.consts.js';
 import '../_helpers/dialog__body-scroll-preventer.js';
 import 'scrollbar-width';
 import '../island/adaptive-island-hoc.js';
 import '../global/linear-function.js';
 import '../_helpers/island.js';
 import 'element-resize-detector';
-import '../global/schedule-raf.js';
 import '@jetbrains/icons/chevron-down';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/es.string.starts-with.js';
 import '../global/memoize.js';
 import 'core-js/modules/es.map.js';

package/package.json

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