@jetbrains/ring-ui-built 6.0.42 → 6.1.1-beta.0

package/components/_helpers/_rollupPluginBabelHelpers.js

@@ -208,8 +208,8 @@ function _objectWithoutProperties(e, t) {
     r,
     i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
   return i;
 }
@@ -217,7 +217,7 @@ function _objectWithoutPropertiesLoose(r, e) {
   if (null == r) return {};
   var t = {};
   for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.indexOf(n) >= 0) continue;
+    if (e.includes(n)) continue;
     t[n] = r[n];
   }
   return t;

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/content-layout/content-layout.js

@@ -53,7 +53,9 @@ var ContentLayout = /*#__PURE__*/function (_Component) {
       var contentChildren = childrenArray.filter(function (child) {
         return child !== sidebarChild;
       });
-      return /*#__PURE__*/jsxs("div", _objectSpread2(_objectSpread2({}, restProps), {}, {
+      return /*#__PURE__*/jsxs("div", _objectSpread2(_objectSpread2({
+        "data-test": "content-layout"
+      }, restProps), {}, {
         className: classes,
         children: [sidebar, /*#__PURE__*/jsx("main", {
           className: contentClasses,

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

@@ -654,7 +654,7 @@ var QueryAssist = /*#__PURE__*/function (_Component) {
     key: "_pushHistory",
     value: function _pushHistory(state) {
       var _this$historyStack$;
-      var queryIsSet = ('query' in state);
+      var queryIsSet = 'query' in state;
       var queryIsSame = ((_this$historyStack$ = this.historyStack[0]) === null || _this$historyStack$ === void 0 ? void 0 : _this$historyStack$.query) === state.query;
       if (queryIsSet && !queryIsSame) {
         var _this$caret$getPositi, _this$caret9;

package/components/select/select.js

@@ -982,12 +982,16 @@ var Select = /*#__PURE__*/function (_Component) {
         [modules_9d0de074["size".concat(this.props.size)]]: this.props.type !== Type.INLINE,
         [modules_9d0de074.disabled]: this.props.disabled
       });
-      var icons = this._getIcons();
-      var style = getStyle(icons.length);
-      var iconsNode = /*#__PURE__*/jsx("div", {
-        className: modules_9d0de074.icons,
-        children: icons
-      });
+      var style;
+      var iconsNode;
+      if (this.props.type === Type.INPUT || this.props.type === Type.BUTTON) {
+        var icons = this._getIcons();
+        style = getStyle(icons.length);
+        iconsNode = /*#__PURE__*/jsx("div", {
+          className: modules_9d0de074.icons,
+          children: icons
+        });
+      }
       var ariaProps = this.state.showPopup ? {
         'aria-owns': this.listId,
         'aria-activedescendant': activeItemId,
@@ -1029,7 +1033,7 @@ var Select = /*#__PURE__*/function (_Component) {
                 "data-test": "ring-select__focus",
                 enableShortcuts: shortcutsEnabled ? Object.keys(_objectSpread2(_objectSpread2({}, this.getShortcutsMap()), (_this$_popup5 = this._popup) === null || _this$_popup5 === void 0 || (_this$_popup5 = _this$_popup5.list) === null || _this$_popup5 === void 0 ? void 0 : _this$_popup5.shortcutsMap)) : undefined,
                 icon: this.props.filterIcon,
-                afterInput: this.props.type === Type.INPUT && iconsNode
+                afterInput: iconsNode
               })), this._renderPopup()]
             }), this.props.error && /*#__PURE__*/jsx("div", {
               className: classNames(modules_88cfaf40.errorText, modules_88cfaf40["size".concat(this.props.size)]),

package/components/shortcuts/core.js

@@ -51,8 +51,10 @@ var Shortcuts = /*#__PURE__*/function () {
       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)) {
         return false;
       }
-      // stop for input, select, and textarea
-      return element.matches('input:not([type=checkbox]),select,textarea') || element.contentEditable === 'true';
+      var elementContentEditableAttribute = element.contentEditable;
+      var isElementContentEditable = elementContentEditableAttribute === 'true' || elementContentEditableAttribute === 'plaintext-only';
+      // stop for input, select, textarea and content-editable elements
+      return element.matches('input:not([type=checkbox]),select,textarea') || isElementContentEditable;
     });
     this.setFilter();
     this.setScope();

package/package.json

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