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

package/components/_helpers/theme.js

@@ -112,4 +112,4 @@ var ThemeProvider = /*#__PURE__*/forwardRef(function ThemeProvider(_ref2, ref) {
 });
 var Theme$1 = Theme;
 
-export { Theme$1 as T, WithThemeClasses as W, ThemeProvider as a, ThemeContext as b, useThemeClasses as c, applyTheme as d, modules_59717246 as m, useTheme as u };
+export { GLOBAL_DARK_CLASS_NAME as G, Theme$1 as T, WithThemeClasses as W, ThemeProvider as a, ThemeContext as b, useThemeClasses as c, applyTheme as d, modules_59717246 as m, useTheme as u };

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

@@ -137,7 +137,7 @@ var Auth = /*#__PURE__*/function () {
     _defineProperty(this, "listeners", new Listeners());
     _defineProperty(this, "http", void 0);
     _defineProperty(this, "_service", {});
-    _defineProperty(this, "_storage", null);
+    _defineProperty(this, "_storage", void 0);
     _defineProperty(this, "_responseParser", new AuthResponseParser());
     _defineProperty(this, "_requestBuilder", null);
     _defineProperty(this, "_backgroundFlow", void 0);
@@ -1402,22 +1402,23 @@ var Auth = /*#__PURE__*/function () {
     value: function _makeStateFromResponse(authResponse) {
       var state = authResponse.state;
       if (!state) {
-        return {};
+        throw new Error('No state in AuthResponse');
       }
       var defaultScope = this.config.scope;
+      var urlFromState = null;
       try {
-        var 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
-        };
-      } catch (e) {
-        return {};
+        urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
+      } catch (_unused2) {
+        return null;
       }
+      if (urlFromState.origin !== window.location.origin) {
+        throw new Error("State contains URL with different origin: \"".concat(state, "\""));
+      }
+      return {
+        restoreLocation: state,
+        created: Date.now(),
+        scopes: defaultScope
+      };
     }
     /**
      * Check if the hash contains an access token.
@@ -1431,8 +1432,7 @@ var Auth = /*#__PURE__*/function () {
     key: "_checkForAuthResponse",
     value: (function () {
       var _checkForAuthResponse2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _this$_storage12;
-        var authResponse, _this$config4, defaultScope, defaultExpiresIn, cleanHash, stateId, scope, expiresIn, accessToken, newState, scopes, effectiveExpiresIn, expires, _this$_storage13;
+        var authResponse, _this$config4, defaultScope, defaultExpiresIn, cleanHash, stateId, scope, expiresIn, accessToken, newState, scopes, effectiveExpiresIn, expires, _this$_storage12;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1449,34 +1449,42 @@ var Auth = /*#__PURE__*/function () {
               return _context20.abrupt("return", undefined);
             case 5:
               stateId = authResponse.state, scope = authResponse.scope, expiresIn = authResponse.expiresIn, accessToken = authResponse.accessToken;
-              _context20.next = 8;
-              return stateId && ((_this$_storage12 = this._storage) === null || _this$_storage12 === void 0 ? void 0 : _this$_storage12.getState(stateId));
-            case 8:
-              _context20.t0 = _context20.sent;
-              if (_context20.t0) {
-                _context20.next = 11;
+              newState = null;
+              if (!stateId) {
+                _context20.next = 12;
                 break;
               }
-              _context20.t0 = this._makeStateFromResponse(authResponse);
-            case 11:
-              newState = _context20.t0;
+              _context20.next = 10;
+              return this._storage.getState(stateId);
+            case 10:
+              newState = _context20.sent;
+              if (!newState) {
+                newState = this._makeStateFromResponse(authResponse);
+              }
+            case 12:
+              if (newState) {
+                _context20.next = 14;
+                break;
+              }
+              throw new Error("Could not create state where stateId=\"".concat(stateId, "\""));
+            case 14:
               scopes = scope ? scope.split(' ') : newState.scopes || defaultScope || [];
               effectiveExpiresIn = expiresIn ? parseInt(expiresIn, 10) : defaultExpiresIn;
               expires = TokenValidator._epoch() + effectiveExpiresIn;
               if (!(accessToken != null)) {
-                _context20.next = 18;
+                _context20.next = 20;
                 break;
               }
-              _context20.next = 18;
-              return (_this$_storage13 = this._storage) === null || _this$_storage13 === void 0 ? void 0 : _this$_storage13.saveToken({
+              _context20.next = 20;
+              return (_this$_storage12 = this._storage) === null || _this$_storage12 === void 0 ? void 0 : _this$_storage12.saveToken({
                 accessToken,
                 scopes,
                 expires,
                 lifeTime: effectiveExpiresIn
               });
-            case 18:
+            case 20:
               return _context20.abrupt("return", newState);
-            case 19:
+            case 21:
             case "end":
               return _context20.stop();
           }
@@ -1491,7 +1499,7 @@ var Auth = /*#__PURE__*/function () {
     key: "_checkForStateRestoration",
     value: function () {
       var _checkForStateRestoration2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$_storage14;
+        var _this$_storage13;
         var authResponse, stateId;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
@@ -1502,7 +1510,7 @@ var Auth = /*#__PURE__*/function () {
               }
               stateId = authResponse === null || authResponse === void 0 ? void 0 : authResponse.restoreAuthState;
               _context21.next = 5;
-              return stateId && ((_this$_storage14 = this._storage) === null || _this$_storage14 === void 0 ? void 0 : _this$_storage14.getState(stateId));
+              return stateId && ((_this$_storage13 = this._storage) === null || _this$_storage13 === void 0 ? void 0 : _this$_storage13.getState(stateId));
             case 5:
               _context21.t0 = _context21.sent;
               if (_context21.t0) {

package/components/badge/badge.js

@@ -2,7 +2,6 @@ import { _ as _defineProperty, a as _inherits, b as _createClass, c as _objectWi
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import deprecate from 'util-deprecate';
 import joinDataTestAttributes from '../global/data-tests.js';
 import { m as modules_6c9187df } from '../_helpers/badge.js';
 import { jsx } from 'react/jsx-runtime';
@@ -12,11 +11,6 @@ import 'core-js/modules/es.object.entries.js';
 import 'core-js/modules/es.object.to-string.js';
 
 var _excluded = ["gray", "valid", "invalid", "disabled", "className", "children", "data-test"];
-var warn = deprecate(function () {}, 'Badge is deprecated and will be removed in RingUI 7.0. Use Tag instead.');
-/**
- * @name Badge
- */
-// TODO remove in 7.0
 var Badge = /*#__PURE__*/function (_PureComponent) {
   function Badge() {
     _classCallCheck(this, Badge);
@@ -26,7 +20,6 @@ var Badge = /*#__PURE__*/function (_PureComponent) {
   return _createClass(Badge, [{
     key: "render",
     value: function render() {
-      warn();
       var _this$props = this.props,
         gray = _this$props.gray,
         valid = _this$props.valid,

package/components/data-list/data-list.mock.js

@@ -12,7 +12,6 @@ import 'core-js/modules/es.object.entries.js';
 import 'core-js/modules/es.object.to-string.js';
 import '../link/clickableLink.js';
 import '../_helpers/link.js';
-import 'util-deprecate';
 import '../_helpers/badge.js';
 
 var items = [{

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

@@ -4,7 +4,7 @@ import 'classnames';
 import 'react-dom';
 import '../popup/popup.target.js';
 import '../popup/popup.js';
-export { b as ThemeContext, a as ThemeProvider, W as WithThemeClasses, d as applyTheme, T as default, u as useTheme, c as useThemeClasses } from '../_helpers/theme.js';
+export { G as GLOBAL_DARK_CLASS_NAME, b as ThemeContext, a as ThemeProvider, W as WithThemeClasses, d as applyTheme, T as default, u as useTheme, c as useThemeClasses } from '../_helpers/theme.js';
 import './get-uid.js';
 import 'react/jsx-runtime';
 import 'prop-types';

package/components/shortcuts/core.js

@@ -48,7 +48,7 @@ var Shortcuts = /*#__PURE__*/function () {
     });
     _defineProperty(this, "_defaultFilter", function (e, element, key) {
       // if the element or its parents have the class "ring-js-shortcuts" then no need to stop
-      if (element === document || !(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)) {
+      if (element === document || !(element instanceof HTMLElement) || key == null || element.matches(_this.ALLOW_SHORTCUTS_SELECTOR) || element.closest(_this.ALLOW_SHORTCUTS_SELECTOR) != null || element.dataset.enabledShortcuts != null && element.dataset.enabledShortcuts.split(',').includes(key)) {
         return false;
       }
       var elementContentEditableAttribute = element.contentEditable;

package/package.json

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