@jetbrains/ring-ui 5.0.147 → 5.0.149

package/dist/input/input.js

@@ -63,9 +63,8 @@ class Input extends PureComponent {
     return this.props.id || this.id;
   }
   checkValue() {
-    var _this$input;
     this.setState({
-      empty: !((_this$input = this.input) !== null && _this$input !== void 0 && _this$input.value)
+      empty: !this.input?.value
     });
     if (this.props.multiline && this.input != null && this.input.scrollHeight >= this.input.clientHeight) {
       this.stretch(this.input);
@@ -89,15 +88,13 @@ class Input extends PureComponent {
   };
   handleInputChange = e => {
     if (!this.props.multiline) {
-      var _this$props$onChange, _this$props;
-      (_this$props$onChange = (_this$props = this.props).onChange) === null || _this$props$onChange === void 0 ? void 0 : _this$props$onChange.call(_this$props, e);
+      this.props.onChange?.(e);
       this.checkValue();
     }
   };
   handleTextareaChange = e => {
     if (this.props.multiline) {
-      var _this$props$onChange2, _this$props2;
-      (_this$props$onChange2 = (_this$props2 = this.props).onChange) === null || _this$props$onChange2 === void 0 ? void 0 : _this$props$onChange2.call(_this$props2, e);
+      this.props.onChange?.(e);
       this.checkValue();
     }
   };
@@ -177,7 +174,7 @@ class Input extends PureComponent {
       }, commonProps, restProps)) : /*#__PURE__*/React.createElement("input", _extends({
         onChange: this.handleInputChange
       }, commonProps, restProps)), clearable && !disabled && /*#__PURE__*/React.createElement(Button, {
-        title: (_translations$clear = translations === null || translations === void 0 ? void 0 : translations.clear) !== null && _translations$clear !== void 0 ? _translations$clear : translate('clear'),
+        title: (_translations$clear = translations?.clear) !== null && _translations$clear !== void 0 ? _translations$clear : translate('clear'),
         "data-test": "ring-input-clear",
         className: modules_88cfaf40.clear,
         icon: closeIcon,

package/dist/island/content.js

@@ -65,8 +65,7 @@ class Content extends Component {
     const scrolledToTop = scrollTop === 0;
     const scrolledToBottom = offsetHeight + scrollTop >= scrollHeight - END_DISTANCE;
     if (scrolledToBottom) {
-      var _this$props$onScrollT, _this$props;
-      (_this$props$onScrollT = (_this$props = this.props).onScrollToBottom) === null || _this$props$onScrollT === void 0 ? void 0 : _this$props$onScrollT.call(_this$props);
+      this.props.onScrollToBottom?.();
     }
     this.setState({
       scrolledToTop,

package/dist/list/list__users-groups-source.js

@@ -91,16 +91,13 @@ class ListUsersGroupsSource extends HubSourceUsersGroups {
       });
     }
     if (filter !== Filter.GROUPS) {
-      users.forEach(user => {
-        var _user$profile$avatar;
-        return items.push({
-          ...user,
-          key: user.id,
-          label: user.name,
-          avatar: user.profile ? (_user$profile$avatar = user.profile.avatar) === null || _user$profile$avatar === void 0 ? void 0 : _user$profile$avatar.url : null,
-          description: user.login
-        });
-      });
+      users.forEach(user => items.push({
+        ...user,
+        key: user.id,
+        label: user.name,
+        avatar: user.profile ? user.profile.avatar?.url : null,
+        description: user.login
+      }));
     }
     if (filter === Filter.ALL) {
       items.push({

package/dist/loader/loader.js

@@ -31,8 +31,7 @@ class Loader extends PureComponent {
     }
   }
   componentWillUnmount() {
-    var _this$loader;
-    (_this$loader = this.loader) === null || _this$loader === void 0 ? void 0 : _this$loader.destroy();
+    this.loader?.destroy();
   }
   loader;
   initLoader = el => {

package/dist/loader/loader__core.js

@@ -108,7 +108,6 @@ class LoaderCore {
   tick;
   isRunning;
   constructor(containerNode, props) {
-    var _this$ctx;
     this.props = Object.assign({}, LoaderCore.defaultProps, props);
     this.canvas = document.createElement('canvas');
     this.canvas.dataset.test = 'ring-loader';
@@ -127,7 +126,7 @@ class LoaderCore {
     this.canvas.style.width = `${this.props.size}px`;
     this.canvas.style.height = `${this.props.size}px`;
     this.ctx = this.canvas.getContext('2d');
-    (_this$ctx = this.ctx) === null || _this$ctx === void 0 ? void 0 : _this$ctx.scale(pixelRatio, pixelRatio);
+    this.ctx?.scale(pixelRatio, pixelRatio);
     this.height = this.props.size;
     this.width = this.props.size;
     this.particles = [];

package/dist/markdown/code.js

@@ -8,7 +8,6 @@ import '../global/trivial-template-tag.js';
 import '../global/memoize.js';
 
 const MarkdownCode = _ref => {
-  var _className$split$find;
   let {
     children,
     language,
@@ -16,11 +15,11 @@ const MarkdownCode = _ref => {
     className
   } = _ref;
   // Hack for updated react-markdown RG-2193
-  const lang = language !== null && language !== void 0 ? language : className === null || className === void 0 ? void 0 : (_className$split$find = className.split(' ').find(name => name.startsWith('language-'))) === null || _className$split$find === void 0 ? void 0 : _className$split$find.replace('language-', '');
+  const lang = language !== null && language !== void 0 ? language : className?.split(' ').find(name => name.startsWith('language-'))?.replace('language-', '');
   return /*#__PURE__*/React.createElement(Code, {
     language: lang,
     className: className,
-    code: (children === null || children === void 0 ? void 0 : children.join('')) || '',
+    code: children?.join('') || '',
     inline: inline
   });
 };

package/dist/message/message.js

@@ -120,12 +120,10 @@ class Message extends Component {
   popup;
   node;
   popupRef = el => {
-    var _this$popup;
     this.popup = el;
-    this.node = (_this$popup = this.popup) === null || _this$popup === void 0 ? void 0 : _this$popup.node;
+    this.node = this.popup?.node;
   };
   getTailOffset() {
-    var _this$popup2;
     const DEFAULT_OFFSET = 32;
     const {
       popupProps
@@ -133,14 +131,14 @@ class Message extends Component {
     if (this.props.tailOffset != null) {
       return this.props.tailOffset;
     }
-    const anchor = (popupProps === null || popupProps === void 0 ? void 0 : popupProps.anchorElement) || ((_this$popup2 = this.popup) === null || _this$popup2 === void 0 ? void 0 : _this$popup2.parent);
+    const anchor = popupProps?.anchorElement || this.popup?.parent;
     if (!anchor) {
       return DEFAULT_OFFSET;
     }
     const offset = Math.floor(anchor.offsetWidth / 2);
     const isOpenedToRight = this.state.direction != null && [Directions.TOP_RIGHT, Directions.BOTTOM_RIGHT].includes(this.state.direction);
-    if (popupProps !== null && popupProps !== void 0 && popupProps.left && isOpenedToRight) {
-      return offset - (popupProps === null || popupProps === void 0 ? void 0 : popupProps.left);
+    if (popupProps?.left && isOpenedToRight) {
+      return offset - popupProps?.left;
     }
     return offset;
   }
@@ -199,10 +197,10 @@ class Message extends Component {
           className: modules_8b837449.button,
           onClick: onClose,
           primary: true
-        }, buttonProps), (_translations$gotIt = translations === null || translations === void 0 ? void 0 : translations.gotIt) !== null && _translations$gotIt !== void 0 ? _translations$gotIt : translate('gotIt')), onDismiss && /*#__PURE__*/React.createElement(Button, {
+        }, buttonProps), (_translations$gotIt = translations?.gotIt) !== null && _translations$gotIt !== void 0 ? _translations$gotIt : translate('gotIt')), onDismiss && /*#__PURE__*/React.createElement(Button, {
           onClick: onDismiss,
           text: true
-        }, (_translations$dismiss = translations === null || translations === void 0 ? void 0 : translations.dismiss) !== null && _translations$dismiss !== void 0 ? _translations$dismiss : translate('dismiss'))));
+        }, (_translations$dismiss = translations?.dismiss) !== null && _translations$dismiss !== void 0 ? _translations$dismiss : translate('dismiss'))));
       });
     });
   }

