@jetbrains/ring-ui 4.1.22 → 4.1.25

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

@@ -87,7 +87,6 @@ export default class DatePopup extends Component {
       if (this.state.text && prevState.active) {
         this.confirm(prevState.active);
       }
-      // eslint-disable-next-line react/no-did-update-set-state
       this.setState({text: null});
     }
   }

package/components/popup/popup.js

@@ -59,6 +59,7 @@ export default class Popup extends PureComponent {
 
     directions: PropTypes.arrayOf(PropTypes.string),
     autoPositioning: PropTypes.bool,
+    autoPositioningOnScroll: PropTypes.bool,
     autoCorrectTopOverflow: PropTypes.bool,
     left: PropTypes.number,
     top: PropTypes.number,
@@ -91,6 +92,7 @@ export default class Popup extends PureComponent {
 
     directions: DEFAULT_DIRECTIONS,
     autoPositioning: true,
+    autoPositioningOnScroll: true,
     autoCorrectTopOverflow: true,
     left: 0,
     top: 0,
@@ -110,7 +112,6 @@ export default class Popup extends PureComponent {
 
   componentDidMount() {
     if (!this.props.client) {
-      // eslint-disable-next-line react/no-did-mount-set-state
       this.setState({client: true});
     }
     if (!this.props.hidden) {
@@ -250,7 +251,9 @@ export default class Popup extends PureComponent {
       setTimeout(() => {
         this._listenersEnabled = true;
         this.listeners.add(window, 'resize', this._redraw);
-        this.listeners.add(window, 'scroll', this._redraw);
+        if (this.props.autoPositioningOnScroll) {
+          this.listeners.add(window, 'scroll', this._redraw);
+        }
         this.listeners.add(document, 'pointerdown', this._onDocumentClick, true);
         let el = this._getAnchor();
         while (el) {

package/components/select/select.js

@@ -264,6 +264,7 @@ export default class Select extends Component {
     disabled: PropTypes.bool,
     hideSelected: PropTypes.bool,
     label: PropTypes.string,
+    renderBottomToolbar: PropTypes.func,
     selectedLabel: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.arrayOf(PropTypes.node),
@@ -667,9 +668,9 @@ export default class Select extends Component {
   };
 
   getToolbar() {
-    const {hint} = this.props;
+    const {hint, renderBottomToolbar} = this.props;
     const {prefix, label, delayed} = this.state.addButton || {};
-    const isToolbarHasElements = this.state.addButton || hint;
+    const isToolbarHasElements = this.state.addButton || hint || renderBottomToolbar;
     if (!isToolbarHasElements) {
       return null;
     }
@@ -677,10 +678,11 @@ export default class Select extends Component {
     return (
       <div
         className={classNames({
-          [styles.toolbar]: !!this.state.addButton
+          [styles.toolbar]: Boolean(this.state.addButton || renderBottomToolbar)
         })}
         data-test="ring-select-toolbar"
       >
+        {renderBottomToolbar && renderBottomToolbar()}
         {this.state.addButton && (
           <Button
             text

package/components/tag/tag.js

@@ -48,7 +48,6 @@ export default class Tag extends PureComponent {
 
   componentDidUpdate(prevProps) {
     if (this.props.focused !== prevProps.focused) {
-      // eslint-disable-next-line react/no-did-update-set-state
       this.setState({focused: this.props.focused});
     }
     if (this.state.focused) {

package/dist/date-picker/date-popup.js

@@ -227,8 +227,7 @@ class DatePopup extends Component {
     if (this.state.active !== prevState.active) {
       if (this.state.text && prevState.active) {
         this.confirm(prevState.active);
-      } // eslint-disable-next-line react/no-did-update-set-state
-
+      }
 
       this.setState({
         text: null

package/dist/popup/popup.js

@@ -137,7 +137,6 @@ class Popup extends PureComponent {
 
   componentDidMount() {
     if (!this.props.client) {
-      // eslint-disable-next-line react/no-did-mount-set-state
       this.setState({
         client: true
       });
@@ -213,7 +212,11 @@ class Popup extends PureComponent {
       setTimeout(() => {
         this._listenersEnabled = true;
         this.listeners.add(window, 'resize', this._redraw);
-        this.listeners.add(window, 'scroll', this._redraw);
+
+        if (this.props.autoPositioningOnScroll) {
+          this.listeners.add(window, 'scroll', this._redraw);
+        }
+
         this.listeners.add(document, 'pointerdown', this._onDocumentClick, true);
 
         let el = this._getAnchor();
@@ -336,6 +339,7 @@ _defineProperty(Popup, "propTypes", {
   // true means that it's never used in SSR
   directions: PropTypes.arrayOf(PropTypes.string),
   autoPositioning: PropTypes.bool,
+  autoPositioningOnScroll: PropTypes.bool,
   autoCorrectTopOverflow: PropTypes.bool,
   left: PropTypes.number,
   top: PropTypes.number,
@@ -370,6 +374,7 @@ _defineProperty(Popup, "defaultProps", {
   keepMounted: false,
   directions: DEFAULT_DIRECTIONS,
   autoPositioning: true,
+  autoPositioningOnScroll: true,
   autoCorrectTopOverflow: true,
   left: 0,
   top: 0,

package/dist/select/select.js

@@ -899,14 +899,15 @@ class Select extends Component {
 
   getToolbar() {
     const {
-      hint
+      hint,
+      renderBottomToolbar
     } = this.props;
     const {
       prefix,
       label,
       delayed
     } = this.state.addButton || {};
-    const isToolbarHasElements = this.state.addButton || hint;
+    const isToolbarHasElements = this.state.addButton || hint || renderBottomToolbar;
 
     if (!isToolbarHasElements) {
       return null;
@@ -914,10 +915,10 @@ class Select extends Component {
 
     return /*#__PURE__*/React.createElement("div", {
       className: classNames({
-        [modules_9d0de074.toolbar]: !!this.state.addButton
+        [modules_9d0de074.toolbar]: Boolean(this.state.addButton || renderBottomToolbar)
       }),
       "data-test": "ring-select-toolbar"
-    }, this.state.addButton && /*#__PURE__*/React.createElement(Button, {
+    }, renderBottomToolbar && renderBottomToolbar(), this.state.addButton && /*#__PURE__*/React.createElement(Button, {
       text: true,
       delayed: delayed,
       className: classNames(modules_9d0de074.button, modules_9d0de074.buttonSpaced),
@@ -1261,6 +1262,7 @@ _defineProperty(Select, "propTypes", {
   disabled: PropTypes.bool,
   hideSelected: PropTypes.bool,
   label: PropTypes.string,
+  renderBottomToolbar: PropTypes.func,
   selectedLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
   inputPlaceholder: PropTypes.string,
   clear: PropTypes.bool,

package/dist/tag/tag.js

@@ -47,7 +47,6 @@ class Tag extends PureComponent {
 
   componentDidUpdate(prevProps) {
     if (this.props.focused !== prevProps.focused) {
-      // eslint-disable-next-line react/no-did-update-set-state
       this.setState({
         focused: this.props.focused
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.1.22",
+  "version": "4.1.25",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -67,14 +67,14 @@
   },
   "readmeFilename": "README.md",
   "devDependencies": {
-    "@babel/cli": "^7.17.0",
+    "@babel/cli": "^7.17.6",
     "@babel/eslint-parser": "^7.17.0",
-    "@jetbrains/eslint-config": "^5.3.1",
-    "@jetbrains/generator-ring-ui": "^4.1.6",
+    "@jetbrains/eslint-config": "^5.3.2",
+    "@jetbrains/generator-ring-ui": "^4.1.8",
     "@jetbrains/stylelint-config": "^3.0.2",
-    "@primer/octicons": "^16.3.1",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-replace": "^3.1.0",
+    "@primer/octicons": "^17.0.0",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-replace": "^4.0.0",
     "@storybook/addon-a11y": "6.4.19",
     "@storybook/addon-docs": "6.4.19",
     "@storybook/addon-essentials": "6.4.19",
@@ -85,11 +85,11 @@
     "@storybook/builder-webpack5": "6.4.19",
     "@storybook/client-api": "6.4.19",
     "@storybook/core": "6.4.19",
-    "@storybook/html": "6.4.18",
+    "@storybook/html": "6.4.19",
     "@storybook/manager-webpack5": "^6.4.19",
     "@storybook/source-loader": "6.4.19",
     "@storybook/theming": "6.4.19",
-    "@testing-library/react": "^12.1.3",
+    "@testing-library/react": "^12.1.4",
     "@testing-library/user-event": "^13.5.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
     "angular": "^1.8.2",
@@ -104,13 +104,13 @@
     "cheerio": "^0.22.0",
     "core-js": "^3.21.1",
     "enzyme": "^3.11.0",
-    "eslint": "^8.9.0",
+    "eslint": "^8.11.0",
     "eslint-import-resolver-webpack": "^0.13.2",
     "eslint-plugin-angular": "^4.1.0",
     "eslint-plugin-bdd": "^2.1.1",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-react": "^7.29.4",
     "events": "^3.3.0",
     "glob": "^7.2.0",
     "html-webpack-plugin": "^5.5.0",
@@ -119,35 +119,35 @@
     "imports-loader": "^3.1.1",
     "jest": "~27.5.1",
     "jest-teamcity": "^1.10.0",
-    "karma": "^6.3.16",
-    "karma-chrome-launcher": "3.1.0",
+    "karma": "^6.3.17",
+    "karma-chrome-launcher": "3.1.1",
     "karma-mocha": "^2.0.1",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-teamcity-reporter": "^2.0.0",
     "karma-webpack": "^5.0.0",
     "lerna": "^4.0.0",
-    "lint-staged": "^12.3.4",
+    "lint-staged": "^12.3.6",
     "merge-options": "^3.0.4",
-    "mocha": "^9.2.0",
+    "mocha": "^9.2.2",
     "pinst": "^3.0.0",
-    "puppeteer": "^13.3.2",
+    "puppeteer": "^13.5.1",
     "raw-loader": "^4.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "regenerator-runtime": "^0.13.9",
-    "rollup": "^2.67.2",
+    "rollup": "^2.70.1",
     "rollup-plugin-clear": "^2.0.7",
     "rollup-plugin-styles": "^4.0.0",
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "storage-mock": "^2.1.0",
-    "stylelint": "^14.5.1",
+    "stylelint": "^14.5.3",
     "svg-inline-loader": "^0.8.2",
     "teamcity-service-messages": "^0.1.12",
     "terser-webpack-plugin": "^5.3.1",
     "wallaby-webpack": "^3.9.16",
-    "webpack": "^5.69.1",
+    "webpack": "^5.70.0",
     "webpack-cli": "^4.9.2",
     "xmlappend": "^1.0.4",
     "yo": "^4.3.0"
@@ -156,7 +156,7 @@
     "core-js": ">=3.0.0",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
-    "webpack": "^5.69.1"
+    "webpack": "^5.70.0"
   },
   "peerDependenciesMeta": {
     "webpack": {
@@ -164,7 +164,7 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.17.7",
     "@jetbrains/angular-elastic": "^2.5.1",
     "@jetbrains/babel-preset-jetbrains": "^2.3.2",
     "@jetbrains/icons": "^3.18.0",
@@ -179,7 +179,7 @@
     "combokeys": "^3.0.1",
     "compile-code-loader": "^1.0.0",
     "conic-gradient": "^1.0.0",
-    "css-loader": "^6.6.0",
+    "css-loader": "^6.7.1",
     "date-fns": "^2.28.0",
     "deep-equal": "^2.0.4",
     "element-resize-detector": "^1.2.4",
@@ -195,16 +195,16 @@
     "interpolate-loader": "^2.0.1",
     "just-debounce-it": "^3.0.1",
     "memoize-one": "^6.0.0",
-    "postcss": "^8.4.6",
+    "postcss": "^8.4.12",
     "postcss-calc": "^8.2.4",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-font-family-system-ui": "^5.0.0",
     "postcss-loader": "^6.2.1",
     "postcss-modules-values-replace": "^3.4.0",
-    "postcss-preset-env": "^7.4.1",
+    "postcss-preset-env": "^7.4.2",
     "prop-types": "^15.8.1",
     "react-markdown": "^5.0.3",
-    "react-movable": "^3.0.2",
+    "react-movable": "^3.0.4",
     "react-virtualized": "^9.22.3",
     "react-waypoint": "^10.1.0",
     "remark-breaks": "^3.0.2",
@@ -221,5 +221,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "1bbc023385982764d08a1ab9bac4912156fba25a"
+  "gitHead": "d52f95d73b992b26ac69526b0ee3898e0e4ff9f3"
 }