@jetbrains/ring-ui 7.0.13 → 7.0.15

package/components/button/button.css

@@ -155,6 +155,13 @@
   }
 }
 
+.active.block {
+  --ring-button-background-color: var(--ring-hover-background-color);
+  --ring-button-border-color: var(--ring-main-color);
+
+  transition: none;
+}
+
 .danger {
   --ring-button-focus-border-color: var(--ring-button-danger-hover-color);
 
@@ -187,6 +194,11 @@
       color: var(--ring-icon-disabled-color);
     }
   }
+
+  &.active {
+    --ring-button-background-color: var(--ring-disabled-selected-background-color);
+    --ring-button-border-color: var(--ring-border-selected-disabled-color);
+  }
 }
 
 .primaryBlock {
@@ -246,20 +258,6 @@
   }
 }
 
-.active {
-  &.block {
-    --ring-button-background-color: var(--ring-hover-background-color);
-    --ring-button-border-color: var(--ring-main-color);
-
-    transition: none;
-  }
-
-  &.disabled {
-    --ring-button-background-color: var(--ring-disabled-selected-background-color);
-    --ring-button-border-color: var(--ring-border-selected-disabled-color);
-  }
-}
-
 .iconOnly {
   &.heightS {
     --ring-button-padding-block: calc(var(--ring-unit) * 0.75);

package/components/dialog/dialog.js

@@ -9,7 +9,8 @@ import dataTests from '../global/data-tests';
 import Shortcuts from '../shortcuts/shortcuts';
 import TabTrap from '../tab-trap/tab-trap';
 import Button from '../button/button';
-import { PopupTarget } from '../popup/popup.target';
+import { PopupTarget, PopupTargetContext } from '../popup/popup.target';
+import { getPopupContainer } from '../popup/popup';
 import { preventerFactory as scrollPreventerFactory } from './dialog__body-scroll-preventer';
 import styles from './dialog.css';
 /**
@@ -123,7 +124,18 @@ export default class Dialog extends PureComponent {
         if (native) {
             return (_jsx("dialog", { className: classNames(styles.nativeDialog, className), ref: this.nativeDialog, children: _jsx(PopupTarget, { id: this.uid, className: styles.popupTarget, children: target => (_jsxs(_Fragment, { children: [content, target] })) }) }));
         }
-        return (show &&
-            createPortal(_jsx(PopupTarget, { id: this.uid, className: styles.popupTarget, children: target => (_jsxs(TabTrap, { trapDisabled: !trapFocus, "data-test": dataTests('ring-dialog-container', dataTest), ref: this.dialogRef, className: classes, role: "presentation", ...restProps, children: [content, target] })) }), portalTarget instanceof HTMLElement ? portalTarget : document.body));
+        return (show && (_jsx(PopupTargetContext.Consumer, { children: contextTarget => {
+                let targetElement = document.body;
+                if (portalTarget instanceof HTMLElement) {
+                    targetElement = portalTarget;
+                }
+                else if (contextTarget != null) {
+                    const container = getPopupContainer(contextTarget);
+                    if (container != null) {
+                        targetElement = container;
+                    }
+                }
+                return createPortal(_jsx(PopupTarget, { id: this.uid, className: styles.popupTarget, children: target => (_jsxs(TabTrap, { trapDisabled: !trapFocus, "data-test": dataTests('ring-dialog-container', dataTest), ref: this.dialogRef, className: classes, role: "presentation", ...restProps, children: [content, target] })) }), targetElement);
+            } })));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.13",
+  "version": "7.0.15",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -77,19 +77,19 @@
   },
   "readmeFilename": "README.md",
   "devDependencies": {
-    "@babel/cli": "^7.25.9",
+    "@babel/cli": "^7.26.4",
     "@babel/eslint-parser": "^7.25.9",
     "@babel/plugin-syntax-import-assertions": "^7.26.0",
     "@csstools/css-parser-algorithms": "^3.0.4",
     "@csstools/stylelint-no-at-nest-rule": "^4.0.0",
-    "@eslint/compat": "^1.2.3",
+    "@eslint/compat": "^1.2.4",
     "@eslint/eslintrc": "^3.2.0",
     "@eslint/js": "^9.15.0",
     "@jetbrains/eslint-config": "^6.0.4",
     "@jetbrains/logos": "3.0.0-canary.734b213.0",
     "@jetbrains/stylelint-config": "^4.0.2",
     "@jetbrains/rollup-css-plugin": "./packages/rollup-css-plugin",
-    "@primer/octicons": "^19.12.0",
+    "@primer/octicons": "^19.13.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -107,7 +107,7 @@
     "@storybook/test-runner": "^0.20.1",
     "@storybook/theming": "8.4.7",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/react": "^16.0.1",
+    "@testing-library/react": "^16.1.0",
     "@testing-library/user-event": "^14.5.2",
     "@types/chai": "^5.0.1",
     "@types/chai-as-promised": "^8.0.1",
@@ -122,7 +122,7 @@
     "@types/sinon-chai": "^4.0.0",
     "@types/webpack-env": "^1.18.5",
     "@vitejs/plugin-react": "^4.3.4",
-    "@vitest/eslint-plugin": "^1.1.12",
+    "@vitest/eslint-plugin": "^1.1.14",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "acorn": "^8.14.0",
     "axe-playwright": "^2.0.3",
@@ -144,11 +144,11 @@
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.2",
-    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-storybook": "^0.11.1",
     "events": "^3.3.0",
     "glob": "^11.0.0",
-    "globals": "^15.12.0",
+    "globals": "^15.13.0",
     "html-webpack-plugin": "^5.6.3",
     "http-server": "^14.1.1",
     "husky": "^9.1.7",
@@ -164,10 +164,10 @@
     "raw-loader": "^4.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-test-renderer": "^18.3.1",
+    "react-test-renderer": "^19.0.0",
     "regenerator-runtime": "^0.14.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.28.0",
+    "rollup": "^4.28.1",
     "rollup-plugin-clear": "^2.0.7",
     "sinon": "^19.0.2",
     "sinon-chai": "^4.0.0",
@@ -210,7 +210,7 @@
     "@babel/preset-typescript": "^7.26.0",
     "@jetbrains/babel-preset-jetbrains": "^2.4.0",
     "@jetbrains/icons": "^5.4.0",
-    "@jetbrains/postcss-require-hover": "^0.1.2",
+    "@jetbrains/postcss-require-hover": "^0.1.3",
     "@types/combokeys": "^2.4.9",
     "@types/element-resize-detector": "^1.1.6",
     "@types/react-virtualized": "9.22.0",