@jetbrains/ring-ui 7.0.95 → 7.0.97

package/components/auth/auth-core.d.ts

@@ -8,6 +8,7 @@ import TokenValidator, { type TokenValidationError, type TokenValidatorConfig }
 import type AuthDialogService from '../auth-dialog-service/auth-dialog-service';
 export declare const DEFAULT_EXPIRES_TIMEOUT: number;
 export declare const DEFAULT_BACKGROUND_TIMEOUT: number;
+export declare const TOKEN_REFRESH_RETRY_DELAYS: number[];
 export declare const USER_CHANGED_EVENT = "userChange";
 export declare const DOMAIN_USER_CHANGED_EVENT = "domainUser";
 export declare const LOGOUT_EVENT = "logout";
@@ -80,6 +81,7 @@ export interface AuthConfig extends TokenValidatorConfig {
     translations?: AuthTranslations | null | undefined;
     userParams?: RequestParams | undefined;
     waitForRedirectTimeout: number;
+    tokenRefreshRetryDelays: readonly number[];
     rpInitiatedLogout: boolean;
 }
 type AuthPayloadMap = {
@@ -139,6 +141,7 @@ declare class Auth implements HTTPAuth {
     _tokenValidator: TokenValidator | null;
     private _postponed;
     private _backendCheckPromise;
+    private _forceTokenUpdatePromise;
     private _authDialogService;
     _domainStorage: AuthStorage<UserChange>;
     user: AuthUser | null;
@@ -168,9 +171,18 @@ declare class Auth implements HTTPAuth {
     requestToken(): Promise<string | null>;
     /**
      * Get new token in the background or redirect to the login page.
-     * @return {Promise.<string>}
+     *
+     * Retries background token refresh with delays from {@link AuthConfig.tokenRefreshRetryDelays}
+     * with increasing delays before showing the auth dialog.
+     * This handles transient failures that commonly occur after network
+     * recovery (e.g. waking from sleep, switching networks) where the first
+     * iframe-based auth attempt fails but a subsequent one succeeds once
+     * the Hub session is re-established.
+     *
+     * @return {Promise.<string | null>}
      */
     forceTokenUpdate(): Promise<string | null>;
+    private _doForceTokenUpdate;
     loadCurrentService(): Promise<void>;
     getAPIPath(): string;
     /**

package/components/auth/auth-core.js

@@ -15,6 +15,7 @@ export const DEFAULT_BACKGROUND_TIMEOUT = 10 * 1000;
 const DEFAULT_BACKEND_CHECK_TIMEOUT = 10 * 1000;
 const BACKGROUND_REDIRECT_TIMEOUT = 20 * 1000;
 const DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT = 5 * 1000;
+export const TOKEN_REFRESH_RETRY_DELAYS = [0, 2000, 5000];
 export const USER_CHANGED_EVENT = 'userChange';
 export const DOMAIN_USER_CHANGED_EVENT = 'domainUser';
 export const LOGOUT_EVENT = 'logout';
@@ -43,6 +44,7 @@ const DEFAULT_CONFIG = {
     onBackendDown: () => () => { },
     defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
     waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
+    tokenRefreshRetryDelays: TOKEN_REFRESH_RETRY_DELAYS,
     rpInitiatedLogout: true,
     translations: null,
 };
@@ -68,6 +70,7 @@ class Auth {
     _tokenValidator = null;
     _postponed = false;
     _backendCheckPromise = null;
+    _forceTokenUpdatePromise = null;
     _authDialogService = undefined;
     _domainStorage;
     user = null;
@@ -208,6 +211,8 @@ class Auth {
                         throw error;
                     }
                     if (this._canShowDialogs()) {
+                        // eslint-disable-next-line no-console
+                        console.error('RingUI Auth: Init failure', error);
                         this._showAuthDialog({ nonInteractive: true, error });
                     }
                 }
@@ -221,7 +226,7 @@ class Auth {
             if (this.user && userID === this.user.id) {
                 return;
             }
-            this.forceTokenUpdate();
+            this.forceTokenUpdate().catch(noop);
         });
         let state;
         try {
@@ -243,7 +248,7 @@ class Auth {
             if (message) {
                 const { userID, serviceID } = message;
                 if (serviceID !== this.config.clientId && (!userID || this.user?.id !== userID)) {
-                    this.forceTokenUpdate();
+                    this.forceTokenUpdate().catch(noop);
                 }
             }
             // Access token appears to be valid.
@@ -341,9 +346,26 @@ class Auth {
     }
     /**
      * Get new token in the background or redirect to the login page.
-     * @return {Promise.<string>}
+     *
+     * Retries background token refresh with delays from {@link AuthConfig.tokenRefreshRetryDelays}
+     * with increasing delays before showing the auth dialog.
+     * This handles transient failures that commonly occur after network
+     * recovery (e.g. waking from sleep, switching networks) where the first
+     * iframe-based auth attempt fails but a subsequent one succeeds once
+     * the Hub session is re-established.
+     *
+     * @return {Promise.<string | null>}
      */
-    async forceTokenUpdate() {
+    forceTokenUpdate() {
+        if (this._forceTokenUpdatePromise) {
+            return this._forceTokenUpdatePromise;
+        }
+        this._forceTokenUpdatePromise = this._doForceTokenUpdate().finally(() => {
+            this._forceTokenUpdatePromise = null;
+        });
+        return this._forceTokenUpdatePromise;
+    }
+    async _doForceTokenUpdate() {
         try {
             if (!this._backendCheckPromise) {
                 this._backendCheckPromise = this._checkBackendsStatusesIfEnabled();
@@ -351,49 +373,53 @@ 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;
         }
-        try {
-            return (await this._backgroundFlow?.authorize()) ?? null;
-        }
-        catch (error) {
-            if (!(error instanceof Error)) {
-                return null;
+        let lastError = null;
+        for (const delay of this.config.tokenRefreshRetryDelays) {
+            if (delay > 0) {
+                await new Promise(resolve => setTimeout(resolve, delay));
             }
-            if (this._canShowDialogs()) {
-                return new Promise(resolve => {
-                    const onTryAgain = async () => {
-                        try {
-                            const result = await this._backgroundFlow?.authorize();
-                            resolve(result ?? null);
-                        }
-                        catch (retryError) {
-                            if (retryError instanceof Error) {
-                                this._showAuthDialog({
-                                    nonInteractive: true,
-                                    error: retryError,
-                                    onTryAgain,
-                                });
-                            }
-                            throw retryError;
-                        }
-                    };
-                    this._showAuthDialog({
-                        nonInteractive: true,
-                        error: error,
-                        onTryAgain,
-                    });
-                });
+            try {
+                return (await this._backgroundFlow?.authorize()) ?? null;
             }
-            const authRequest = await this._requestBuilder?.prepareAuthRequest();
-            if (authRequest) {
-                this._redirectCurrentPage(authRequest.url);
+            catch (error) {
+                lastError = error instanceof Error ? error : new Error(String(error));
             }
-            throw new TokenValidator.TokenValidationError(error.message);
         }
+        if (this._canShowDialogs()) {
+            return new Promise(resolve => {
+                const onTryAgain = async () => {
+                    try {
+                        const result = await this._backgroundFlow?.authorize();
+                        resolve(result ?? null);
+                    }
+                    catch (retryError) {
+                        if (retryError instanceof Error) {
+                            this._showAuthDialog({
+                                nonInteractive: true,
+                                error: retryError,
+                                onTryAgain,
+                            });
+                        }
+                        throw retryError;
+                    }
+                };
+                this._showAuthDialog({
+                    nonInteractive: true,
+                    error: lastError,
+                    onTryAgain,
+                });
+            });
+        }
+        const authRequest = await this._requestBuilder?.prepareAuthRequest();
+        if (authRequest) {
+            this._redirectCurrentPage(authRequest.url);
+        }
+        throw new TokenValidator.TokenValidationError(lastError?.message ?? 'Failed to refresh token');
     }
     async loadCurrentService() {
         if (this._service.serviceName) {
@@ -471,7 +497,10 @@ class Auth {
     }
     _beforeLogout(params) {
         if (this._canShowDialogs()) {
-            this._showAuthDialog(params);
+            const onTryAgain = async () => {
+                await this.forceTokenUpdate();
+            };
+            this._showAuthDialog({ onTryAgain, ...params });
             return;
         }
         this.logout();
@@ -507,7 +536,7 @@ class Auth {
                 return;
             }
             if (this.user?.guest && nonInteractive) {
-                this.forceTokenUpdate();
+                this.forceTokenUpdate().catch(noop);
             }
             else {
                 this._initDeferred?.resolve?.();
@@ -688,6 +717,8 @@ class Auth {
             }
         }
         catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('RingUI Auth: login failure', e);
             this._beforeLogout();
         }
     }
@@ -703,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;
@@ -109,7 +108,7 @@ export default class List<T = unknown> extends Component<ListProps<T>, ListState
     };
     componentDidMount(): void;
     shouldComponentUpdate(nextProps: ListProps<T>, nextState: ListState<T>): boolean;
-    componentDidUpdate(prevProps: ListProps<T>): void;
+    componentDidUpdate(prevProps: ListProps<T>, prevState: ListState<T>): void;
     componentWillUnmount(): void;
     scheduleScrollListener: (cb: () => void) => void;
     static isItemType: typeof isItemType;

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) {
@@ -126,14 +124,25 @@ export default class List extends Component {
         return (Object.keys(nextProps).some(key => !Object.is(nextProps[key], this.props[key])) ||
             Object.keys(nextState).some(key => nextState[key] !== this.state[key]));
     }
-    componentDidUpdate(prevProps) {
+    componentDidUpdate(prevProps, prevState) {
         if (this.virtualizedList && prevProps.data !== this.props.data) {
             this.virtualizedList.recomputeRowHeights();
         }
         const { activeIndex } = this.state;
-        const isActiveItemRetainedPosition = activeIndex
-            ? prevProps.data[activeIndex]?.key === this.props.data[activeIndex]?.key
-            : false;
+        if (!this.props.disableScrollToActive && activeIndex != null && activeIndex !== prevState.activeIndex) {
+            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',
+                    });
+                }
+            }
+        }
+        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) &&
@@ -196,7 +205,6 @@ export default class List extends Component {
             this.setState({
                 activeIndex: firstActivatableIndex,
                 activeItem: this.props.data[firstActivatableIndex],
-                needScrollToActive: true,
             });
         }
     };
@@ -271,7 +279,6 @@ export default class List extends Component {
         this.setState({
             activeIndex: correctedIndex,
             activeItem: item,
-            needScrollToActive: true,
         }, function onSet() {
             if (!isActivatable(item)) {
                 retryCallback(e);
@@ -463,12 +470,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.95",
+  "version": "7.0.97",
   "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/js": "^9.39.2",
-    "@figma/code-connect": "^1.3.13",
+    "@eslint/eslintrc": "^3.3.4",
+    "@eslint/js": "^10.0.1",
+    "@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",
@@ -128,10 +133,10 @@
     "@types/react-dom": "^19.2.3",
     "@types/webpack-env": "^1.18.8",
     "@vitejs/plugin-react": "^5.1.4",
-    "@vitest/eslint-plugin": "^1.6.7",
-    "acorn": "^8.15.0",
+    "@vitest/eslint-plugin": "^1.6.9",
+    "acorn": "^8.16.0",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "caniuse-lite": "^1.0.30001769",
+    "caniuse-lite": "^1.0.30001770",
     "chai-as-promised": "^8.0.2",
     "chai-dom": "^1.12.1",
     "cheerio": "^1.2.0",
@@ -140,6 +145,7 @@
     "dotenv-cli": "^11.0.0",
     "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-unicorn": "^62.0.0",
+    "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",
@@ -169,23 +175,24 @@
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "regenerator-runtime": "^0.14.1",
-    "rimraf": "^6.1.2",
-    "rollup": "^4.57.1",
+    "rimraf": "^6.1.3",
+    "rollup": "^4.59.0",
     "rollup-plugin-clear": "^2.0.7",
     "storage-mock": "^2.1.0",
-    "storybook": "10.2.8",
-    "stylelint": "^17.3.0",
-    "stylelint-config-sass-guidelines": "^12.1.0",
+    "storybook": "10.2.13",
+    "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",
@@ -223,7 +230,7 @@
     "change-case": "^4.1.1",
     "classnames": "^2.5.1",
     "combokeys": "^3.0.1",
-    "css-loader": "^7.1.3",
+    "css-loader": "^7.1.4",
     "csstype": "^3.2.1",
     "date-fns": "^4.1.0",
     "dequal": "^2.0.3",
@@ -238,9 +245,9 @@
     "postcss-calc": "^10.1.1",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-font-family-system-ui": "^5.0.0",
-    "postcss-loader": "^8.2.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",