@jetbrains/ring-ui 7.0.96 → 7.0.98

package/components/auth/auth-core.js

@@ -373,7 +373,7 @@ class Auth {
             await this._backendCheckPromise;
         }
         catch (e) {
-            throw new Error('Cannot refresh token: backend is not available. Postponed by user.');
+            throw new Error('Cannot refresh token: backend is not available. Postponed by user.', { cause: e });
         }
         finally {
             this._backendCheckPromise = null;
@@ -734,7 +734,7 @@ class Auth {
             throw new Error('No state in AuthResponse');
         }
         const { scope: defaultScope } = this.config;
-        let urlFromState = null;
+        let urlFromState;
         try {
             urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
         }

package/components/avatar/avatar.js

@@ -65,7 +65,7 @@ export default class Avatar extends PureComponent {
             };
             src = encodeURL(urlStart, queryParams);
         }
-        let subavatarSrc = null;
+        let subavatarSrc;
         if (subavatar && !isDataURI(subavatar)) {
             const [urlStart, query] = subavatar.split('?');
             const queryParams = {

package/components/list/list-item.js

@@ -36,7 +36,7 @@ export default class ListItem extends PureComponent {
         const style = {
             paddingLeft: `${(Number(level) || 0) * RING_UNIT + DEFAULT_PADDING + (showCheckbox ? CHECKBOX_WIDTH : 0)}px`,
         };
-        let computedTitle = null;
+        let computedTitle;
         if (this._isString(title)) {
             // if title is specified and is a string then use it
             computedTitle = title;

package/components/list/list.d.ts

@@ -68,7 +68,6 @@ export interface ListState<T = unknown> {
     prevActiveIndex: number | null;
     prevData: ListDataItem<T>[];
     activeItem: ListDataItem<T> | null;
-    needScrollToActive: boolean;
     scrolling: boolean;
     hasOverflow: boolean;
     scrolledToBottom: boolean;
@@ -151,6 +150,7 @@ export default class List<T = unknown> extends Component<ListProps<T>, ListState
     getSelected(): ListDataItem<T> | null;
     defaultItemHeight(): number;
     scrollEndHandler: () => void;
+    scrollToActive: () => void;
     checkOverflow: () => void;
     getVisibleListHeight(maxHeight: number): number;
     private _deprecatedGenerateKeyFromContent;

package/components/list/list.js

@@ -74,7 +74,6 @@ export default class List extends Component {
         prevActiveIndex: null,
         prevData: [],
         activeItem: null,
-        needScrollToActive: false,
         scrolling: false,
         hasOverflow: false,
         scrolledToBottom: false,
@@ -101,7 +100,6 @@ export default class List extends Component {
             Object.assign(nextState, {
                 activeIndex,
                 activeItem: data[activeIndex],
-                needScrollToActive: true,
             });
         }
         else if (data !== prevData && restoreActiveIndex && activeItem && activeItem.key) {
@@ -121,6 +119,9 @@ export default class List extends Component {
             shouldActivateFirstItem(this.props)) {
             this.activateFirst();
         }
+        if (!this.props.renderOptimization) {
+            this.scrollToActive();
+        }
     }
     shouldComponentUpdate(nextProps, nextState) {
         return (Object.keys(nextProps).some(key => !Object.is(nextProps[key], this.props[key])) ||
@@ -131,22 +132,10 @@ export default class List extends Component {
             this.virtualizedList.recomputeRowHeights();
         }
         const { activeIndex } = this.state;
-        if (!this.virtualizedList &&
-            !this.props.disableScrollToActive &&
-            this.state.needScrollToActive &&
-            activeIndex != null &&
-            activeIndex !== prevState.activeIndex) {
-            const itemId = this.getId(this.props.data[activeIndex]);
-            if (itemId) {
-                document.getElementById(itemId)?.scrollIntoView?.({
-                    block: 'center',
-                });
-            }
-            this.setState({ needScrollToActive: false });
+        if (activeIndex != null && activeIndex !== prevState.activeIndex) {
+            this.scrollToActive();
         }
-        const isActiveItemRetainedPosition = activeIndex
-            ? prevProps.data[activeIndex]?.key === this.props.data[activeIndex]?.key
-            : false;
+        const isActiveItemRetainedPosition = activeIndex != null ? prevProps.data[activeIndex]?.key === this.props.data[activeIndex]?.key : false;
         if ((this.props.activeIndex === null || this.props.activeIndex === undefined) &&
             getDataHash(this.props.data) !== getDataHash(prevProps.data) &&
             shouldActivateFirstItem(this.props) &&
@@ -209,7 +198,6 @@ export default class List extends Component {
             this.setState({
                 activeIndex: firstActivatableIndex,
                 activeItem: this.props.data[firstActivatableIndex],
-                needScrollToActive: true,
             });
         }
     };
@@ -284,7 +272,6 @@ export default class List extends Component {
         this.setState({
             activeIndex: correctedIndex,
             activeItem: item,
-            needScrollToActive: true,
         }, function onSet() {
             if (!isActivatable(item)) {
                 retryCallback(e);
@@ -344,6 +331,21 @@ export default class List extends Component {
             }
         }
     });
+    scrollToActive = () => {
+        const { activeIndex } = this.state;
+        if (this.props.disableScrollToActive || activeIndex == null) {
+            return;
+        }
+        if (this.virtualizedList) {
+            this.virtualizedList.scrollToRow(activeIndex + 1);
+        }
+        else {
+            const itemId = this.getId(this.props.data[activeIndex]);
+            if (itemId) {
+                document.getElementById(itemId)?.scrollIntoView?.({ block: 'center' });
+            }
+        }
+    };
     checkOverflow = () => {
         if (this.inner) {
             this.setState({
@@ -455,7 +457,11 @@ export default class List extends Component {
         return props;
     };
     virtualizedListRef = (el) => {
+        const isFirstAssignment = el != null && this.virtualizedList == null;
         this.virtualizedList = el;
+        if (isFirstAssignment) {
+            this.scrollToActive();
+        }
     };
     containerRef = (el) => {
         this.container = el;
@@ -476,12 +482,7 @@ export default class List extends Component {
                     this.scrollEndHandler();
                 }} scrollTop={scrollTop} rowCount={rowCount} estimatedRowSize={this.defaultItemHeight()} rowHeight={this._cache.rowHeight} rowRenderer={this.renderItem} overscanRowCount={this._bufferSize} 
             // ensure rerendering
-            noop={() => { }} scrollToIndex={!this.props.disableScrollToActive &&
-                    this.state.needScrollToActive &&
-                    this.state.activeIndex !== null &&
-                    this.state.activeIndex !== undefined
-                    ? this.state.activeIndex + 1
-                    : undefined} scrollToAlignment='center' deferredMeasurementCache={this._cache} onRowsRendered={this.checkOverflow} containerRole='none' // row role is set by rowRenderer
+            noop={() => { }} scrollToAlignment='center' deferredMeasurementCache={this._cache} onRowsRendered={this.checkOverflow} containerRole='none' // row role is set by rowRenderer
             />
           </div>)}
       </AutoSizer>);

package/components/query-assist/query-assist.d.ts

@@ -157,7 +157,7 @@ interface CaretPositionParams {
     forceSetCaret?: boolean | null | undefined;
 }
 interface HistoryEntry {
-    query: string | null | undefined;
+    normalizedQuery: string;
     caret: Position | number;
 }
 /**
@@ -218,7 +218,8 @@ export default class QueryAssist extends Component<QueryAssistProps> {
     immediateState: QueryAssistChange;
     requestData?: (afterCompletion?: boolean) => void;
     ngModelStateField: string;
-    historyStack: HistoryEntry[];
+    undoHistoryStack: HistoryEntry[];
+    redoHistoryStack: HistoryEntry[];
     mouseIsDownOnPopup?: boolean;
     handleFocusChange: (e: SyntheticEvent) => void;
     node?: HTMLElement | null;
@@ -233,9 +234,11 @@ export default class QueryAssist extends Component<QueryAssistProps> {
     handleInput: (e: Event | SyntheticEvent) => void;
     handleEnter: (e: React.KeyboardEvent) => void;
     handleTab: (e: Event) => boolean | void;
-    setState: (state: Partial<QueryAssistState>, resolve?: () => void) => void;
+    setState: (state: Partial<QueryAssistState>, resolve?: () => void, undoOrRedo?: boolean) => void;
     private _pushHistory;
     undo: (e: Event) => void;
+    redo: (e: Event) => void;
+    private _undoOrRedo;
     handlePaste: (e: React.ClipboardEvent) => void;
     handleCaretMove: (e: Event | SyntheticEvent) => void;
     handleStyleRangesResponse: ({ suggestions, ...restProps }: QueryAssistResponse) => Promise<void>;

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

@@ -118,7 +118,7 @@ export default class QueryAssist extends Component {
             this.requestStyleRanges().catch(noop);
         }
         this.setCaretPosition();
-        this._pushHistory(this.state);
+        this._pushHistory(this.state.query);
     }
     shouldComponentUpdate(props, state) {
         return (state.query !== this.state.query ||
@@ -163,8 +163,8 @@ export default class QueryAssist extends Component {
     immediateState;
     requestData;
     ngModelStateField = ngModelStateField;
-    // An array of {query: string; caret: number}[]
-    historyStack = [];
+    undoHistoryStack = [];
+    redoHistoryStack = [];
     mouseIsDownOnPopup;
     handleFocusChange = (e) => {
         // otherwise it's blur and false
@@ -290,6 +290,9 @@ export default class QueryAssist extends Component {
         if (this.props.autoOpen === 'force' || props.query.length > 0) {
             this.requestData?.();
         }
+        else {
+            this.handleResponse({ caret: props.caret });
+        }
     };
     // It's necessary to prevent new element creation before any other hooks
     handleEnter = (e) => {
@@ -313,31 +316,45 @@ export default class QueryAssist extends Component {
         }
         return true;
     };
-    setState = (state, resolve) => {
+    setState = (state, resolve, undoOrRedo = false) => {
         super.setState(state, () => {
-            this._pushHistory(state);
+            if (!undoOrRedo && 'query' in state) {
+                this._pushHistory(state.query);
+            }
             resolve?.();
         });
     };
-    _pushHistory(state) {
-        const queryIsSet = 'query' in state;
-        const queryIsSame = this.historyStack[0]?.query === state.query;
-        if (queryIsSet && !queryIsSame) {
-            this.historyStack.unshift({
-                query: state.query,
+    _pushHistory(query) {
+        const normalizedQuery = query ?? '';
+        if (!this.undoHistoryStack.length || this.undoHistoryStack[0].normalizedQuery !== normalizedQuery) {
+            this.undoHistoryStack.unshift({
+                normalizedQuery,
                 caret: this.caret?.getPosition({ avoidFocus: true }) ?? -1,
             });
+            this.redoHistoryStack = [];
         }
     }
     undo = (e) => {
-        const previous = this.historyStack.splice(0, 2)[1];
-        if (!previous) {
+        this._undoOrRedo(e, false);
+    };
+    redo = (e) => {
+        this._undoOrRedo(e, true);
+    };
+    _undoOrRedo = (e, redo) => {
+        const stack = redo ? this.redoHistoryStack : this.undoHistoryStack;
+        const [current, previous] = stack;
+        const stateToApply = redo ? current : previous;
+        if (!stateToApply) {
             return;
         }
-        this.setState({ query: previous.query }, () => {
-            this.caret?.setPosition(previous.caret);
+        stack.shift();
+        e.preventDefault?.();
+        this.setState({ query: stateToApply.normalizedQuery }, () => {
+            const oppositeStack = redo ? this.undoHistoryStack : this.redoHistoryStack;
+            oppositeStack.unshift(current);
+            this.caret?.setPosition(stateToApply.caret);
             this.handleInput(e);
-        });
+        }, true);
     };
     handlePaste = (e) => {
         const INSERT_COMMAND = 'insertText';
@@ -368,7 +385,7 @@ export default class QueryAssist extends Component {
         }
     };
     handleStyleRangesResponse = ({ suggestions, ...restProps }) => this.handleResponse(restProps);
-    handleResponse = ({ query = '', caret = 0, styleRanges, suggestions = [] }, afterCompletion = false) => new Promise((resolve, reject) => {
+    handleResponse = ({ query = '', caret = 0, styleRanges = [], suggestions = [] }, afterCompletion = false) => new Promise((resolve, reject) => {
         if (query === this.getQuery() &&
             (caret === this.immediateState.caret || this.immediateState.caret === undefined)) {
             // Do not setState on unmounted component
@@ -665,6 +682,7 @@ export default class QueryAssist extends Component {
         'ctrl+space': this.handleCtrlSpace,
         tab: this.handleTab,
         'meta+z': this.undo,
+        'meta+shift+z': this.redo,
         right: noop,
         left: noop,
         space: noop,

package/components/tabs/collapsible-tabs.js

@@ -42,7 +42,7 @@ export const CollapsibleTabs = ({ children, selected, onSelect, onLastVisibleInd
     const adjustTabs = useCallback((entry) => {
         const containerWidth = entry.contentRect.width;
         const { tabs: tabsSizes, more = 0 } = elements.sizes;
-        let renderMore = children.some(tab => tab.props.alwaysHidden);
+        const renderMore = children.some(tab => tab.props.alwaysHidden);
         const tabsToRender = [];
         let filledWidth = renderMore ? (more ?? 0) : 0;
         for (let i = 0; i < tabsSizes.length; i++) {
@@ -58,7 +58,6 @@ export const CollapsibleTabs = ({ children, selected, onSelect, onLastVisibleInd
             for (let i = tabsToRender.length - 1; i >= 0; i--) {
                 if (filledWidth + more < containerWidth + MEASURE_TOLERANCE) {
                     filledWidth += more;
-                    renderMore = true;
                     break;
                 }
                 else {
@@ -71,7 +70,6 @@ export const CollapsibleTabs = ({ children, selected, onSelect, onLastVisibleInd
             const selectedWidth = tabsSizes[selectedIndex];
             for (let i = tabsToRender.length - 1; i >= 0; i--) {
                 if (filledWidth + selectedWidth < containerWidth + MEASURE_TOLERANCE) {
-                    filledWidth += selectedWidth;
                     break;
                 }
                 else {

package/components/tooltip/tooltip.d.ts

@@ -13,6 +13,7 @@ export interface TooltipProps extends Omit<AllHTMLAttributes<HTMLSpanElement>, '
     selfOverflowOnly?: boolean | null | undefined;
     popupProps?: Partial<PopupAttrs> | null | undefined;
     title?: ReactNode | null | undefined;
+    hide?: boolean | null | undefined;
     theme?: Theme | 'inherit';
     'data-test'?: string | null | undefined;
     long?: boolean | null | undefined;
@@ -21,6 +22,7 @@ export interface TooltipProps extends Omit<AllHTMLAttributes<HTMLSpanElement>, '
  * @name Tooltip
  */
 export default class Tooltip extends Component<TooltipProps> {
+    private static isShow;
     static defaultProps: {
         title: string;
         selfOverflowOnly: boolean;

package/components/tooltip/tooltip.js

@@ -13,6 +13,9 @@ const TooltipContext = createContext(undefined);
  * @name Tooltip
  */
 export default class Tooltip extends Component {
+    static isShow({ title, hide }) {
+        return !!title && !hide;
+    }
     static defaultProps = {
         title: '',
         selfOverflowOnly: false,
@@ -24,15 +27,17 @@ export default class Tooltip extends Component {
         showNestedPopup: false,
     };
     componentDidMount() {
-        if (this.props.title) {
+        if (Tooltip.isShow(this.props)) {
             this.addListeners();
         }
     }
     componentDidUpdate(prevProps) {
-        if (!prevProps.title && this.props.title) {
+        const prevShow = Tooltip.isShow(prevProps);
+        const currShow = Tooltip.isShow(this.props);
+        if (!prevShow && currShow) {
             this.addListeners();
         }
-        else if (prevProps.title && !this.props.title) {
+        else if (prevShow && !currShow) {
             this.hidePopup();
             this.listeners.removeAll();
         }
@@ -50,10 +55,9 @@ export default class Tooltip extends Component {
         this.containerNode = el;
     };
     tryToShowPopup = () => {
-        const { delay, title } = this.props;
-        if (!title) {
+        if (!Tooltip.isShow(this.props))
             return;
-        }
+        const { delay } = this.props;
         if (delay) {
             clearTimeout(this.timeout);
             this.timeout = window.setTimeout(this.showPopup, delay);
@@ -125,8 +129,8 @@ export default class Tooltip extends Component {
         this.setState({ showNestedPopup: false });
     };
     render() {
-        const { children, 'data-test': dataTest, title, delay, theme, selfOverflowOnly, popupProps, long, ...restProps } = this.props;
-        const ariaProps = typeof title === 'string' && !!title ? { 'aria-label': title, role: 'tooltip' } : {};
+        const { children, 'data-test': dataTest, title, delay, theme, selfOverflowOnly, popupProps, long, hide, ...restProps } = this.props;
+        const ariaProps = typeof title === 'string' && Tooltip.isShow({ title, hide }) ? { 'aria-label': title, role: 'tooltip' } : {};
         const { onNestedTooltipShow, onNestedTooltipHide } = this;
         const popup = (<Popup trapFocus={false} anchorElement={this.containerNode} hidden={!this.state.showPopup || this.state.showNestedPopup} onCloseAttempt={this.hidePopup} maxHeight={400} attached={false} onMouseOut={this.hideIfMovedOutsidePopup} top={4} dontCloseOnAnchorClick ref={this.popupRef} {...popupProps} className={classNames(styles.tooltip, { [styles.long]: long, [styles.inheritedTheme]: theme === 'inherit' }, popupProps?.className)}>
         {title}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.96",
+  "version": "7.0.98",
   "description": "JetBrains UI library",
   "author": {
     "name": "JetBrains"
@@ -56,6 +56,8 @@
     "figma-connect-unpublish": "npx figma connect unpublish --token=$FIGMA_CODE_CONNECT_TOKEN",
     "figma-connect-unpublish-local": "dotenv -- npm run figma-connect-unpublish",
     "lint": "npm run lint:js && npm run stylelint",
+    "prelint-ci": "echo \"##teamcity[importData type='jslint' path='eslint-report.xml']\"",
+    "lint-ci": "eslint --format jslint-xml . > eslint-report.xml && npm run stylelint-ci",
     "lint:js": "eslint",
     "postbuild": "cpy './**/*.d.ts' ../dist --parents --cwd=components/",
     "_postinstall": "husky && npm run postinstall:gitconfig",
@@ -79,12 +81,15 @@
     "start": "storybook dev -p 9999",
     "storybook-debug": "node --inspect-brk node_modules/@storybook/react/bin -p 9999",
     "stylelint": "stylelint --ignore-path .stylelintignore '**/*.css'",
+    "stylelint-ci": "stylelint --ignore-path .stylelintignore --custom-formatter 'scripts/jslint-xml.js' '**/*.css' | xmlappend eslint-report.xml",
     "test": "vitest src",
     "type-check": "(npm run type-check:create-d-ts && npm run type-check:main && npm run type-check:build) ; npm run type-check:cleanup-d-ts",
     "type-check:create-d-ts": "npx tcm src && npx tcm .storybook",
     "type-check:main": "tsc --noEmit -p tsconfig.json",
     "type-check:build": "tsc --noEmit -p tsconfig-build.json",
     "type-check:cleanup-d-ts": "rimraf src/**/*.css.d.ts .storybook/*.css.d.ts .storybook/**/*.css.d.ts",
+    "pretype-check-ci": "npm run type-check:create-d-ts",
+    "type-check-ci": "node scripts/tsc-teamcity",
     "update-styles": "node scripts/update-styles.mjs",
     "validate-tc-config": "mvn --file .teamcity/pom.xml org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate -e"
   },
@@ -99,9 +104,9 @@
     "@csstools/css-parser-algorithms": "^4.0.0",
     "@csstools/stylelint-no-at-nest-rule": "^5.0.0",
     "@eslint/compat": "^2.0.2",
-    "@eslint/eslintrc": "^3.3.3",
+    "@eslint/eslintrc": "^3.3.4",
     "@eslint/js": "^10.0.1",
-    "@figma/code-connect": "^1.3.13",
+    "@figma/code-connect": "^1.4.1",
     "@jetbrains/eslint-config": "^6.0.5",
     "@jetbrains/logos": "3.0.0-canary.734b213.0",
     "@jetbrains/rollup-css-plugin": "./packages/rollup-css-plugin",
@@ -112,11 +117,11 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-replace": "^6.0.3",
-    "@storybook/addon-a11y": "10.2.8",
-    "@storybook/addon-docs": "^10.2.8",
-    "@storybook/addon-themes": "^10.2.8",
+    "@storybook/addon-a11y": "10.2.13",
+    "@storybook/addon-docs": "^10.2.13",
+    "@storybook/addon-themes": "^10.2.13",
     "@storybook/csf": "^0.1.13",
-    "@storybook/react-webpack5": "10.2.8",
+    "@storybook/react-webpack5": "10.2.13",
     "@storybook/test-runner": "^0.24.2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
@@ -129,7 +134,7 @@
     "@types/webpack-env": "^1.18.8",
     "@vitejs/plugin-react": "^5.1.4",
     "@vitest/eslint-plugin": "^1.6.9",
-    "acorn": "^8.15.0",
+    "acorn": "^8.16.0",
     "babel-plugin-require-context-hook": "^1.0.0",
     "caniuse-lite": "^1.0.30001770",
     "chai-as-promised": "^8.0.2",
@@ -138,8 +143,9 @@
     "core-js": "^3.48.0",
     "cpy-cli": "^7.0.0",
     "dotenv-cli": "^11.0.0",
-    "eslint": "^10.0.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-formatter-jslint-xml": "^8.40.0",
     "eslint-import-resolver-exports": "^1.0.0-beta.5",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-import-resolver-webpack": "^0.13.10",
@@ -148,10 +154,10 @@
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-storybook": "^10.2.8",
+    "eslint-plugin-storybook": "^10.2.13",
     "eslint-plugin-unicorn": "^63.0.0",
     "events": "^3.3.0",
-    "glob": "^13.0.3",
+    "glob": "^13.0.6",
     "globals": "^17.3.0",
     "html-webpack-plugin": "^5.6.6",
     "http-server": "^14.1.1",
@@ -170,22 +176,23 @@
     "react-dom": "^19.2.4",
     "regenerator-runtime": "^0.14.1",
     "rimraf": "^6.1.3",
-    "rollup": "^4.57.1",
+    "rollup": "^4.59.0",
     "rollup-plugin-clear": "^2.0.7",
     "storage-mock": "^2.1.0",
     "storybook": "10.2.13",
-    "stylelint": "^17.3.0",
+    "stylelint": "^17.4.0",
     "stylelint-config-sass-guidelines": "^13.0.0",
     "svg-inline-loader": "^0.8.2",
     "teamcity-service-messages": "^0.1.14",
     "terser-webpack-plugin": "^5.3.16",
     "typed-css-modules": "^0.9.1",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.55.0",
+    "typescript-eslint": "^8.56.1",
     "vitest": "^4.0.18",
     "vitest-teamcity-reporter": "^0.4.1",
-    "webpack": "^5.105.2",
-    "webpack-cli": "^6.0.1"
+    "webpack": "^5.105.3",
+    "webpack-cli": "^6.0.1",
+    "xmlappend": "^1.0.4"
   },
   "peerDependencies": {
     "@types/react": ">=18.0.0",
@@ -240,7 +247,7 @@
     "postcss-font-family-system-ui": "^5.0.0",
     "postcss-loader": "^8.2.1",
     "postcss-modules-values-replace": "^4.2.2",
-    "postcss-preset-env": "^11.1.3",
+    "postcss-preset-env": "^11.2.0",
     "react-compiler-runtime": "^1.0.0",
     "react-movable": "^3.4.1",
     "react-virtualized": "^9.22.6",