@jetbrains/ring-ui 6.0.63 → 6.0.64

package/components/global/focus-sensor-hoc.js

@@ -28,7 +28,8 @@ export default function focusSensorHOC(ComposedComponent) {
         }
         componentDidUpdate(prevProps) {
             const { focused } = this.props;
-            if (focused && !prevProps.focused) {
+            const isInFocus = this.node?.contains(document.activeElement);
+            if (focused && (!isInFocus || !prevProps.focused)) {
                 this.onFocusRestore();
             }
             else if (!focused && prevProps.focused) {

package/components/popup/popup.d.ts

@@ -53,7 +53,6 @@ export interface PopupProps extends BasePopupProps {
 }
 interface PopupState {
     display: Display;
-    client?: boolean;
     direction?: Directions;
 }
 /**
@@ -98,7 +97,6 @@ export default class Popup<P extends BasePopupProps = PopupProps> extends PureCo
     uid: string;
     calculateDisplay: (prevState: PopupState) => {
         display: Display;
-        client?: boolean;
         direction?: Directions;
     };
     static PopupProps: {
@@ -120,6 +118,7 @@ export default class Popup<P extends BasePopupProps = PopupProps> extends PureCo
     private _redraw;
     private _getAnchor;
     private _listenersEnabled?;
+    private _prevTimeout?;
     /**
      * @param {boolean} enable
      * @private

package/components/popup/popup.js

@@ -71,9 +71,6 @@ export default class Popup extends PureComponent {
         display: Display.SHOWING
     };
     componentDidMount() {
-        if (!this.props.client) {
-            this.setState({ client: true });
-        }
         if (!this.props.hidden) {
             this._setListenersEnabled(true);
         }
@@ -195,13 +192,15 @@ export default class Popup extends PureComponent {
         return this.props.anchorElement || this.parent;
     }
     _listenersEnabled;
+    _prevTimeout;
     /**
      * @param {boolean} enable
      * @private
      */
     _setListenersEnabled(enable) {
         if (enable && !this._listenersEnabled) {
-            setTimeout(() => {
+            clearTimeout(this._prevTimeout);
+            this._prevTimeout = window.setTimeout(() => {
                 this._listenersEnabled = true;
                 this.listeners.add(window, 'resize', this._redraw);
                 if (this.props.autoPositioningOnScroll) {
@@ -218,6 +217,7 @@ export default class Popup extends PureComponent {
         }
         if (!enable && this._listenersEnabled) {
             this.listeners.removeAll();
+            clearTimeout(this._prevTimeout);
             this._listenersEnabled = false;
         }
     }
@@ -283,7 +283,7 @@ export default class Popup extends PureComponent {
               {this.shouldUseShortcuts() &&
                         (<Shortcuts map={this.shortcutsMap} scope={this.shortcutsScope}/>)}
 
-              {(client || this.state.client) && (keepMounted || !hidden) && createPortal(<PopupTarget id={this.uid} ref={this.containerRef} onMouseOver={onMouseOver} onFocus={onMouseOver} onMouseOut={onMouseOut} onBlur={onMouseOut} onContextMenu={onContextMenu}>
+              {client !== false && (keepMounted || !hidden) && createPortal(<PopupTarget id={this.uid} ref={this.containerRef} onMouseOver={onMouseOver} onFocus={onMouseOver} onMouseOut={onMouseOut} onBlur={onMouseOut} onContextMenu={onContextMenu}>
                   <div data-test={dataTests('ring-popup', dataTest)} data-test-shown={!hidden && !showing} data-test-direction={direction} ref={this.popupRef} className={classes} style={style} onMouseDown={onMouseDown} onMouseUp={onMouseUp} 
                     // mouse handlers are used to track clicking on inner elements
                     role="presentation">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "6.0.63",
+  "version": "6.0.64",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",