package/dist/pager/pager.js

@@ -115,10 +115,10 @@ class Pager extends PureComponent {
       translate
     } = this.context;
     const data = pageSizes.map(size => {
-      var _this$props$translati, _this$props$translati2;
+      var _this$props$translati;
       return {
         key: size,
-        label: `${size} ${(_this$props$translati = (_this$props$translati2 = this.props.translations) === null || _this$props$translati2 === void 0 ? void 0 : _this$props$translati2.perPage) !== null && _this$props$translati !== void 0 ? _this$props$translati : translate('perPage')}`
+        label: `${size} ${(_this$props$translati = this.props.translations?.perPage) !== null && _this$props$translati !== void 0 ? _this$props$translati : translate('perPage')}`
       };
     });
     const selected = data.find(it => it.key === pageSize);
@@ -144,9 +144,8 @@ class Pager extends PureComponent {
       currentPage
     } = this.props;
     if (currentPage !== 1) {
-      var _this$props$onPageCha, _this$props;
       const prevPage = currentPage - 1;
-      (_this$props$onPageCha = (_this$props = this.props).onPageChange) === null || _this$props$onPageCha === void 0 ? void 0 : _this$props$onPageCha.call(_this$props, prevPage);
+      this.props.onPageChange?.(prevPage);
     }
   };
   handleNextClick = () => {
@@ -157,15 +156,13 @@ class Pager extends PureComponent {
     const nextPage = currentPage + 1;
     const total = this.getTotalPages();
     if (currentPage !== total) {
-      var _this$props$onPageCha2, _this$props2;
-      (_this$props$onPageCha2 = (_this$props2 = this.props).onPageChange) === null || _this$props$onPageCha2 === void 0 ? void 0 : _this$props$onPageCha2.call(_this$props2, nextPage);
+      this.props.onPageChange?.(nextPage);
     } else if (this.props.openTotal) {
       onLoadPage(nextPage);
     }
   };
   handlePageChange = memoize(i => event => {
-    var _this$props$onPageCha3, _this$props3;
-    (_this$props$onPageCha3 = (_this$props3 = this.props).onPageChange) === null || _this$props$onPageCha3 === void 0 ? void 0 : _this$props$onPageCha3.call(_this$props3, i, event);
+    this.props.onPageChange?.(i, event);
   });
   handleLoadMore = memoize(i => () => {
     this.props.onLoadPage(i);
@@ -212,7 +209,7 @@ class Pager extends PureComponent {
     }));
   }
   getPagerLinks() {
-    var _this$props$translati3, _this$props$translati4, _this$props$translati5, _this$props$translati6;
+    var _this$props$translati2, _this$props$translati3;
     const {
       translate
     } = this.context;
@@ -226,8 +223,8 @@ class Pager extends PureComponent {
       glyph: chevronLeftIcon,
       key: "icon"
     });
