@jetbrains/ring-ui 4.2.5 → 4.2.6

package/components/list/list.js

@@ -178,17 +178,8 @@ export default class List extends Component {
     document.addEventListener('mousemove', this.onDocumentMouseMove);
     document.addEventListener('keydown', this.onDocumentKeyDown, true);
 
-    const {data, activeIndex} = this.props;
-
-    if (activeIndex == null && shouldActivateFirstItem(this.props)) {
-      const firstActivatableIndex = data.findIndex(isActivatable);
-      if (firstActivatableIndex >= 0) {
-        this.setState({
-          activeIndex: firstActivatableIndex,
-          activeItem: data[firstActivatableIndex],
-          needScrollToActive: true
-        });
-      }
+    if (this.props.activeIndex == null && shouldActivateFirstItem(this.props)) {
+      this.activateFirst();
     }
   }
 
@@ -202,6 +193,13 @@ export default class List extends Component {
       this.virtualizedList.recomputeRowHeights();
     }
 
+    if (this.props.activeIndex == null &&
+      this.props.data !== prevProps.data &&
+      shouldActivateFirstItem(this.props)
+    ) {
+      this.activateFirst();
+    }
+
     this.checkOverflow();
   }
 
@@ -277,6 +275,17 @@ export default class List extends Component {
     return this._hasActivatableItems(this.props.data);
   }
 
+  activateFirst = () => {
+    const firstActivatableIndex = this.props.data.findIndex(isActivatable);
+    if (firstActivatableIndex >= 0) {
+      this.setState({
+        activeIndex: firstActivatableIndex,
+        activeItem: this.props.data[firstActivatableIndex],
+        needScrollToActive: true
+      });
+    }
+  };
+
   selectHandler = memoize(index => (event, tryKeepOpen = false) => {
     const item = this.props.data[index];
     if (!this.props.useMouseUp && item.onClick) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "4.2.5",
+  "version": "4.2.6",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",
@@ -221,5 +221,5 @@
     "node": ">=7.4",
     "npm": ">=6.0.0"
   },
-  "gitHead": "166a04127254a13a22454b41347d43cbc9ebe2d2"
+  "gitHead": "2859a8356ddd35e59398fb36699866f786126b2a"
 }