@jetbrains/ring-ui 6.0.52 → 6.0.54-beta.0

package/components/auth/auth__core.d.ts

@@ -129,7 +129,7 @@ export default class Auth implements HTTPAuth {
     listeners: Listeners<AuthPayloadMap>;
     http: HTTP;
     private _service;
-    readonly _storage: AuthStorage<number> | null;
+    readonly _storage: AuthStorage<number>;
     private _responseParser;
     private readonly _requestBuilder;
     _backgroundFlow: BackgroundFlow | null;
@@ -174,7 +174,7 @@ export default class Auth implements HTTPAuth {
     /**
      * @return {Promise.<object>}
      */
-    getUser(accessToken?: string | null | undefined): Promise<any> | undefined;
+    getUser(accessToken?: string | null | undefined): Promise<any>;
     /**
      * @return {Promise.<object>}
      */
@@ -197,7 +197,7 @@ export default class Auth implements HTTPAuth {
      */
     login(): Promise<void>;
     switchUser(): Promise<void>;
-    _makeStateFromResponse(authResponse: AuthResponse): AuthState;
+    _makeStateFromResponse(authResponse: AuthResponse): AuthState | null;
     /**
      * Check if the hash contains an access token.
      * If it does, extract the state, compare with

package/components/auth/auth__core.js

@@ -58,7 +58,7 @@ export default class Auth {
     listeners = new Listeners();
     http;
     _service = {};
-    _storage = null;
+    _storage;
     _responseParser = new AuthResponseParser();
     _requestBuilder = null;
     _backgroundFlow;
@@ -694,23 +694,24 @@ export default class Auth {
     _makeStateFromResponse(authResponse) {
         const { state } = authResponse;
         if (!state) {
-            return {};
+            throw new Error('No state in AuthResponse');
         }
         const { scope: defaultScope } = this.config;
+        let urlFromState = null;
         try {
-            const urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
-            if (urlFromState.origin !== window.location.origin) {
-                return {};
-            }
-            return {
-                restoreLocation: state,
-                created: Date.now(),
-                scopes: defaultScope
-            };
+            urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
         }
-        catch (e) {
-            return {};
+        catch {
+            return null;
+        }
+        if (urlFromState.origin !== window.location.origin) {
+            throw new Error(`State contains URL with different origin: "${state}"`);
         }
+        return {
+            restoreLocation: state,
+            created: Date.now(),
+            scopes: defaultScope
+        };
     }
     /**
      * Check if the hash contains an access token.
@@ -731,8 +732,16 @@ export default class Auth {
             return undefined;
         }
         const { state: stateId, scope, expiresIn, accessToken } = authResponse;
-        const newState = await (stateId && this._storage?.getState(stateId)) ||
-            this._makeStateFromResponse(authResponse);
+        let newState = null;
+        if (stateId) {
+            newState = await this._storage.getState(stateId);
+            if (!newState) {
+                newState = this._makeStateFromResponse(authResponse);
+            }
+        }
+        if (!newState) {
+            throw new Error(`Could not create state where stateId="${stateId}"`);
+        }
         const scopes = scope ? scope.split(' ') : newState.scopes || defaultScope || [];
         const effectiveExpiresIn = expiresIn ? parseInt(expiresIn, 10) : defaultExpiresIn;
         const expires = TokenValidator._epoch() + effectiveExpiresIn;

package/components/badge/badge.js

@@ -1,10 +1,8 @@
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import deprecate from 'util-deprecate';
 import dataTests from '../global/data-tests';
 import style from './badge.css';
-const warn = deprecate(() => { }, 'Badge is deprecated and will be removed in RingUI 7.0. Use Tag instead.');
 /**
  * @name Badge
  */
@@ -20,7 +18,6 @@ export default class Badge extends PureComponent {
         'data-test': PropTypes.string
     };
     render() {
-        warn();
         const { 
         // Modifiers
         gray, valid, invalid, disabled, 

package/components/global/theme.d.ts

@@ -7,6 +7,7 @@ declare enum Theme {
 export declare const ThemeContext: import("react").Context<{
     theme: Theme.LIGHT | Theme.DARK;
 }>;
+export declare const GLOBAL_DARK_CLASS_NAME = "ring-ui-theme-dark";
 export declare function useTheme(): Theme.LIGHT | Theme.DARK;
 export declare function useThemeClasses(theme: Theme): string;
 export interface WithThemeClassesProps {

package/components/global/theme.js

@@ -13,7 +13,7 @@ var Theme;
     Theme["DARK"] = "dark";
 })(Theme || (Theme = {}));
 export const ThemeContext = createContext({ theme: Theme.LIGHT });
-const GLOBAL_DARK_CLASS_NAME = 'ring-ui-theme-dark';
+export const GLOBAL_DARK_CLASS_NAME = 'ring-ui-theme-dark';
 const darkMatcher = window.matchMedia('(prefers-color-scheme: dark)');
 export function useTheme() {
     const [dark, setDark] = useState(darkMatcher.matches);

package/components/shortcuts/core.js

@@ -156,9 +156,9 @@ class Shortcuts {
             !(element instanceof HTMLElement) ||
             key == null ||
             element.matches(this.ALLOW_SHORTCUTS_SELECTOR) ||
-            (element.dataset.enabledShortcuts != null
-                ? element.dataset.enabledShortcuts.split(',').includes(key)
-                : element.closest(this.ALLOW_SHORTCUTS_SELECTOR) != null)) {
+            element.closest(this.ALLOW_SHORTCUTS_SELECTOR) != null ||
+            (element.dataset.enabledShortcuts != null &&
+                element.dataset.enabledShortcuts.split(',').includes(key))) {
             return false;
         }
         const elementContentEditableAttribute = element.contentEditable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "6.0.52",
+  "version": "6.0.54-beta.0",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",