@jetbrains/ring-ui-built 8.0.0-beta.10 → 8.0.0-beta.11

package/components/user-agreement/service.js

@@ -60,8 +60,13 @@ import '../popup/popup.js';
 import '../popup/position.js';
 import '../popup/popup.consts.js';
 import '../popup/position-css.js';
-import '../_helpers/dialog-body-scroll-preventer.js';
+import '../global/get-viewport-size.js';
+import '../dialog/dialog-body-scroll-preventer.js';
 import 'scrollbar-width';
+import '../_helpers/dialog.js';
+import '../dialog/dialog-controls.js';
+import '@jetbrains/icons/resize-corner-12px';
+import '../dialog/dialog-geometry.js';
 import '../panel/panel.js';
 import '../i18n/i18n-context.js';
 import '../i18n/i18n.js';
@@ -283,6 +288,9 @@ class UserAgreementService {
           preview,
           ...restOptions
         };
+        if (!this.container.isConnected) {
+          document.body.appendChild(this.container);
+        }
         this.reactRoot.render(/*#__PURE__*/jsx(ControlsHeightContext, {
           value: getGlobalControlsHeight(),
           children: /*#__PURE__*/jsx(UserAgreement, {

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

@@ -1,6 +1,6 @@
 import { PureComponent } from 'react';
-import classNames from 'classnames';
 import Dialog from '../dialog/dialog.js';
+import 'classnames';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import '../_helpers/island.js';
 import HeaderWrapper from '../island/header.js';
@@ -9,7 +9,6 @@ import Panel from '../panel/panel.js';
 import { Button } from '../button/button.js';
 import { I18nContext } from '../i18n/i18n-context.js';
 import 'react-dom';
-import '@jetbrains/icons/close';
 import '../island/island.js';
 import '../global/data-tests.js';
 import '../island/adaptive-island-hoc.js';
@@ -33,21 +32,27 @@ import '../popup/position.js';
 import '../popup/popup.consts.js';
 import '../popup/position-css.js';
 import '../_helpers/theme.js';
-import '../_helpers/dialog-body-scroll-preventer.js';
+import '../global/get-viewport-size.js';
+import '../dialog/dialog-body-scroll-preventer.js';
 import 'scrollbar-width';
-import '@jetbrains/icons/chevron-down';
-import '@jetbrains/icons/chevron-12px-down';
+import '../_helpers/dialog.js';
+import '../dialog/dialog-controls.js';
+import '@jetbrains/icons/close';
+import '@jetbrains/icons/resize-corner-12px';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon.constants.js';
 import '../_helpers/icon-svg.js';
 import '../global/memoize.js';
+import '@jetbrains/icons/chevron-down';
+import '@jetbrains/icons/chevron-12px-down';
 import '../link/clickable-link.js';
 import '../global/controls-height.js';
 import '../_helpers/button.classes.js';
+import '../dialog/dialog-geometry.js';
 import '../i18n/i18n.js';
 
-var style = {"extra-small-screen-media":"(max-width: 639px)","agreementDialog":"ring-user-agreement-agreementDialog","dialogContent":"ring-user-agreement-dialogContent","suggestion":"ring-user-agreement-suggestion","remindLaterButton":"ring-user-agreement-remindLaterButton"};
+var style = {"extra-small-screen-media":"(max-width: 639px)","dialogContent":"ring-user-agreement-dialogContent","suggestion":"ring-user-agreement-suggestion"};
 
 function noop() {}
 /**
@@ -85,11 +90,11 @@ class UserAgreement extends PureComponent {
       children: ({
         translate
       }) => {
-        var _translations$userAgr, _translations$userAgr2, _translations$scrollT, _translations$accept, _translations$decline, _translations$scrollT2, _translations$remindL, _translations$close;
+        var _translations$userAgr, _translations$userAgr2, _translations$scrollT, _translations$scrollT2, _translations$decline, _translations$remindL, _translations$accept, _translations$close;
         return /*#__PURE__*/jsxs(Dialog, {
           label: (_translations$userAgr = translations?.userAgreement) !== null && _translations$userAgr !== void 0 ? _translations$userAgr : translate('userAgreement'),
           show: show,
-          className: classNames(style.agreementDialog, className),
+          className: className !== null && className !== void 0 ? className : undefined,
           contentClassName: style.dialogContent,
           trapFocus: true,
           autoFocusFirst: false,
@@ -105,25 +110,24 @@ class UserAgreement extends PureComponent {
             children: [onRemindLater && !scrolledDown && /*#__PURE__*/jsx("div", {
               className: style.suggestion,
               children: (_translations$scrollT = translations?.scrollToAccept) !== null && _translations$scrollT !== void 0 ? _translations$scrollT : translate('scrollToAccept')
-            }), /*#__PURE__*/jsx(Button, {
-              primary: true,
-              disabled: !scrolledDown,
-              onClick: onAccept,
-              "data-test": "accept",
-              children: (_translations$accept = translations?.accept) !== null && _translations$accept !== void 0 ? _translations$accept : translate('accept')
+            }), !onRemindLater && !scrolledDown && /*#__PURE__*/jsx("span", {
+              className: style.suggestion,
+              children: (_translations$scrollT2 = translations?.scrollToAccept) !== null && _translations$scrollT2 !== void 0 ? _translations$scrollT2 : translate('scrollToAccept')
             }), /*#__PURE__*/jsx(Button, {
               onClick: onDecline,
               autoFocus: true,
               "data-test": "decline",
               children: (_translations$decline = translations?.decline) !== null && _translations$decline !== void 0 ? _translations$decline : translate('decline')
-            }), !onRemindLater && !scrolledDown && /*#__PURE__*/jsx("span", {
-              className: style.suggestion,
-              children: (_translations$scrollT2 = translations?.scrollToAccept) !== null && _translations$scrollT2 !== void 0 ? _translations$scrollT2 : translate('scrollToAccept')
             }), onRemindLater && /*#__PURE__*/jsx(Button, {
-              className: style.remindLaterButton,
               onClick: onRemindLater,
               "data-test": "later",
               children: (_translations$remindL = translations?.remindLater) !== null && _translations$remindL !== void 0 ? _translations$remindL : translate('remindLater')
+            }), /*#__PURE__*/jsx(Button, {
+              primary: true,
+              disabled: !scrolledDown,
+              onClick: onAccept,
+              "data-test": "accept",
+              children: (_translations$accept = translations?.accept) !== null && _translations$accept !== void 0 ? _translations$accept : translate('accept')
             })]
           }), preview && /*#__PURE__*/jsx(Panel, {
             children: /*#__PURE__*/jsx(Button, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui-built",
-  "version": "8.0.0-beta.10",
+  "version": "8.0.0-beta.11",
   "description": "JetBrains UI library",
   "author": {
     "name": "JetBrains"
@@ -112,7 +112,7 @@
     }
   },
   "dependencies": {
-    "@jetbrains/icons": "^5.23.0",
+    "@jetbrains/icons": "^5.23.3",
     "change-case": "^4.1.1",
     "classnames": "^2.5.1",
     "combokeys": "^3.0.1",
@@ -133,7 +133,7 @@
     "util-deprecate": "^1.0.2"
   },
   "engines": {
-    "node": ">=14.0",
+    "node": "^22.22.3 || ^24.15 || >=26.0",
     "npm": ">=6.0.0"
   },
   "bugs": {

package/components/_helpers/dialog-body-scroll-preventer.js

@@ -1,50 +0,0 @@
-import scrollbarWidth from 'scrollbar-width';
-
-var styles = {"header":"ring-island-header","scrollableWrapper":"ring-island-scrollableWrapper","panel":"ring-panel-panel","container":"ring-dialog-container","nativeDialog":"ring-dialog-nativeDialog","innerContainer":"ring-dialog-innerContainer","content":"ring-dialog-content","contentCloseButtonOutside":"ring-dialog-contentCloseButtonOutside","contentCloseButtonInside":"ring-dialog-contentCloseButtonInside","clickableOverlay":"ring-dialog-clickableOverlay","closeIconOutside":"ring-dialog-closeIconOutside","closeIcon":"ring-dialog-closeIcon","closeButton":"ring-dialog-closeButton","closeButtonOutside":"ring-dialog-closeButtonOutside","closeButtonInside":"ring-dialog-closeButtonInside","documentWithoutScroll":"ring-dialog-documentWithoutScroll","popupTarget":"ring-dialog-popupTarget","dense":"ring-dialog-dense"};
-
-const isPrevented = new Set();
-let previousDocumentWidth = null;
-const prevent = key => {
-  if (isPrevented.has(key)) {
-    return;
-  }
-  isPrevented.add(key);
-  if (isPrevented.size > 1) {
-    return;
-  }
-  const documentHasScroll = document.documentElement.scrollHeight > window.innerHeight || getComputedStyle(document.documentElement).overflowY === 'scroll';
-  document.documentElement.classList.add(styles.documentWithoutScroll);
-  const scrollWidth = scrollbarWidth();
-  const {
-    scrollbarGutter
-  } = getComputedStyle(document.documentElement);
-  const documentHasScrollbarGutter = scrollbarGutter === 'stable' || scrollbarGutter === 'both-edges';
-  if (documentHasScroll && scrollWidth !== null && scrollWidth !== undefined && scrollWidth > 0 && !documentHasScrollbarGutter) {
-    previousDocumentWidth = document.documentElement.style.width;
-    document.documentElement.style.width = `calc(100% - ${scrollWidth}px)`;
-  }
-};
-const reset = key => {
-  if (isPrevented.size === 0) {
-    return;
-  }
-  isPrevented.delete(key);
-  if (isPrevented.size > 0) {
-    return;
-  }
-  document.documentElement.classList.remove(styles.documentWithoutScroll);
-  if (previousDocumentWidth !== null && previousDocumentWidth !== undefined) {
-    document.documentElement.style.width = previousDocumentWidth;
-    previousDocumentWidth = null;
-  }
-};
-const preventerFactory = key => {
-  const preventerKey = key || Math.random();
-  return {
-    prevent: () => prevent(preventerKey),
-    reset: () => reset(preventerKey)
-  };
-};
-var dialogBodyScrollPreventer = preventerFactory('default-preventer');
-
-export { dialogBodyScrollPreventer as d, preventerFactory as p, styles as s };