@jetbrains/ring-ui 7.0.27 → 7.0.29

package/components/caret/caret.js

@@ -23,7 +23,7 @@ export default class Caret {
         this.target = target;
     }
     isContentEditable() {
-        return this.target.contentEditable === 'true';
+        return this.target.contentEditable === 'true' || this.target.getAttribute('contenteditable') === 'true'; // workaround for https://github.com/jsdom/jsdom/issues/1670
     }
     /**
      * Set focus on target if possible

package/components/list/list.js

@@ -18,7 +18,6 @@ import memoize from '../global/memoize';
 import { preventDefault } from '../global/dom';
 import Shortcuts from '../shortcuts/shortcuts';
 import createStatefulContext from '../global/create-stateful-context';
-import ListLink from './list__link';
 import ListItem from './list__item';
 import ListCustom from './list__custom';
 import ListTitle from './list__title';
@@ -394,9 +393,6 @@ export default class List extends Component {
                     itemProps.isFirst = isFirst;
                     break;
                 case Type.LINK:
-                    ItemComponent = ListLink;
-                    this.addItemDataTestToProp(itemProps);
-                    break;
                 case Type.ITEM:
                     ItemComponent = ListItem;
                     this.addItemDataTestToProp(itemProps);

package/components/list/list__item.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { PureComponent } from 'react';
 import classNames from 'classnames';
 import dataTests from '../global/data-tests';
@@ -6,7 +6,9 @@ import Avatar, { Size as AvatarSize } from '../avatar/avatar';
 import Checkbox from '../checkbox/checkbox';
 import Icon from '../icon/icon';
 import getUID from '../global/get-uid';
+import Link, { linkHOC } from '../link/link';
 import styles from './list.css';
+import { Type } from './consts';
 import { getListClasses } from './list__classes';
 /**
  * @constructor
@@ -20,7 +22,8 @@ export default class ListItem extends PureComponent {
     stopBubbling = (e) => e.stopPropagation();
     _isString = (val) => typeof val === 'string' || val instanceof String;
     render() {
-        const { disabled, checkbox, avatar, subavatar, glyph, icon, rightGlyph, description, label, title, details, hover, level, tabIndex, onClick, onCheckboxChange, onMouseOver, onMouseDown, onMouseUp, rightNodes, leftNodes, showGeneratedAvatar, username, labelWrapper, } = this.props;
+        const { disabled, checkbox, avatar, subavatar, glyph, icon, rightGlyph, description, label, title, details, hover, level, tabIndex, onClick, onCheckboxChange, onMouseOver, onMouseDown, onMouseUp, rightNodes, leftNodes, showGeneratedAvatar, username, labelWrapper, rgItemType, scrolling, 'data-test': dataTest, className, url, LinkComponent, compact, hoverClassName, children, ...restLinkProps // TODO use an allow list in 8.0
+         } = this.props;
         const checkable = checkbox !== undefined;
         const shouldShowGeneratedAvatar = showGeneratedAvatar && username != null;
         const hasLeftNodes = leftNodes || glyph || avatar || shouldShowGeneratedAvatar;
@@ -43,12 +46,28 @@ export default class ListItem extends PureComponent {
             // label can also be an element, use empty string in this case
             computedTitle = this._isString(label) ? label : '';
         }
-        const dataTest = dataTests({
-            'ring-list-item': (this.props['data-test'] || '').indexOf('ring-list-item') === -1,
+        const isLink = rgItemType === Type.LINK;
+        const combinedDataTest = dataTests({
+            'ring-list-item': (dataTest || '').indexOf('ring-list-item') === -1,
             'ring-list-item-action': !disabled,
             'ring-list-item-selected': checkbox,
-        }, this.props['data-test']);
-        const labelElement = (_jsx("span", { className: styles.label, title: computedTitle, "data-test": "ring-list-item-label", children: label }));
-        return (_jsxs("div", { className: styles.itemContainer, "data-test": dataTest, children: [showCheckbox && (_jsx("div", { className: styles.checkboxContainer, children: _jsx(Checkbox, { "aria-labelledby": this.id, checked: checkbox, disabled: disabled, onChange: onCheckboxChange, onClick: this.stopBubbling }) })), _jsxs("button", { id: this.id, type: "button", tabIndex: tabIndex, onClick: onClick, onMouseOver: onMouseOver, onMouseDown: onMouseDown, onFocus: onMouseOver, onMouseUp: onMouseUp, className: classes, style: style, disabled: disabled, children: [_jsxs("div", { className: styles.top, onMouseOut: this.stopBubbling, onBlur: this.stopBubbling, children: [!showCheckbox && (_jsxs("div", { className: styles.left, children: [leftNodes, glyph && (_jsx(Icon, { className: styles.glyph, glyph: glyph, size: this.props.iconSize, suppressSizeWarning: this.props.suppressSizeWarning })), (avatar || shouldShowGeneratedAvatar) && (_jsx(Avatar, { className: styles.avatar, url: avatar, size: AvatarSize.Size20, subavatar: subavatar, username: username }))] })), labelWrapper ? labelWrapper(labelElement) : labelElement, description && (_jsx("span", { className: styles.description, "data-test": "ring-list-item-description", children: description })), _jsxs("div", { className: styles.right, children: [rightGlyph && (_jsx(Icon, { className: styles.rightGlyph, glyph: rightGlyph, suppressSizeWarning: this.props.suppressSizeWarning, size: this.props.iconSize })), icon && _jsx("div", { className: styles.icon, style: { backgroundImage: `url("${icon}")` } }), rightNodes] })] }), details && _jsx("div", { className: detailsClasses, children: details })] })] }));
+            'ring-list-link': isLink,
+        }, dataTest);
+        const labelElement = (_jsx("span", { className: styles.label, title: computedTitle, "data-test": "ring-list-item-label", children: label ?? children }));
+        const commonProps = {
+            id: this.id,
+            tabIndex,
+            onClick,
+            onMouseOver,
+            onMouseDown,
+            onFocus: onMouseOver,
+            onMouseUp,
+            className: classes,
+            style,
+            disabled,
+            children: (_jsxs(_Fragment, { children: [_jsxs("div", { className: styles.top, onMouseOut: this.stopBubbling, onBlur: this.stopBubbling, children: [!showCheckbox && (_jsxs("div", { className: styles.left, children: [leftNodes, glyph && (_jsx(Icon, { className: styles.glyph, glyph: glyph, size: this.props.iconSize, suppressSizeWarning: this.props.suppressSizeWarning })), (avatar || shouldShowGeneratedAvatar) && (_jsx(Avatar, { className: styles.avatar, url: avatar, size: AvatarSize.Size20, subavatar: subavatar, username: username }))] })), labelWrapper ? labelWrapper(labelElement) : labelElement, description && (_jsx("span", { className: styles.description, "data-test": "ring-list-item-description", children: description })), _jsxs("div", { className: styles.right, children: [rightGlyph && (_jsx(Icon, { className: styles.rightGlyph, glyph: rightGlyph, suppressSizeWarning: this.props.suppressSizeWarning, size: this.props.iconSize })), icon && _jsx("div", { className: styles.icon, style: { backgroundImage: `url("${icon}")` } }), rightNodes] })] }), details && _jsx("div", { className: detailsClasses, children: details })] })),
+        };
+        const LinkComponentToUse = LinkComponent ? linkHOC(LinkComponent) : Link;
+        return (_jsxs("div", { className: styles.itemContainer, "data-test": combinedDataTest, children: [showCheckbox && (_jsx("div", { className: styles.checkboxContainer, children: _jsx(Checkbox, { "aria-labelledby": this.id, checked: checkbox, disabled: disabled, onChange: onCheckboxChange, onClick: this.stopBubbling }) })), isLink ? (_jsx(LinkComponentToUse, { pseudo: !restLinkProps.href, ...commonProps, ...restLinkProps })) : (_jsx("button", { type: "button", ...commonProps }))] }));
     }
 }

package/components/query-assist/query-assist.js

@@ -126,6 +126,7 @@ export default class QueryAssist extends Component {
             state.suggestions !== this.state.suggestions ||
             state.styleRanges !== this.state.styleRanges ||
             state.placeholderEnabled !== this.state.placeholderEnabled ||
+            state.shortcuts !== this.state.shortcuts ||
             props.placeholder !== this.props.placeholder ||
             props.disabled !== this.props.disabled ||
             props.clear !== this.props.clear ||
@@ -133,7 +134,8 @@ export default class QueryAssist extends Component {
             props.actions !== this.props.actions ||
             props.loader !== this.props.loader ||
             props.glass !== this.props.glass ||
-            props.className !== this.props.className);
+            props.className !== this.props.className ||
+            props.delay !== this.props.delay);
     }
     componentDidUpdate(prevProps) {
         const { caret, delay, query } = this.props;
@@ -179,7 +181,9 @@ export default class QueryAssist extends Component {
         if (!this.mouseIsDownOnPopup) {
             this.props.onFocusChange({ focus });
         }
-        this.setState({ shortcuts: focus });
+        if (this.state.shortcuts !== focus) {
+            this.setState({ shortcuts: focus });
+        }
     };
     node;
     nodeRef = (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.27",
+  "version": "7.0.29",
   "description": "JetBrains UI library",
   "author": {
     "name": "JetBrains"
@@ -86,13 +86,13 @@
   "readmeFilename": "README.md",
   "devDependencies": {
     "@babel/cli": "^7.26.4",
-    "@babel/eslint-parser": "^7.26.5",
+    "@babel/eslint-parser": "^7.26.8",
     "@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.6",
     "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.19.0",
+    "@eslint/js": "^9.20.0",
     "@figma/code-connect": "^1.2.4",
     "@jetbrains/eslint-config": "^6.0.4",
     "@jetbrains/logos": "3.0.0-canary.734b213.0",
@@ -131,12 +131,12 @@
     "@types/sinon-chai": "^4.0.0",
     "@types/webpack-env": "^1.18.8",
     "@vitejs/plugin-react": "^4.3.4",
-    "@vitest/eslint-plugin": "^1.1.25",
+    "@vitest/eslint-plugin": "^1.1.27",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
     "acorn": "^8.14.0",
     "axe-playwright": "^2.1.0",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "caniuse-lite": "^1.0.30001698",
+    "caniuse-lite": "^1.0.30001699",
     "chai": "^5.1.2",
     "chai-as-promised": "^8.0.1",
     "chai-dom": "^1.10.0",
@@ -147,7 +147,7 @@
     "cpy-cli": "^5.0.0",
     "dotenv-cli": "^8.0.0",
     "enzyme": "^3.11.0",
-    "eslint": "^9.19.0",
+    "eslint": "^9.20.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-formatter-jslint-xml": "^8.40.0",
     "eslint-import-resolver-webpack": "^0.13.10",
@@ -171,14 +171,14 @@
     "markdown-it": "^14.1.0",
     "merge-options": "^3.0.4",
     "pinst": "^3.0.0",
-    "prettier": "^3.4.2",
+    "prettier": "^3.5.0",
     "raw-loader": "^4.0.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-test-renderer": "^19.0.0",
     "regenerator-runtime": "^0.14.1",
     "rimraf": "^6.0.1",
-    "rollup": "^4.34.5",
+    "rollup": "^4.34.6",
     "rollup-plugin-clear": "^2.0.7",
     "sinon": "^19.0.2",
     "sinon-chai": "^4.0.0",
@@ -217,10 +217,10 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.26.7",
+    "@babel/core": "^7.26.8",
     "@babel/preset-typescript": "^7.26.0",
     "@jetbrains/babel-preset-jetbrains": "^2.4.0",
-    "@jetbrains/icons": "^5.4.0",
+    "@jetbrains/icons": "^5.6.0",
     "@jetbrains/postcss-require-hover": "^0.1.3",
     "@types/combokeys": "^2.4.9",
     "@types/element-resize-detector": "^1.1.6",

package/components/list/list__link.d.ts

@@ -1,9 +0,0 @@
-import { PureComponent } from 'react';
-import { ListDataItemProps } from './consts';
-/**
- * @constructor
- * @extends {ReactComponent}
- */
-export default class ListLink<T> extends PureComponent<ListDataItemProps<T>> {
-    render(): import("react/jsx-runtime").JSX.Element;
-}

package/components/list/list__link.js

@@ -1,17 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { PureComponent } from 'react';
-import Link, { linkHOC } from '../link/link';
-import dataTests from '../global/data-tests';
-import { getListClasses } from './list__classes';
-/**
- * @constructor
- * @extends {ReactComponent}
- */
-export default class ListLink extends PureComponent {
-    render() {
-        const { scrolling, 'data-test': dataTest, className, label, hover, description, rgItemType, url, onCheckboxChange, disabled, LinkComponent, compact, hoverClassName, children, ...restProps } = this.props;
-        const classes = getListClasses(this.props);
-        const Comp = LinkComponent ? linkHOC(LinkComponent) : Link;
-        return (_jsx(Comp, { pseudo: !this.props.href, ...restProps, className: classes, "data-test": dataTests('ring-list-link', dataTest), children: label ?? children }));
-    }
-}