-    const prevText = (_this$props$translati3 = (_this$props$translati4 = this.props.translations) === null || _this$props$translati4 === void 0 ? void 0 : _this$props$translati4.previousPage) !== null && _this$props$translati3 !== void 0 ? _this$props$translati3 : translate('previousPage');
-    const nextText = (_this$props$translati5 = (_this$props$translati6 = this.props.translations) === null || _this$props$translati6 === void 0 ? void 0 : _this$props$translati6.nextPage) !== null && _this$props$translati5 !== void 0 ? _this$props$translati5 : translate('nextPage');
+    const prevText = (_this$props$translati2 = this.props.translations?.previousPage) !== null && _this$props$translati2 !== void 0 ? _this$props$translati2 : translate('previousPage');
+    const nextText = (_this$props$translati3 = this.props.translations?.nextPage) !== null && _this$props$translati3 !== void 0 ? _this$props$translati3 : translate('nextPage');
     const nextLinkContent = WrapText => [/*#__PURE__*/React.createElement("span", {
       key: "text"
     }, /*#__PURE__*/React.createElement(WrapText, null, nextText)), nextIcon];
@@ -266,7 +263,7 @@ class Pager extends PureComponent {
     return this.props.hrefFunc(page, pageSize);
   }
   getPagerContent() {
-    var _this$props$translati7, _this$props$translati8, _this$props$translati9, _this$props$translati10;
+    var _this$props$translati4, _this$props$translati5;
     const {
       currentPage,
       visiblePagesLimit
@@ -276,8 +273,7 @@ class Pager extends PureComponent {
       translate
     } = this.context;
     if (totalPages < this.props.currentPage) {
-      var _this$props$onPageCha4, _this$props4;
-      (_this$props$onPageCha4 = (_this$props4 = this.props).onPageChange) === null || _this$props$onPageCha4 === void 0 ? void 0 : _this$props$onPageCha4.call(_this$props4, totalPages);
+      this.props.onPageChange?.(totalPages);
     }
     let start = 1;
     let end = totalPages;
@@ -305,10 +301,10 @@ class Pager extends PureComponent {
       buttons.push(this.getButton(i, i, i, i === currentPage));
     }
     const lastPageButtonAvailable = end < totalPages && !this.props.openTotal || this.props.openTotal && this.props.canLoadLastPageWithOpenTotal;
-    return /*#__PURE__*/React.createElement("div", null, this.getPagerLinks(), /*#__PURE__*/React.createElement(ButtonToolbar, null, start > 1 && this.getButton(1, (_this$props$translati7 = (_this$props$translati8 = this.props.translations) === null || _this$props$translati8 === void 0 ? void 0 : _this$props$translati8.firstPage) !== null && _this$props$translati7 !== void 0 ? _this$props$translati7 : translate('firstPage')), /*#__PURE__*/React.createElement(ButtonGroup, null, start > 1 && this.getButton(start - 1, '...'), buttons, end < totalPages && this.getButton(end + 1, '...'), end === totalPages && this.props.openTotal && /*#__PURE__*/React.createElement(Button, _extends({
+    return /*#__PURE__*/React.createElement("div", null, this.getPagerLinks(), /*#__PURE__*/React.createElement(ButtonToolbar, null, start > 1 && this.getButton(1, (_this$props$translati4 = this.props.translations?.firstPage) !== null && _this$props$translati4 !== void 0 ? _this$props$translati4 : translate('firstPage')), /*#__PURE__*/React.createElement(ButtonGroup, null, start > 1 && this.getButton(start - 1, '...'), buttons, end < totalPages && this.getButton(end + 1, '...'), end === totalPages && this.props.openTotal && /*#__PURE__*/React.createElement(Button, _extends({
       href: this.generateHref(end + 1),
       disabled: this.props.loader
-    }, this.getClickProps(this.handleLoadMore(end + 1))), '...')), lastPageButtonAvailable && this.getButton(this.props.openTotal ? -1 : totalPages, (_this$props$translati9 = (_this$props$translati10 = this.props.translations) === null || _this$props$translati10 === void 0 ? void 0 : _this$props$translati10.lastPage) !== null && _this$props$translati9 !== void 0 ? _this$props$translati9 : translate('lastPage'))), this.getPageSizeSelector());
+    }, this.getClickProps(this.handleLoadMore(end + 1))), '...')), lastPageButtonAvailable && this.getButton(this.props.openTotal ? -1 : totalPages, (_this$props$translati5 = this.props.translations?.lastPage) !== null && _this$props$translati5 !== void 0 ? _this$props$translati5 : translate('lastPage'))), this.getPageSizeSelector());
   }
   render() {
     const classes = classNames(modules_1a5f0d42.pager, this.props.className);

package/dist/permissions/permissions__cache.js

@@ -205,7 +205,7 @@ class PermissionCache {
   testPermission(permissionName, projectId) {
     const permissionCache = this.permissionCache;
     const convertedName = this.namesConverter(permissionName);
-    const cachedPermission = (permissionCache === null || permissionCache === void 0 ? void 0 : permissionCache[permissionName]) || convertedName && (permissionCache === null || permissionCache === void 0 ? void 0 : permissionCache[convertedName]);
+    const cachedPermission = permissionCache?.[permissionName] || convertedName && permissionCache?.[convertedName];
     // Hasn't the permission in any project
     if (!cachedPermission) {
       return false;

package/dist/popup/popup.js

@@ -238,8 +238,7 @@ class Popup extends PureComponent {
    * @private
    */
   _onDocumentClick = evt => {
-    var _this$_getAnchor;
-    if (this.container && evt.target instanceof Node && this.container.contains(evt.target) || !this._listenersEnabled || this.props.dontCloseOnAnchorClick && evt.target instanceof Node && (_this$_getAnchor = this._getAnchor()) !== null && _this$_getAnchor !== void 0 && _this$_getAnchor.contains(evt.target)) {
+    if (this.container && evt.target instanceof Node && this.container.contains(evt.target) || !this._listenersEnabled || this.props.dontCloseOnAnchorClick && evt.target instanceof Node && this._getAnchor()?.contains(evt.target)) {
       return;
     }
     this.props.onOutsideClick(evt);

package/dist/popup/position.js

@@ -242,7 +242,7 @@ function position(attrs) {
       anchorRect,
       maxHeight,
       direction: chosenDirection,
-      popupScrollHeight: (_popup$scrollHeight = popup === null || popup === void 0 ? void 0 : popup.scrollHeight) !== null && _popup$scrollHeight !== void 0 ? _popup$scrollHeight : 0,
+      popupScrollHeight: (_popup$scrollHeight = popup?.scrollHeight) !== null && _popup$scrollHeight !== void 0 ? _popup$scrollHeight : 0,
       scroll
     });
   }

package/dist/query-assist/query-assist.js

@@ -287,9 +287,8 @@ class QueryAssist extends Component {
     }
     if (typeof query === 'string' && queryChanged && query !== this.immediateState.query) {
       this.immediateState.query = query;
-      if (prevProps.autoOpen && (query === null || query === void 0 ? void 0 : query.length) > 0) {
-        var _this$requestData;
-        (_this$requestData = this.requestData) === null || _this$requestData === void 0 ? void 0 : _this$requestData.call(this);
+      if (prevProps.autoOpen && query?.length > 0) {
+        this.requestData?.();
       } else if (query) {
         this.requestStyleRanges();
       }
@@ -351,30 +350,26 @@ class QueryAssist extends Component {
       }
       if (_this.immediateState.focus && !_this.props.disabled) {
         if (typeof _this.immediateState.selection === 'number' && Number.isInteger(_this.immediateState.selection) && _this.immediateState.selection > -1) {
-          var _this$caret;
           // Set to end of field value if newCaretPosition is inappropriate
-          (_this$caret = _this.caret) === null || _this$caret === void 0 ? void 0 : _this$caret.setPosition(newCaretPosition >= 0 ? newCaretPosition : -1);
+          _this.caret?.setPosition(newCaretPosition >= 0 ? newCaretPosition : -1);
           _this.scrollInput();
         } else if (_this.immediateState.selection && typeof _this.immediateState.selection === 'object' && _this.immediateState.selection.startOffset !== undefined) {
-          var _this$caret2;
-          (_this$caret2 = _this.caret) === null || _this$caret2 === void 0 ? void 0 : _this$caret2.setPosition(_this.immediateState.selection);
+          _this.caret?.setPosition(_this.immediateState.selection);
         } else if (_this.immediateState.selection === undefined || params.forceSetCaret) {
-          var _this$caret3;
-          (_this$caret3 = _this.caret) === null || _this$caret3 === void 0 ? void 0 : _this$caret3.setPosition(-1);
+          _this.caret?.setPosition(-1);
         }
       }
     };
   })();
   scrollInput() {
-    var _this$caret4, _this$input, _this$input2, _this$input3;
-    const caretOffset = (_this$caret4 = this.caret) === null || _this$caret4 === void 0 ? void 0 : _this$caret4.getOffset();
-    if (((_this$input = this.input) === null || _this$input === void 0 ? void 0 : _this$input.clientWidth) !== ((_this$input2 = this.input) === null || _this$input2 === void 0 ? void 0 : _this$input2.scrollWidth) && caretOffset != null && ((_this$input3 = this.input) === null || _this$input3 === void 0 ? void 0 : _this$input3.clientWidth) != null && caretOffset > this.input.clientWidth) {
+    const caretOffset = this.caret?.getOffset();
+    if (this.input?.clientWidth !== this.input?.scrollWidth && caretOffset != null && this.input?.clientWidth != null && caretOffset > this.input.clientWidth) {
       this.input.scrollLeft += caretOffset;
     }
   }
   getQuery() {
-    var _this$input$textConte, _this$input4, _this$input4$textCont;
-    return (_this$input$textConte = (_this$input4 = this.input) === null || _this$input4 === void 0 ? void 0 : (_this$input4$textCont = _this$input4.textContent) === null || _this$input4$textCont === void 0 ? void 0 : _this$input4$textCont.replace(/\s/g, ' ')) !== null && _this$input$textConte !== void 0 ? _this$input$textConte : '';
+    var _this$input$textConte;
+    return (_this$input$textConte = this.input?.textContent?.replace(/\s/g, ' ')) !== null && _this$input$textConte !== void 0 ? _this$input$textConte : '';
   }
   isRenderingGlassOrLoader() {
     const renderLoader = this.props.loader !== false && this.state.loading;
@@ -392,13 +387,13 @@ class QueryAssist extends Component {
   };
   isComposing;
   handleInput = e => {
-    var _this$caret5, _currentCaret$positio;
+    var _currentCaret$positio;
     this.togglePlaceholder();
-    const currentCaret = (_this$caret5 = this.caret) === null || _this$caret5 === void 0 ? void 0 : _this$caret5.getPosition();
+    const currentCaret = this.caret?.getPosition();
     const props = {
       dirty: true,
       query: this.getQuery(),
-      caret: typeof currentCaret === 'number' ? currentCaret : (_currentCaret$positio = currentCaret === null || currentCaret === void 0 ? void 0 : currentCaret.position) !== null && _currentCaret$positio !== void 0 ? _currentCaret$positio : 0,
+      caret: typeof currentCaret === 'number' ? currentCaret : (_currentCaret$positio = currentCaret?.position) !== null && _currentCaret$positio !== void 0 ? _currentCaret$positio : 0,
       focus: true
     };
     if (this.immediateState.query === props.query && !this.isComposing) {
@@ -428,8 +423,7 @@ class QueryAssist extends Component {
     }
     this.props.onChange(props);
     if (this.props.autoOpen === 'force' || props.query.length > 0) {
-      var _this$requestData2;
-      (_this$requestData2 = this.requestData) === null || _this$requestData2 === void 0 ? void 0 : _this$requestData2.call(this);
+      this.requestData?.();
     }
   };
   // It's necessary to prevent new element creation before any other hooks
@@ -457,18 +451,17 @@ class QueryAssist extends Component {
   setState = (state, resolve) => {
     super.setState(state, () => {
       this._pushHistory(state);
-      resolve === null || resolve === void 0 ? void 0 : resolve();
+      resolve?.();
     });
   };
   _pushHistory(state) {
-    var _this$historyStack$;
     const queryIsSet = ('query' in state);
-    const queryIsSame = ((_this$historyStack$ = this.historyStack[0]) === null || _this$historyStack$ === void 0 ? void 0 : _this$historyStack$.query) === state.query;
+    const queryIsSame = this.historyStack[0]?.query === state.query;
     if (queryIsSet && !queryIsSame) {
-      var _this$caret$getPositi, _this$caret6;
+      var _this$caret$getPositi;
       this.historyStack.unshift({
         query: state.query,
-        caret: (_this$caret$getPositi = (_this$caret6 = this.caret) === null || _this$caret6 === void 0 ? void 0 : _this$caret6.getPosition({
+        caret: (_this$caret$getPositi = this.caret?.getPosition({
           avoidFocus: true
         })) !== null && _this$caret$getPositi !== void 0 ? _this$caret$getPositi : -1
       });
@@ -482,8 +475,7 @@ class QueryAssist extends Component {
     this.setState({
       query: previous.query
     }, () => {
-      var _this$caret7;
-      (_this$caret7 = this.caret) === null || _this$caret7 === void 0 ? void 0 : _this$caret7.setPosition(previous.caret);
+      this.caret?.setPosition(previous.caret);
       this.handleInput(e);
     });
   };
@@ -497,19 +489,18 @@ class QueryAssist extends Component {
     }
   };
   handleCaretMove = e => {
-    var _this$caret8, _currentCaret$positio2;
+    var _currentCaret$positio2;
     if (this.isComposing) {
       return;
     }
-    const currentCaret = (_this$caret8 = this.caret) === null || _this$caret8 === void 0 ? void 0 : _this$caret8.getPosition();
-    const caret = typeof currentCaret === 'number' ? currentCaret : (_currentCaret$positio2 = currentCaret === null || currentCaret === void 0 ? void 0 : currentCaret.position) !== null && _currentCaret$positio2 !== void 0 ? _currentCaret$positio2 : 0;
+    const currentCaret = this.caret?.getPosition();
+    const caret = typeof currentCaret === 'number' ? currentCaret : (_currentCaret$positio2 = currentCaret?.position) !== null && _currentCaret$positio2 !== void 0 ? _currentCaret$positio2 : 0;
     const popupHidden = !this.state.showPopup && e.type === 'click';
     if (!this.props.disabled && (caret !== this.immediateState.caret || popupHidden)) {
       this.immediateState.caret = caret;
       this.scrollInput();
       if (this.immediateState.query.length > 0) {
-        var _this$requestData3;
-        (_this$requestData3 = this.requestData) === null || _this$requestData3 === void 0 ? void 0 : _this$requestData3.call(this);
+        this.requestData?.();
       }
     }
     if (this.immediateState.query.length < 1) {
@@ -537,7 +528,6 @@ class QueryAssist extends Component {
       let afterCompletion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       return new Promise((resolve, reject) => {
         if (query === _this2.getQuery() && (caret === _this2.immediateState.caret || _this2.immediateState.caret === undefined)) {
-          var _this2$caret;
           // Do not setState on unmounted component
           if (!_this2.node) {
             return;
@@ -555,7 +545,7 @@ class QueryAssist extends Component {
           if (!deepEqual(_this2.state.styleRanges, styleRanges)) {
             state.styleRanges = styleRanges;
           }
-          _this2.immediateState.selection = (_this2$caret = _this2.caret) === null || _this2$caret === void 0 ? void 0 : _this2$caret.getPosition({
+          _this2.immediateState.selection = _this2.caret?.getPosition({
             avoidFocus: true
           });
           _this2.setState(state, resolve);
@@ -577,7 +567,7 @@ class QueryAssist extends Component {
     return this.props.onApply(this.immediateState);
   };
   handleComplete = (data, replace) => {
-    var _suggestion$caret, _suggestion$caret2, _this$requestData4;
+    var _suggestion$caret, _suggestion$caret2;
     if (!data || !data.data) {
       this.handleApply();
       return;
@@ -615,7 +605,7 @@ class QueryAssist extends Component {
       this.setCaretPosition();
     }
     this.closePopup();
-    (_this$requestData4 = this.requestData) === null || _this$requestData4 === void 0 ? void 0 : _this$requestData4.call(this, true);
+    this.requestData?.(true);
   };
   requestStyleRanges = () => {
     const {
@@ -685,8 +675,8 @@ class QueryAssist extends Component {
     const completionStartNode = inputChildren && typeof completionStart === 'number' && inputChildren[Math.min(completionStart, inputChildren.length - 1)];
     let offset = completionStartNode && getRect(completionStartNode).right - getRect(this.input).left;
     if (!offset) {
-      var _this$caret$getOffset, _this$caret9;
-      const caret = (_this$caret$getOffset = (_this$caret9 = this.caret) === null || _this$caret9 === void 0 ? void 0 : _this$caret9.getOffset()) !== null && _this$caret$getOffset !== void 0 ? _this$caret$getOffset : 0;
+      var _this$caret$getOffset;
+      const caret = (_this$caret$getOffset = this.caret?.getOffset()) !== null && _this$caret$getOffset !== void 0 ? _this$caret$getOffset : 0;
       // Do not compensate caret in the beginning of field
       if (caret === 0) {
         return minOffset;
@@ -700,8 +690,7 @@ class QueryAssist extends Component {
   handleCtrlSpace = e => {
     preventDefault(e);
     if (!this.state.showPopup) {
-      var _this$requestData5;
-      (_this$requestData5 = this.requestData) === null || _this$requestData5 === void 0 ? void 0 : _this$requestData5.call(this);
+      this.requestData?.();
     }
   };
   trackPopupMouseState = e => {
@@ -737,8 +726,7 @@ class QueryAssist extends Component {
   blurInput() {
     this.immediateState.selection = null;
     if (!this.props.focus) {
-      var _this$caret10;
-      (_this$caret10 = this.caret) === null || _this$caret10 === void 0 ? void 0 : _this$caret10.target.blur();
+      this.caret?.target.blur();
     }
   }
   /**
@@ -885,14 +873,14 @@ class QueryAssist extends Component {
       actions.push( /*#__PURE__*/React.createElement(I18nContext.Consumer, {
         key: 'clearAction'
       }, _ref6 => {
-        var _this$props$translati, _this$props$translati2;
+        var _this$props$translati;
         let {
           translate
         } = _ref6;
         return /*#__PURE__*/React.createElement(Button, {
           icon: closeIcon,
           className: modules_da7ab055.clear,
-          title: (_this$props$translati = (_this$props$translati2 = this.props.translations) === null || _this$props$translati2 === void 0 ? void 0 : _this$props$translati2.clearTitle) !== null && _this$props$translati !== void 0 ? _this$props$translati : translate('clearTitle'),
+          title: (_this$props$translati = this.props.translations?.clearTitle) !== null && _this$props$translati !== void 0 ? _this$props$translati : translate('clearTitle'),
           ref: this.clearRef,
           onClick: this.clearQuery,
           "data-test": "query-assist-clear-icon"
@@ -950,7 +938,7 @@ class QueryAssist extends Component {
       }), renderGlass && !huge && /*#__PURE__*/React.createElement(Icon, {
         glyph: searchIcon,
         className: modules_da7ab055.icon,
-        title: (_translations$searchT = translations === null || translations === void 0 ? void 0 : translations.searchTitle) !== null && _translations$searchT !== void 0 ? _translations$searchT : translate('searchTitle'),
+        title: (_translations$searchT = translations?.searchTitle) !== null && _translations$searchT !== void 0 ? _translations$searchT : translate('searchTitle'),
         ref: this.glassRef,
         "data-test": "query-assist-search-icon"
       }), renderLoader && /*#__PURE__*/React.createElement("div", {
@@ -960,7 +948,7 @@ class QueryAssist extends Component {
         }),
         ref: this.loaderRef
       }, /*#__PURE__*/React.createElement(LoaderInline, null)), /*#__PURE__*/React.createElement(ContentEditable, {
-        "aria-label": (_translations$searchT2 = translations === null || translations === void 0 ? void 0 : translations.searchTitle) !== null && _translations$searchT2 !== void 0 ? _translations$searchT2 : translate('searchTitle'),
+        "aria-label": (_translations$searchT2 = translations?.searchTitle) !== null && _translations$searchT2 !== void 0 ? _translations$searchT2 : translate('searchTitle'),
         className: inputClasses,
         "data-test": "ring-query-assist-input",
         inputRef: this.inputRef,
@@ -1013,7 +1001,7 @@ class QueryAssist extends Component {
       }, /*#__PURE__*/React.createElement(Icon, {
         glyph: searchIcon,
         className: modules_da7ab055.rightSearchIcon,
-        title: (_translations$searchT3 = translations === null || translations === void 0 ? void 0 : translations.searchTitle) !== null && _translations$searchT3 !== void 0 ? _translations$searchT3 : translate('searchTitle'),
+        title: (_translations$searchT3 = translations?.searchTitle) !== null && _translations$searchT3 !== void 0 ? _translations$searchT3 : translate('searchTitle'),
         onClick: this.handleApply,
         ref: this.glassRef,
         "data-test": "query-assist-search-icon"