@jetbrains/ring-ui 4.1.7 → 4.1.8

package/components/auth-dialog/auth-dialog.examples.js

@@ -1,14 +1,13 @@
 import React from 'react';
 
+import youtrackLogo from '!file-loader!@jetbrains/logos/youtrack/youtrack.svg';
+
 import reactDecorator from '../../.storybook/react-decorator';
 
 import Button from '@jetbrains/ring-ui/components/button/button';
 
 import AuthDialog from '@jetbrains/ring-ui/components/auth-dialog/auth-dialog';
 
-import youtrackLogo from '!file-loader!@jetbrains/logos/youtrack/youtrack.svg';
-
-
 export default {
   title: 'Components/Auth Dialog',
   decorators: [reactDecorator()],

package/components/select/select.js

@@ -727,9 +727,9 @@ export default class Select extends Component {
     return isInputMode(this.props.type);
   }
 
-  _clickHandler = (forceShowPopup = false) => {
+  _clickHandler = () => {
     if (!this.props.disabled) {
-      if (this.state.showPopup && !forceShowPopup) {
+      if (this.state.showPopup) {
         this._hidePopup();
       } else {
         this.props.onBeforeOpen();
@@ -738,6 +738,14 @@ export default class Select extends Component {
     }
   };
 
+  _openPopupIfClosed = () => {
+    if (this.props.disabled || this.state.showPopup) {
+      return;
+    }
+    this.props.onBeforeOpen();
+    this._showPopup();
+  };
+
   _filterChangeHandler = e => {
     this._setFilter(e.target.value, e);
   };

package/components/select-ng/select-ng__lazy.js

@@ -59,12 +59,10 @@ class SelectLazy {
     this.detachEvents();
     if (this.type === 'dropdown') {
       this.ctrl.selectInstance = render(this.reactSelect, this.container);
-      // In "dropdown" mode we don't click select itself, so need to force click handler
-      this.ctrl.selectInstance._clickHandler();
     } else {
       this.ctrl.selectInstance = hydrate(this.reactSelect, this.container);
-      this.ctrl.selectInstance._clickHandler(true);
     }
+    this.ctrl.selectInstance._openPopupIfClosed();
   }
 }
 

package/dist/select/select.js

@@ -379,20 +379,28 @@ class Select extends Component {
 
     _defineProperty(this, "doesLabelMatch", doesLabelMatch);
 
-    _defineProperty(this, "_clickHandler", function () {
-      let forceShowPopup = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-
-      if (!_this.props.disabled) {
-        if (_this.state.showPopup && !forceShowPopup) {
-          _this._hidePopup();
+    _defineProperty(this, "_clickHandler", () => {
+      if (!this.props.disabled) {
+        if (this.state.showPopup) {
+          this._hidePopup();
         } else {
-          _this.props.onBeforeOpen();
+          this.props.onBeforeOpen();
 
-          _this._showPopup();
+          this._showPopup();
         }
       }
     });
 
+    _defineProperty(this, "_openPopupIfClosed", () => {
+      if (this.props.disabled || this.state.showPopup) {
+        return;
+      }
+
+      this.props.onBeforeOpen();
+
+      this._showPopup();
+    });
+
     _defineProperty(this, "_filterChangeHandler", e => {
       this._setFilter(e.target.value, e);
     });

package/dist/select-ng/select-ng__lazy.js

@@ -137,14 +137,12 @@ class SelectLazy {
     this.detachEvents();
 
     if (this.type === 'dropdown') {
-      this.ctrl.selectInstance = render(this.reactSelect, this.container); // In "dropdown" mode we don't click select itself, so need to force click handler
-
-      this.ctrl.selectInstance._clickHandler();
+      this.ctrl.selectInstance = render(this.reactSelect, this.container);
     } else {
       this.ctrl.selectInstance = hydrate(this.reactSelect, this.container);
-
-      this.ctrl.selectInstance._clickHandler(true);
     }
+
+    this.ctrl.selectInstance._openPopupIfClosed();
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -70,7 +70,7 @@
     "@babel/cli": "^7.16.7",
     "@babel/eslint-parser": "^7.16.5",
     "@jetbrains/eslint-config": "^5.3.1",
-    "@jetbrains/generator-ring-ui": "^4.1.3",
+    "@jetbrains/generator-ring-ui": "^4.1.4",
     "@jetbrains/stylelint-config": "^3.0.2",
     "@primer/octicons": "^16.2.0",
     "@rollup/plugin-babel": "^5.3.0",
@@ -108,7 +108,7 @@
     "eslint-import-resolver-webpack": "^0.13.2",
     "eslint-plugin-angular": "^4.1.0",
     "eslint-plugin-bdd": "^2.1.1",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-react": "^7.28.0",
     "events": "^3.3.0",
@@ -117,7 +117,7 @@
     "husky": "^7.0.4",
     "identity-obj-proxy": "^3.0.0",
     "imports-loader": "^3.1.1",
-    "jest": "~27.4.5",
+    "jest": "~27.4.7",
     "jest-teamcity": "^1.10.0",
     "karma": "^6.3.9",
     "karma-chrome-launcher": "3.1.0",
@@ -202,7 +202,7 @@
     "postcss-loader": "^6.2.1",
     "postcss-modules-values-replace": "^3.4.0",
     "postcss-preset-env": "^7.2.0",
-    "prop-types": "^15.8.0",
+    "prop-types": "^15.8.1",
     "react-markdown": "^5.0.3",
     "react-movable": "^3.0.2",
     "react-virtualized": "^9.22.3",
@@ -221,5 +221,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "882b425327661b41b8234af5416e4a7db850addd"
+  "gitHead": "dca1856fa248b940b4375685e61b9e8687317b4d"
 }