@jetbrains/ring-ui 5.0.84 → 5.0.86

package/components/date-picker/date-picker.js

@@ -199,20 +199,15 @@ export default class DatePicker extends PureComponent {
         {this.getAnchorText()}
         <Icon glyph={chevronDownIcon} className={styles.chevronDownIcon}/>
       </div>);
-        if (this.props.disabled) {
-            return (<Button data-test-ring-dropdown-anchor className={styles.anchor} disabled text={false}>
-          {anchorContent}
-        </Button>);
-        }
         const { className, popupClassName, clear, inline, dropdownProps, translations, ...datePopupProps } = this.props;
         const classes = classNames(styles.datePicker, className, styles[`size${this.props.size}`], {
             [styles.inline]: inline
         });
-        return (<Dropdown className={classes} anchor={inline
-                ? (<Link data-test-ring-dropdown-anchor className={styles.anchor} pseudo>
+        return (<Dropdown className={classes} disabled={this.props.disabled} anchor={inline
+                ? (<Link data-test-ring-dropdown-anchor className={styles.anchor} disabled={this.props.disabled ?? false} pseudo>
                 {this.getAnchorText()}
               </Link>)
-                : (<Button data-test-ring-dropdown-anchor className={styles.anchor} text={false}>
+                : (<Button data-test-ring-dropdown-anchor className={styles.anchor} text={false} disabled={this.props.disabled ?? false}>
                 {anchorContent}
               </Button>)} {...dropdownProps}>
         <PopupComponent className={popupClassName} popupRef={this.popupRef} onClear={clear ? this.clear : null} datePopupProps={{

package/components/dropdown/dropdown.d.ts

@@ -10,6 +10,7 @@ export interface DropdownProps extends Omit<HTMLAttributes<HTMLElement>, 'childr
     anchor: ReactElement | readonly ReactElement[] | string | ((props: AnchorProps) => ReactNode);
     children: ReactElement<PopupAttrs> | ((props: Omit<PopupAttrs, 'children'>) => ReactNode);
     initShown: boolean;
+    disabled?: boolean | null | undefined;
     clickMode: boolean;
     hoverMode: boolean;
     hoverShowTimeOut: number;
@@ -41,6 +42,7 @@ export default class Dropdown extends Component<DropdownProps, DropdownState> {
         hoverMode: PropTypes.Requireable<boolean>;
         hoverShowTimeOut: PropTypes.Requireable<number>;
         hoverHideTimeOut: PropTypes.Requireable<number>;
+        disabled: PropTypes.Requireable<boolean>;
         onShow: PropTypes.Requireable<(...args: any[]) => any>;
         onHide: PropTypes.Requireable<(...args: any[]) => any>;
         onMouseEnter: PropTypes.Requireable<(...args: any[]) => any>;
@@ -53,6 +55,7 @@ export default class Dropdown extends Component<DropdownProps, DropdownState> {
         hoverMode: boolean;
         hoverShowTimeOut: number;
         hoverHideTimeOut: number;
+        disabled: boolean;
         onShow: () => void;
         onHide: () => void;
         onMouseEnter: () => void;

package/components/dropdown/dropdown.js

@@ -23,6 +23,7 @@ export default class Dropdown extends Component {
         hoverMode: PropTypes.bool,
         hoverShowTimeOut: PropTypes.number,
         hoverHideTimeOut: PropTypes.number,
+        disabled: PropTypes.bool,
         onShow: PropTypes.func,
         onHide: PropTypes.func,
         onMouseEnter: PropTypes.func,
@@ -35,6 +36,7 @@ export default class Dropdown extends Component {
         hoverMode: false,
         hoverShowTimeOut: 300,
         hoverHideTimeOut: 600,
+        disabled: false,
         onShow: () => { },
         onHide: () => { },
         onMouseEnter: () => { },
@@ -45,6 +47,9 @@ export default class Dropdown extends Component {
         pinned: false
     };
     onClick = () => {
+        if (this.props.disabled) {
+            return;
+        }
         const { show, pinned } = this.state;
         let nextPinned = pinned;
         if (this.props.hoverMode) {
@@ -70,6 +75,9 @@ export default class Dropdown extends Component {
     };
     hoverTimer;
     onMouseEnter = (event) => {
+        if (this.props.disabled) {
+            return;
+        }
         this._clearTimer();
         this.props.onMouseEnter?.(event);
         this.hoverTimer = window.setTimeout(() => {
@@ -79,6 +87,9 @@ export default class Dropdown extends Component {
         }, this.props.hoverShowTimeOut);
     };
     onMouseLeave = (event) => {
+        if (this.props.disabled) {
+            return;
+        }
         this.props.onMouseLeave?.(event);
         if (this.state.pinned) {
             return;
@@ -107,7 +118,7 @@ export default class Dropdown extends Component {
     }
     render() {
         const { show, pinned } = this.state;
-        const { initShown, onShow, onHide, hoverShowTimeOut, hoverHideTimeOut, children, anchor, className, activeClassName, hoverMode, clickMode, 'data-test': dataTest, ...restProps } = this.props;
+        const { initShown, onShow, onHide, hoverShowTimeOut, hoverHideTimeOut, children, anchor, className, activeClassName, hoverMode, clickMode, 'data-test': dataTest, disabled, ...restProps } = this.props;
         const classes = classNames(styles.dropdown, className, {
             [activeClassName ?? '']: activeClassName != null && show
         });

package/components/global/get-uid.js

@@ -1,7 +1,7 @@
 const idCounters = {};
 function generateSalt() {
     // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-    return (Number(new Date()) * Math.random()).toString(36).substring(0, 4);
+    return (Date.now() * Math.random()).toString(36).substring(0, 4);
 }
 const salt = generateSalt();
 export default function getUID(name) {

package/components/radio/radio.css

@@ -6,7 +6,10 @@
 .radio {
   position: relative;
 
-  display: block;
+  display: flex;
+  flex-direction: row;
+
+  padding: 6px 0;
 
   text-align: left;
 
@@ -22,9 +25,9 @@
 
 .circle {
   position: relative;
-  top: -2px;
+  top: 2px;
 
-  display: inline-block;
+  flex-shrink: 0;
 
   box-sizing: border-box;
   width: radio-size;
@@ -32,7 +35,6 @@
 
   user-select: none;
   transition: border-color var(--ring-ease), box-shadow var(--ring-ease);
-  vertical-align: middle;
   pointer-events: none;
 
   border: 1px solid var(--ring-borders-color);
@@ -119,5 +121,5 @@
 .label {
   margin-left: unit;
 
-  line-height: calc(unit * 4);
+  line-height: var(--ring-line-height);
 }

package/components/shortcuts/core.js

@@ -162,7 +162,7 @@ class Shortcuts {
             return false;
         }
         // stop for input, select, and textarea
-        return element.matches('input,select,textarea') || (element.contentEditable === 'true');
+        return element.matches('input:not([type=checkbox]),select,textarea') || (element.contentEditable === 'true');
     };
     _getKeyboardEventType(params) {
         if (!params.type && sniffr.os.name === 'windows') {

package/dist/analytics/analytics__custom-plugin.js

@@ -60,9 +60,8 @@ class AnalyticsCustomPlugin {
   }
   _initSendSchedule() {
     window.addEventListener('beforeunload', () => {
-      var _this$_flush;
       this._trackPageViewAdditionalInfo();
-      return (_this$_flush = this._flush) === null || _this$_flush === void 0 ? void 0 : _this$_flush.call(this);
+      return this._flush?.();
     });
     if (this._flush != null) {
       setInterval(this._flush, this._flushInterval);
@@ -98,8 +97,7 @@ class AnalyticsCustomPlugin {
   _addDataToFlushingPack(sendingData) {
     this._data.push(sendingData);
     if (this._flushMaxPackSize != null && this._data.length >= this._flushMaxPackSize) {
-      var _this$_flush2;
-      (_this$_flush2 = this._flush) === null || _this$_flush2 === void 0 ? void 0 : _this$_flush2.call(this);
+      this._flush?.();
     }
   }
   get serializeAdditionalInfo() {

package/dist/analytics/analytics__fus-plugin.js

@@ -17,7 +17,6 @@ import 'sniffr';
  */
 class AnalyticsFUSPlugin {
   constructor(_ref) {
-    var _window$fusra, _window;
     let {
       productId,
       productBuild,
@@ -32,7 +31,6 @@ class AnalyticsFUSPlugin {
       return;
     }
     ((i, s, o, g, r) => {
-      var _firstScript$parentNo;
       i[r] = i[r] || function addArgumentsToQueueForWaitingTheScriptLoading() {
         const fn = i[r];
         if (fn != null) {
@@ -46,9 +44,9 @@ class AnalyticsFUSPlugin {
       script.async = true;
       script.src = g;
       const firstScript = document.getElementsByTagName(o)[0];
-      (_firstScript$parentNo = firstScript.parentNode) === null || _firstScript$parentNo === void 0 ? void 0 : _firstScript$parentNo.insertBefore(script, firstScript);
+      firstScript.parentNode?.insertBefore(script, firstScript);
     })(window, document, 'script', '//resources.jetbrains.com/storage/fus/api/fus-reporting-api.js', 'fusra');
-    (_window$fusra = (_window = window).fusra) === null || _window$fusra === void 0 ? void 0 : _window$fusra.call(_window, 'init', {
+    window.fusra?.('init', {
       recorderCode: productId,
       recorderVersion,
       productCode: productId,

package/dist/analytics/analytics__ga-plugin.js

@@ -9,7 +9,6 @@ class AnalyticsGAPlugin {
       return;
     }
     ((i, s, o, g, r) => {
-      var _m$parentNode;
       i.GoogleAnalyticsObject = r;
       i[r] = i[r] || function addArgumentsToQueueForWaitingTheScriptLoading() {
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -22,7 +21,7 @@ class AnalyticsGAPlugin {
       const m = s.getElementsByTagName(o)[0];
       a.async = true;
       a.src = g;
-      (_m$parentNode = m.parentNode) === null || _m$parentNode === void 0 ? void 0 : _m$parentNode.insertBefore(a, m);
+      m.parentNode?.insertBefore(a, m);
     })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
     /**
      * UA-57284711-1 - ga key for development purpose

package/dist/auth/auth.js

@@ -1,7 +1,7 @@
 import WindowFlow from './window-flow.js';
 import onBackendDown from './down-notification.js';
 import Auth from './auth__core.js';
-export { DEFAULT_BACKGROUND_TIMEOUT, DEFAULT_EXPIRES_TIMEOUT, DOMAIN_USER_CHANGED_EVENT, LOGOUT_EVENT, LOGOUT_POSTPONED_EVENT, USER_CHANGED_EVENT, USER_CHANGE_POSTPONED_EVENT, default } from './auth__core.js';
+export { DEFAULT_BACKGROUND_TIMEOUT, DEFAULT_EXPIRES_TIMEOUT, DOMAIN_USER_CHANGED_EVENT, LOGOUT_EVENT, LOGOUT_POSTPONED_EVENT, USER_CHANGED_EVENT, USER_CHANGE_POSTPONED_EVENT } from './auth__core.js';
 import '../_helpers/_rollupPluginBabelHelpers.js';
 import './response-parser.js';
 import 'es6-error';
@@ -101,3 +101,5 @@ Auth.DEFAULT_CONFIG = {
   EmbeddedLoginFlow: WindowFlow,
   onBackendDown: onBackendDown
 };
+
+export { Auth as default };

package/dist/auth/auth__core.js

@@ -211,14 +211,8 @@ class Auth {
       }
     });
     if (this.config.cacheCurrentUser) {
-      this.addListener(LOGOUT_EVENT, () => {
-        var _this$_storage;
-        return (_this$_storage = this._storage) === null || _this$_storage === void 0 ? void 0 : _this$_storage.wipeCachedCurrentUser();
-      });
-      this.addListener(USER_CHANGED_EVENT, () => {
-        var _this$_storage2;
-        return (_this$_storage2 = this._storage) === null || _this$_storage2 === void 0 ? void 0 : _this$_storage2.onUserChanged();
-      });
+      this.addListener(LOGOUT_EVENT, () => this._storage?.wipeCachedCurrentUser());
+      this.addListener(USER_CHANGED_EVENT, () => this._storage?.onUserChanged());
     }
     this._createInitDeferred();
     this.setUpPreconnect(config.serverUri);
@@ -258,8 +252,7 @@ class Auth {
    * that should be restored after returning back from auth server.
    */
   async init() {
-    var _this$_storage3;
-    (_this$_storage3 = this._storage) === null || _this$_storage3 === void 0 ? void 0 : _this$_storage3.onTokenChange(async token => {
+    this._storage?.onTokenChange(async token => {
       const isGuest = this.user ? this.user.guest : false;
       if (isGuest && !token) {
         return;
@@ -307,18 +300,16 @@ class Auth {
       return new Promise(noop);
     }
     try {
-      var _this$_tokenValidator, _this$_initDeferred, _this$_initDeferred$r, _state;
       // Check if there is a valid token
-      await ((_this$_tokenValidator = this._tokenValidator) === null || _this$_tokenValidator === void 0 ? void 0 : _this$_tokenValidator.validateToken());
+      await this._tokenValidator?.validateToken();
       // Checking if there is a message left by another app on this domain
       const message = await this._domainStorage._messagesStorage.get(`domain-message-${DOMAIN_USER_CHANGED_EVENT}`);
       if (message) {
-        var _this$user;
         const {
           userID,
           serviceID
         } = message;
-        if (serviceID !== this.config.clientId && (!userID || ((_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user.id) !== userID)) {
+        if (serviceID !== this.config.clientId && (!userID || this.user?.id !== userID)) {
           this.forceTokenUpdate();
         }
       }
@@ -328,12 +319,11 @@ class Auth {
         // Check if we have requested to restore state anyway
         state = await this._checkForStateRestoration();
       }
-      (_this$_initDeferred = this._initDeferred) === null || _this$_initDeferred === void 0 ? void 0 : (_this$_initDeferred$r = _this$_initDeferred.resolve) === null || _this$_initDeferred$r === void 0 ? void 0 : _this$_initDeferred$r.call(_this$_initDeferred, state && state.restoreLocation);
-      return (_state = state) === null || _state === void 0 ? void 0 : _state.restoreLocation;
+      this._initDeferred?.resolve?.(state && state.restoreLocation);
+      return state?.restoreLocation;
     } catch (error) {
       if (Auth.storageIsUnavailable) {
-        var _this$_initDeferred2, _this$_initDeferred2$;
-        (_this$_initDeferred2 = this._initDeferred) === null || _this$_initDeferred2 === void 0 ? void 0 : (_this$_initDeferred2$ = _this$_initDeferred2.resolve) === null || _this$_initDeferred2$ === void 0 ? void 0 : _this$_initDeferred2$.call(_this$_initDeferred2); // No way to handle if cookies are disabled
+        this._initDeferred?.resolve?.(); // No way to handle if cookies are disabled
         await this.requestUser(); // Someone may expect user to be loaded as a part of token validation
         return null;
       }
@@ -341,8 +331,7 @@ class Auth {
     }
   }
   async sendRedirect(error) {
-    var _this$_requestBuilder;
-    const authRequest = await ((_this$_requestBuilder = this._requestBuilder) === null || _this$_requestBuilder === void 0 ? void 0 : _this$_requestBuilder.prepareAuthRequest());
+    const authRequest = await this._requestBuilder?.prepareAuthRequest();
     if (authRequest != null) {
       this._redirectCurrentPage(authRequest.url);
     }
@@ -355,12 +344,10 @@ class Auth {
   async handleInitError(error) {
     if ('stateId' in error && error.stateId) {
       try {
-        var _this$_storage4;
-        const state = await ((_this$_storage4 = this._storage) === null || _this$_storage4 === void 0 ? void 0 : _this$_storage4.getState(error.stateId));
+        const state = await this._storage?.getState(error.stateId);
         if (state && state.nonRedirect) {
-          var _this$_storage5;
           state.error = error;
-          (_this$_storage5 = this._storage) === null || _this$_storage5 === void 0 ? void 0 : _this$_storage5.saveState(error.stateId, state);
+          this._storage?.saveState(error.stateId, state);
           // Return endless promise in the background to avoid service start
           return new Promise(noop);
         }
@@ -371,8 +358,7 @@ class Auth {
     throw error;
   }
   async handleInitValidationError(error) {
-    var _error$cause, _this$_initDeferred4, _this$_initDeferred4$;
-    if ('cause' in error && error.cause instanceof Error && ((_error$cause = error.cause) === null || _error$cause === void 0 ? void 0 : _error$cause.message) === 'invalid_client') {
+    if ('cause' in error && error.cause instanceof Error && error.cause?.message === 'invalid_client') {
       // eslint-disable-next-line no-console
       console.error('RingUI Auth: invalid client detected. Logging out', error);
       await this.logout();
@@ -385,17 +371,16 @@ class Auth {
     // Background flow
     if ('authRedirect' in error && error.authRedirect && !this.config.redirect) {
       try {
-        var _this$_backgroundFlow, _this$_tokenValidator2, _this$_initDeferred3, _this$_initDeferred3$;
-        await ((_this$_backgroundFlow = this._backgroundFlow) === null || _this$_backgroundFlow === void 0 ? void 0 : _this$_backgroundFlow.authorize());
-        await ((_this$_tokenValidator2 = this._tokenValidator) === null || _this$_tokenValidator2 === void 0 ? void 0 : _this$_tokenValidator2.validateToken());
-        (_this$_initDeferred3 = this._initDeferred) === null || _this$_initDeferred3 === void 0 ? void 0 : (_this$_initDeferred3$ = _this$_initDeferred3.resolve) === null || _this$_initDeferred3$ === void 0 ? void 0 : _this$_initDeferred3$.call(_this$_initDeferred3);
+        await this._backgroundFlow?.authorize();
+        await this._tokenValidator?.validateToken();
+        this._initDeferred?.resolve?.();
         return undefined;
       } catch (validationError) {
         // Fallback to redirect flow
         return validationError instanceof Error ? this.sendRedirect(validationError) : undefined;
       }
     }
-    (_this$_initDeferred4 = this._initDeferred) === null || _this$_initDeferred4 === void 0 ? void 0 : (_this$_initDeferred4$ = _this$_initDeferred4.reject) === null || _this$_initDeferred4$ === void 0 ? void 0 : _this$_initDeferred4$.call(_this$_initDeferred4, error);
+    this._initDeferred?.reject?.(error);
     throw error;
   }
   /**
@@ -408,13 +393,13 @@ class Auth {
       throw new Error('You should log in to be able to make requests');
     }
     try {
-      var _this$_initDeferred5, _await$this$_tokenVal, _this$_tokenValidator3;
-      await ((_this$_initDeferred5 = this._initDeferred) === null || _this$_initDeferred5 === void 0 ? void 0 : _this$_initDeferred5.promise);
+      var _await$this$_tokenVal;
+      await this._initDeferred?.promise;
       if (Auth.storageIsUnavailable) {
         return null; // Forever guest if storage is unavailable
       }
 
-      return (_await$this$_tokenVal = await ((_this$_tokenValidator3 = this._tokenValidator) === null || _this$_tokenValidator3 === void 0 ? void 0 : _this$_tokenValidator3.validateTokenLocally())) !== null && _await$this$_tokenVal !== void 0 ? _await$this$_tokenVal : null;
+      return (_await$this$_tokenVal = await this._tokenValidator?.validateTokenLocally()) !== null && _await$this$_tokenVal !== void 0 ? _await$this$_tokenVal : null;
     } catch (e) {
       return this.forceTokenUpdate();
     }
@@ -435,8 +420,8 @@ class Auth {
       this._backendCheckPromise = null;
     }
     try {
-      var _await$this$_backgrou, _this$_backgroundFlow2;
-      return (_await$this$_backgrou = await ((_this$_backgroundFlow2 = this._backgroundFlow) === null || _this$_backgroundFlow2 === void 0 ? void 0 : _this$_backgroundFlow2.authorize())) !== null && _await$this$_backgrou !== void 0 ? _await$this$_backgrou : null;
+      var _await$this$_backgrou;
+      return (_await$this$_backgrou = await this._backgroundFlow?.authorize()) !== null && _await$this$_backgrou !== void 0 ? _await$this$_backgrou : null;
     } catch (error) {
       if (!(error instanceof Error)) {
         return null;
@@ -445,8 +430,7 @@ class Auth {
         return new Promise(resolve => {
           const onTryAgain = async () => {
             try {
-              var _this$_backgroundFlow3;
-              const result = await ((_this$_backgroundFlow3 = this._backgroundFlow) === null || _this$_backgroundFlow3 === void 0 ? void 0 : _this$_backgroundFlow3.authorize());
+              const result = await this._backgroundFlow?.authorize();
               resolve(result !== null && result !== void 0 ? result : null);
             } catch (retryError) {
               if (retryError instanceof Error) {
@@ -466,8 +450,7 @@ class Auth {
           });
         });
       } else {
-        var _this$_requestBuilder2;
-        const authRequest = await ((_this$_requestBuilder2 = this._requestBuilder) === null || _this$_requestBuilder2 === void 0 ? void 0 : _this$_requestBuilder2.prepareAuthRequest());
+        const authRequest = await this._requestBuilder?.prepareAuthRequest();
         if (authRequest != null) {
           this._redirectCurrentPage(authRequest.url);
         }
@@ -500,8 +483,7 @@ class Auth {
    */
   getUser(accessToken) {
     if (this.config.cacheCurrentUser) {
-      var _this$_storage6;
-      return (_this$_storage6 = this._storage) === null || _this$_storage6 === void 0 ? void 0 : _this$_storage6.getCachedUser(() => this.http.authorizedFetch(Auth.API_PROFILE_PATH, accessToken, this.config.userParams));
+      return this._storage?.getCachedUser(() => this.http.authorizedFetch(Auth.API_PROFILE_PATH, accessToken, this.config.userParams));
     } else {
       return this.http.authorizedFetch(Auth.API_PROFILE_PATH, accessToken, this.config.userParams);
     }
@@ -523,10 +505,9 @@ class Auth {
     return user;
   }
   async updateUser() {
-    var _this$_storage7;
     this._setPostponed(false);
     const accessToken = await this.requestToken();
-    (_this$_storage7 = this._storage) === null || _this$_storage7 === void 0 ? void 0 : _this$_storage7.wipeCachedCurrentUser();
+    this._storage?.wipeCachedCurrentUser();
     const user = await this.getUser(accessToken);
     this.user = user;
     this.listeners.trigger(USER_CHANGED_EVENT, user);
@@ -567,7 +548,6 @@ class Auth {
     this.logout();
   }
   _showAuthDialog() {
-    var _this$user2, _this$_authDialogServ, _this$_storage9, _this$_storage10;
     let {
       nonInteractive,
       error,
@@ -579,13 +559,13 @@ class Auth {
       onPostponeLogout,
       translations
     } = this.config;
-    const cancelable = ((_this$user2 = this.user) === null || _this$user2 === void 0 ? void 0 : _this$user2.guest) || canCancel;
+    const cancelable = this.user?.guest || canCancel;
     this._createInitDeferred();
     const closeDialog = () => {
       /* eslint-disable @typescript-eslint/no-use-before-define */
-      stopTokenListening === null || stopTokenListening === void 0 ? void 0 : stopTokenListening();
-      stopMessageListening === null || stopMessageListening === void 0 ? void 0 : stopMessageListening();
-      hide === null || hide === void 0 ? void 0 : hide();
+      stopTokenListening?.();
+      stopMessageListening?.();
+      hide?.();
       /* eslint-enable @typescript-eslint/no-use-before-define */
     };
 
@@ -598,29 +578,26 @@ class Auth {
       this._runEmbeddedLogin();
     };
     const onCancel = () => {
-      var _this$_embeddedFlow, _this$_storage8, _this$user3;
-      (_this$_embeddedFlow = this._embeddedFlow) === null || _this$_embeddedFlow === void 0 ? void 0 : _this$_embeddedFlow.stop();
-      (_this$_storage8 = this._storage) === null || _this$_storage8 === void 0 ? void 0 : _this$_storage8.sendMessage(Auth.CLOSE_WINDOW_MESSAGE, Date.now());
+      this._embeddedFlow?.stop();
+      this._storage?.sendMessage(Auth.CLOSE_WINDOW_MESSAGE, Date.now());
       closeDialog();
       if (!cancelable) {
-        var _this$_initDeferred6, _this$_initDeferred6$;
-        (_this$_initDeferred6 = this._initDeferred) === null || _this$_initDeferred6 === void 0 ? void 0 : (_this$_initDeferred6$ = _this$_initDeferred6.resolve) === null || _this$_initDeferred6$ === void 0 ? void 0 : _this$_initDeferred6$.call(_this$_initDeferred6);
+        this._initDeferred?.resolve?.();
         this.listeners.trigger(LOGOUT_POSTPONED_EVENT);
         onPostponeLogout();
         return;
       }
-      if ((_this$user3 = this.user) !== null && _this$user3 !== void 0 && _this$user3.guest && nonInteractive) {
+      if (this.user?.guest && nonInteractive) {
         this.forceTokenUpdate();
       } else {
-        var _this$_initDeferred7, _this$_initDeferred7$;
-        (_this$_initDeferred7 = this._initDeferred) === null || _this$_initDeferred7 === void 0 ? void 0 : (_this$_initDeferred7$ = _this$_initDeferred7.resolve) === null || _this$_initDeferred7$ === void 0 ? void 0 : _this$_initDeferred7$.call(_this$_initDeferred7);
+        this._initDeferred?.resolve?.();
       }
     };
     const onTryAgainClick = async () => {
-      await (onTryAgain === null || onTryAgain === void 0 ? void 0 : onTryAgain());
+      await onTryAgain?.();
       closeDialog();
     };
-    const hide = (_this$_authDialogServ = this._authDialogService) === null || _this$_authDialogServ === void 0 ? void 0 : _this$_authDialogServ.call(this, {
+    const hide = this._authDialogService?.({
       ...this._service,
       loginCaption: translations.login,
       loginToCaption: translations.loginTo,
@@ -632,20 +609,16 @@ class Auth {
       onCancel,
       onTryAgain: onTryAgain ? onTryAgainClick : undefined
     });
-    const stopTokenListening = (_this$_storage9 = this._storage) === null || _this$_storage9 === void 0 ? void 0 : _this$_storage9.onTokenChange(token => {
+    const stopTokenListening = this._storage?.onTokenChange(token => {
       if (token) {
-        var _this$_initDeferred8, _this$_initDeferred8$;
         closeDialog();
-        (_this$_initDeferred8 = this._initDeferred) === null || _this$_initDeferred8 === void 0 ? void 0 : (_this$_initDeferred8$ = _this$_initDeferred8.resolve) === null || _this$_initDeferred8$ === void 0 ? void 0 : _this$_initDeferred8$.call(_this$_initDeferred8);
+        this._initDeferred?.resolve?.();
       }
     });
-    const stopMessageListening = (_this$_storage10 = this._storage) === null || _this$_storage10 === void 0 ? void 0 : _this$_storage10.onMessage(Auth.CLOSE_WINDOW_MESSAGE, () => {
-      var _this$_embeddedFlow2;
-      return (_this$_embeddedFlow2 = this._embeddedFlow) === null || _this$_embeddedFlow2 === void 0 ? void 0 : _this$_embeddedFlow2.stop();
-    });
+    const stopMessageListening = this._storage?.onMessage(Auth.CLOSE_WINDOW_MESSAGE, () => this._embeddedFlow?.stop());
   }
   _showUserChangedDialog(_ref) {
-    var _this$_authDialogServ2, _newUser$name;
+    var _newUser$name;
     let {
       newUser,
       onApply,
@@ -656,12 +629,11 @@ class Auth {
     } = this.config;
     this._createInitDeferred();
     const done = () => {
-      var _this$_initDeferred9, _this$_initDeferred9$;
-      (_this$_initDeferred9 = this._initDeferred) === null || _this$_initDeferred9 === void 0 ? void 0 : (_this$_initDeferred9$ = _this$_initDeferred9.resolve) === null || _this$_initDeferred9$ === void 0 ? void 0 : _this$_initDeferred9$.call(_this$_initDeferred9);
+      this._initDeferred?.resolve?.();
       // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      hide === null || hide === void 0 ? void 0 : hide();
+      hide?.();
     };
-    const hide = (_this$_authDialogServ2 = this._authDialogService) === null || _this$_authDialogServ2 === void 0 ? void 0 : _this$_authDialogServ2.call(this, {
+    const hide = this._authDialogService?.({
       ...this._service,
       title: translations.youHaveLoggedInAs.replace('%userName%', (_newUser$name = newUser.name) !== null && _newUser$name !== void 0 ? _newUser$name : ''),
       loginCaption: translations.login,
@@ -708,19 +680,17 @@ class Auth {
     const REPEAT_TIMEOUT = 5000;
     let timerId;
     return new Promise((resolve, reject) => {
-      var _this$_storage12;
       const done = () => {
-        var _this$_storage11;
         /* eslint-disable @typescript-eslint/no-use-before-define */
         hide();
         window.removeEventListener('online', onCheckAgain);
-        stopListeningCloseMessage === null || stopListeningCloseMessage === void 0 ? void 0 : stopListeningCloseMessage();
+        stopListeningCloseMessage?.();
         /* eslint-enable @typescript-eslint/no-use-before-define */
-        (_this$_storage11 = this._storage) === null || _this$_storage11 === void 0 ? void 0 : _this$_storage11.sendMessage(Auth.CLOSE_BACKEND_DOWN_MESSAGE, Date.now());
+        this._storage?.sendMessage(Auth.CLOSE_BACKEND_DOWN_MESSAGE, Date.now());
         clearTimeout(timerId);
       };
-      const stopListeningCloseMessage = (_this$_storage12 = this._storage) === null || _this$_storage12 === void 0 ? void 0 : _this$_storage12.onMessage(Auth.CLOSE_BACKEND_DOWN_MESSAGE, () => {
-        stopListeningCloseMessage === null || stopListeningCloseMessage === void 0 ? void 0 : stopListeningCloseMessage();
+      const stopListeningCloseMessage = this._storage?.onMessage(Auth.CLOSE_BACKEND_DOWN_MESSAGE, () => {
+        stopListeningCloseMessage?.();
         done();
         resolve();
       });
@@ -753,7 +723,6 @@ class Auth {
    * Wipe accessToken and redirect to auth page with required authorization
    */
   async logout(extraParams) {
-    var _this$_storage13, _this$_requestBuilder3;
     const requestParams = {
       // eslint-disable-next-line camelcase
       request_credentials: 'required',
@@ -762,19 +731,17 @@ class Auth {
     await this._checkBackendsStatusesIfEnabled();
     await this.listeners.trigger('logout');
     this._updateDomainUser(null);
-    await ((_this$_storage13 = this._storage) === null || _this$_storage13 === void 0 ? void 0 : _this$_storage13.wipeToken());
-    const authRequest = await ((_this$_requestBuilder3 = this._requestBuilder) === null || _this$_requestBuilder3 === void 0 ? void 0 : _this$_requestBuilder3.prepareAuthRequest(requestParams));
+    await this._storage?.wipeToken();
+    const authRequest = await this._requestBuilder?.prepareAuthRequest(requestParams);
     if (authRequest != null) {
       this._redirectCurrentPage(authRequest.url);
     }
   }
   async _runEmbeddedLogin() {
-    var _this$_storage14;
-    (_this$_storage14 = this._storage) === null || _this$_storage14 === void 0 ? void 0 : _this$_storage14.sendMessage(Auth.CLOSE_WINDOW_MESSAGE, Date.now());
+    this._storage?.sendMessage(Auth.CLOSE_WINDOW_MESSAGE, Date.now());
     try {
-      var _this$_embeddedFlow3;
       this._isLoginWindowOpen = true;
-      return await ((_this$_embeddedFlow3 = this._embeddedFlow) === null || _this$_embeddedFlow3 === void 0 ? void 0 : _this$_embeddedFlow3.authorize());
+      return await this._embeddedFlow?.authorize();
     } catch (e) {
       throw e;
     } finally {
@@ -792,8 +759,7 @@ class Auth {
     }
     await this._checkBackendsStatusesIfEnabled();
     try {
-      var _this$_backgroundFlow4;
-      const accessToken = await ((_this$_backgroundFlow4 = this._backgroundFlow) === null || _this$_backgroundFlow4 === void 0 ? void 0 : _this$_backgroundFlow4.authorize());
+      const accessToken = await this._backgroundFlow?.authorize();
       const user = await this.getUser(accessToken);
       if (user.guest) {
         this._beforeLogout();
@@ -820,7 +786,6 @@ class Auth {
    * @private
    */
   async _checkForAuthResponse() {
-    var _this$_storage15;
     // getAuthResponseURL may throw an exception
     const authResponse = this._responseParser.getAuthResponseFromURL();
     const {
@@ -840,29 +805,27 @@ class Auth {
       expiresIn,
       accessToken
     } = authResponse;
-    const newState = (await (stateId && ((_this$_storage15 = this._storage) === null || _this$_storage15 === void 0 ? void 0 : _this$_storage15.getState(stateId)))) || {};
+    const newState = (await (stateId && this._storage?.getState(stateId))) || {};
     const scopes = scope ? scope.split(' ') : newState.scopes || defaultScope || [];
     const effectiveExpiresIn = expiresIn ? parseInt(expiresIn, 10) : defaultExpiresIn;
     const expires = TokenValidator._epoch() + effectiveExpiresIn;
     if (accessToken != null) {
-      var _this$_storage16;
-      await ((_this$_storage16 = this._storage) === null || _this$_storage16 === void 0 ? void 0 : _this$_storage16.saveToken({
+      await this._storage?.saveToken({
         accessToken,
         scopes,
         expires,
         lifeTime: effectiveExpiresIn
-      }));
+      });
     }
     return newState;
   }
   async _checkForStateRestoration() {
-    var _this$_storage17;
     const authResponse = this._responseParser._authResponse;
     if (authResponse && this.config.cleanHash) {
       this.setHash('');
     }
-    const stateId = authResponse === null || authResponse === void 0 ? void 0 : authResponse.restoreAuthState;
-    return (await (stateId && ((_this$_storage17 = this._storage) === null || _this$_storage17 === void 0 ? void 0 : _this$_storage17.getState(stateId)))) || {};
+    const stateId = authResponse?.restoreAuthState;
+    return (await (stateId && this._storage?.getState(stateId))) || {};
   }
   _checkBackendsAreUp() {
     const abortCtrl = new AbortController();

package/dist/auth/iframe-flow.js

@@ -112,8 +112,7 @@ class IFrameFlow {
         }
       });
       const cleanUp = () => {
-        var _this$hideDialog;
-        (_this$hideDialog = this.hideDialog) === null || _this$hideDialog === void 0 ? void 0 : _this$hideDialog.call(this);
+        this.hideDialog?.();
         removeStateListener();
         removeTokenListener();
       };