@jetbrains/ring-ui-built 7.0.50-beta.1 → 7.0.51

package/components/old-browsers-message/white-list.js

@@ -1,7 +1,5 @@
 import { b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.parse-int.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.match.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import sniffr from '../global/sniffer.js';
 import 'sniffr';
@@ -10,11 +8,11 @@ const MAJOR_VERSION_INDEX = 0;
 /**
  * SUPPORTED_BROWSERS are defined by Babel plugin, see babel config
  */
-if (!["and_chr 136", "chrome 135", "chrome 134", "chrome 131", "edge 135", "firefox 137", "ios_saf 18.4", "ios_saf 18.3", "safari 18.3", "samsung 27"]) {
+if (!["and_chr 137", "and_ff 139", "and_qq 14.9", "and_uc 15.5", "android 137", "chrome 137", "chrome 136", "chrome 135", "chrome 134", "chrome 133", "chrome 132", "chrome 131", "chrome 130", "chrome 128", "chrome 126", "chrome 125", "chrome 123", "chrome 121", "chrome 109", "edge 137", "edge 136", "edge 135", "firefox 139", "firefox 138", "firefox 137", "firefox 128", "firefox 115", "ios_saf 18.5", "ios_saf 18.4", "ios_saf 18.3", "ios_saf 18.2", "ios_saf 18.1", "ios_saf 18.0", "ios_saf 17.6-17.7", "ios_saf 17.5", "ios_saf 17.4", "ios_saf 16.6-16.7", "ios_saf 16.3", "ios_saf 16.1", "ios_saf 15.6-15.8", "ios_saf 14.0-14.4", "ios_saf 12.2-12.5", "ios_saf 11.0-11.2", "kaios 3.0-3.1", "kaios 2.5", "op_mini all", "op_mob 80", "opera 117", "opera 116", "safari 18.5", "safari 18.4", "safari 18.3", "safari 17.6", "safari 17.1", "safari 16.6", "safari 15.6", "samsung 28", "samsung 27"]) {
   // eslint-disable-next-line no-console
   console.warn('Ring UI: no SUPPORTED_BROWSERS passed. Please check babel config.');
 }
-const SUPPORTED = ["and_chr 136", "chrome 135", "chrome 134", "chrome 131", "edge 135", "firefox 137", "ios_saf 18.4", "ios_saf 18.3", "safari 18.3", "samsung 27"] || [];
+const SUPPORTED = ["and_chr 137", "and_ff 139", "and_qq 14.9", "and_uc 15.5", "android 137", "chrome 137", "chrome 136", "chrome 135", "chrome 134", "chrome 133", "chrome 132", "chrome 131", "chrome 130", "chrome 128", "chrome 126", "chrome 125", "chrome 123", "chrome 121", "chrome 109", "edge 137", "edge 136", "edge 135", "firefox 139", "firefox 138", "firefox 137", "firefox 128", "firefox 115", "ios_saf 18.5", "ios_saf 18.4", "ios_saf 18.3", "ios_saf 18.2", "ios_saf 18.1", "ios_saf 18.0", "ios_saf 17.6-17.7", "ios_saf 17.5", "ios_saf 17.4", "ios_saf 16.6-16.7", "ios_saf 16.3", "ios_saf 16.1", "ios_saf 15.6-15.8", "ios_saf 14.0-14.4", "ios_saf 12.2-12.5", "ios_saf 11.0-11.2", "kaios 3.0-3.1", "kaios 2.5", "op_mini all", "op_mob 80", "opera 117", "opera 116", "safari 18.5", "safari 18.4", "safari 18.3", "safari 17.6", "safari 17.1", "safari 16.6", "safari 15.6", "samsung 28", "samsung 27"] || [];
 const WHITE_LISTED_BROWSERS = ['chrome', 'firefox', 'safari', 'edge'];
 const WHITE_LIST = SUPPORTED.reduce((acc, item) => {
   var _item$match;

package/components/pager/pager.js

@@ -23,15 +23,10 @@ import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.replace.js';
-import 'core-js/modules/es.string.starts-with.js';
-import 'core-js/modules/es.weak-map.js';
-import 'core-js/modules/es.promise.js';
-import 'core-js/modules/es.string.split.js';
 import '../global/data-tests.js';
 import '../control-label/control-label.js';
 import '../control-help/control-help.js';
 import '../_helpers/caption.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.string.trim.js';
 import '@jetbrains/icons/close-12px';
 import 'dequal';
@@ -39,15 +34,12 @@ import '../dropdown/dropdown.js';
 import '../global/typescript-utils.js';
 import '../_helpers/anchor.js';
 import '../avatar/avatar.js';
-import 'core-js/modules/es.string.includes.js';
 import '../global/url.js';
-import 'core-js/modules/es.string.match.js';
 import '../global/dom.js';
 import '../_helpers/avatar-info.js';
 import '../avatar/avatar-size.js';
 import '../avatar/fallback-avatar.js';
 import '../global/get-uid.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import '../popup/popup.js';
 import 'react-dom';
 import '../global/schedule-raf.js';

package/components/panel/panel.js

@@ -3,7 +3,7 @@ import { jsx } from 'react/jsx-runtime';
 import { PureComponent } from 'react';
 import classNames from 'classnames';
 
-var styles = {"panel":"ring-panel-panel ring-dialog-panel"};
+var styles = {"panel":"ring-panel-panel"};
 
 const _excluded = ["className", "children"];
 /**

package/components/permissions/permissions.js

@@ -1,5 +1,4 @@
 import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.promise.js';
 import PermissionCache from './permissions__cache.js';
 
 /**

package/components/popup/popup.js

@@ -1,6 +1,5 @@
 import { _ as _defineProperty, b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
@@ -16,11 +15,7 @@ import TabTrap from '../tab-trap/tab-trap.js';
 import position from './position.js';
 import { DEFAULT_DIRECTIONS, MaxHeight, MinWidth, Dimension, Directions, Display } from './popup.consts.js';
 import { PopupTargetContext, PopupTarget } from './popup.target.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.string.split.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';

package/components/popup/position.js

@@ -1,11 +1,8 @@
 import { b as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.sort.js';
-import 'core-js/modules/es.string.includes.js';
 import { getRect, isMounted, getDocumentScrollLeft, getDocumentScrollTop, getWindowHeight } from '../global/dom.js';
 import { MaxHeight, Dimension, MinWidth, Directions } from './popup.consts.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 
 function getScrollingCoordinates(container) {

package/components/popup-menu/popup-menu.js

@@ -1,11 +1,9 @@
 import { _ as _defineProperty, b as _objectSpread2, a as _objectWithoutProperties } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.parse-float.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import { jsx } from 'react/jsx-runtime';
 import Popup from '../popup/popup.js';
 import List from '../list/list.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'core-js/modules/es.string.replace.js';
 import 'react';
 import 'react-dom';
@@ -13,12 +11,8 @@ import 'classnames';
 import '../global/get-uid.js';
 import '../global/schedule-raf.js';
 import '../global/dom.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.string.split.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
@@ -37,7 +31,6 @@ import 'react-virtualized/dist/es/CellMeasurer';
 import 'util-deprecate';
 import 'memoize-one';
 import '../global/memoize.js';
-import 'core-js/modules/es.weak-map.js';
 import '../global/create-stateful-context.js';
 import '../list/list__item.js';
 import '../avatar/avatar.js';
@@ -51,7 +44,6 @@ import '@jetbrains/icons/remove-12px';
 import '../icon/icon.js';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../global/composeRefs.js';
 import '../control-help/control-help.js';
 import '../link/link.js';

package/components/query-assist/query-assist.js

@@ -1,7 +1,5 @@
 import { _ as _defineProperty, a as _objectWithoutProperties } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.symbol.description.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.promise.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
@@ -27,17 +25,13 @@ import { ControlsHeightContext, ControlsHeight } from '../global/controls-height
 import { S as Size, i as inputStyles } from '../_helpers/input.js';
 import { I18nContext } from '../i18n/i18n-context.js';
 import { Q as QueryAssistSuggestions, s as styles } from '../_helpers/query-assist__suggestions.js';
-import 'core-js/modules/es.regexp.to-string.js';
-import 'core-js/modules/es.string.split.js';
 import 'react-dom/server';
-import 'core-js/modules/es.parse-float.js';
 import '../popup/popup.js';
 import 'react-dom';
 import '../global/schedule-raf.js';
 import '../tab-trap/tab-trap.js';
 import '../popup/position.js';
 import 'core-js/modules/es.array.sort.js';
-import 'core-js/modules/es.string.includes.js';
 import '../popup/popup.consts.js';
 import '../popup/popup.target.js';
 import '../list/list.js';
@@ -49,12 +43,10 @@ import 'react-virtualized/dist/es/CellMeasurer';
 import 'util-deprecate';
 import 'memoize-one';
 import '../global/memoize.js';
-import 'core-js/modules/es.weak-map.js';
 import '../global/create-stateful-context.js';
 import '../list/list__item.js';
 import '../avatar/avatar.js';
 import '../global/url.js';
-import 'core-js/modules/es.string.match.js';
 import '../_helpers/avatar-info.js';
 import '../avatar/avatar-size.js';
 import '../avatar/fallback-avatar.js';
@@ -71,7 +63,6 @@ import '../list/consts.js';
 import '../list/list__classes.js';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../list/list__custom.js';
 import '../global/get-event-key.js';
 import '../list/list__title.js';

package/components/query-assist/query-assist__suggestions.js

@@ -3,8 +3,6 @@ import 'react/jsx-runtime';
 import '../list/list.js';
 export { Q as default } from '../_helpers/query-assist__suggestions.js';
 import '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.trim.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import 'react';
@@ -17,16 +15,12 @@ import 'util-deprecate';
 import 'memoize-one';
 import '../global/data-tests.js';
 import '../global/get-uid.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import '../global/schedule-raf.js';
 import '../global/memoize.js';
-import 'core-js/modules/es.weak-map.js';
 import '../global/dom.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.split.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
@@ -44,7 +38,6 @@ import '@jetbrains/icons/remove-12px';
 import '../icon/icon.js';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../global/composeRefs.js';
 import '../control-help/control-help.js';
 import '../link/link.js';

package/components/radio/radio.js

@@ -4,7 +4,6 @@ import { jsx } from 'react/jsx-runtime';
 import { Component } from 'react';
 import getUID from '../global/get-uid.js';
 import RadioItem, { RadioContext } from './radio__item.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'classnames';
 import '../control-help/control-help.js';
 

package/components/radio/radio__item.js

@@ -5,7 +5,6 @@ import { forwardRef, createContext, Component } from 'react';
 import classNames from 'classnames';
 import getUID from '../global/get-uid.js';
 import ControlHelp from '../control-help/control-help.js';
-import 'core-js/modules/es.regexp.to-string.js';
 
 var styles = {"radio":"ring-radio-radio","circle":"ring-radio-circle","input":"ring-radio-input","focus":"ring-radio-focus","label":"ring-radio-label"};
 

package/components/select/select.d.ts

@@ -138,7 +138,7 @@ export interface SelectState<T = unknown> {
     data: SelectItem<T>[];
     shownData: SelectItem<T>[];
     selected: SelectItem<T> | SelectItem<T>[] | null | undefined;
-    selectedIndex: number | null;
+    lastInteractedKey: string | number | null;
     filterValue: string;
     shortcutsEnabled: boolean;
     popupShortcuts: boolean;
@@ -226,7 +226,7 @@ export default class Select<T = unknown> extends Component<SelectProps<T>, Selec
     private _onEsc;
     _inputShortcutHandler: () => void;
     getValueForFilter(selected: SelectItem<T> | readonly SelectItem<T>[] | null | undefined): string;
-    _getSelectedIndex(selected: SelectItem<T> | readonly SelectItem<T>[] | null | undefined, data: readonly SelectItem<T>[]): number | null;
+    private _getActiveIndex;
     popupRef: (el: SelectPopup<SelectItemData<T>> | null) => void;
     _getResetOption(): SelectItem<T> | null;
     _prependResetOption(shownData: SelectItem<T>[]): SelectItem<T>[];

package/components/select/select.js

@@ -1,5 +1,4 @@
 import { _ as _defineProperty, b as _objectSpread2, a as _objectWithoutProperties, d as _toPropertyKey } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.replace.js';
 import 'core-js/modules/es.string.trim.js';
@@ -35,18 +34,12 @@ import 'util-deprecate';
 import '../icon/icon.js';
 import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
-import 'core-js/modules/es.string.starts-with.js';
-import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../_helpers/button__classes.js';
-import 'core-js/modules/es.string.includes.js';
 import '../global/url.js';
-import 'core-js/modules/es.string.match.js';
 import '../global/dom.js';
-import 'core-js/modules/es.string.split.js';
 import '../_helpers/avatar-info.js';
 import '../avatar/fallback-avatar.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'react-dom';
 import '../global/schedule-raf.js';
 import '../tab-trap/tab-trap.js';
@@ -196,22 +189,6 @@ function getListItems(props, state, rawFilterString) {
     addButton
   };
 }
-function getSelectedIndex(selected, data) {
-  const firstSelected = Array.isArray(selected) ? selected[0] : selected;
-  if (firstSelected == null) {
-    return null;
-  }
-  for (let i = 0; i < data.length; i++) {
-    const item = data[i];
-    if (item.key === undefined) {
-      continue;
-    }
-    if (item.key === firstSelected.key) {
-      return i;
-    }
-  }
-  return null;
-}
 const getItemLabel = _ref => {
   let {
     selectedLabel,
@@ -223,16 +200,6 @@ const getItemLabel = _ref => {
   return typeof label === 'string' ? label : '';
 };
 const getValueForFilter = (selected, type, filterValue) => selected && !isArray(selected) && isInputMode(type) ? getItemLabel(selected) : filterValue;
-function isSameSelected(prevSelected, selected) {
-  if (!prevSelected || !selected || prevSelected.length !== selected.length) {
-    return false;
-  }
-  const keysMap = selected.reduce((result, item) => {
-    result[item.key] = true;
-    return result;
-  }, {});
-  return prevSelected.every(it => keysMap[it.key]);
-}
 /**
  * @name Select
  * @constructor
@@ -250,7 +217,7 @@ class Select extends Component {
       data: [],
       shownData: [],
       selected: this.props.multiple ? [] : null,
-      selectedIndex: null,
+      lastInteractedKey: null,
       filterValue: this.props.filter && typeof this.props.filter === 'object' && this.props.filter.value || '',
       shortcutsEnabled: false,
       popupShortcuts: false,
@@ -364,7 +331,8 @@ class Select extends Component {
       if (this.node && this.state.showPopup) {
         this.setState(prevState => ({
           showPopup: false,
-          filterValue: this.props.allowAny ? prevState.filterValue : ''
+          filterValue: this.props.allowAny ? prevState.filterValue : '',
+          lastInteractedKey: null
         }));
         if (tryFocusAnchor) {
           this.focus();
@@ -414,8 +382,7 @@ class Select extends Component {
           label: filterValue
         };
         this.setState({
-          selected: filterValue === '' ? null : fakeSelected,
-          selectedIndex: null
+          selected: filterValue === '' ? null : fakeSelected
         }, () => {
           this.props.onSelect(fakeSelected, event);
           this.props.onChange(fakeSelected, event);
@@ -442,7 +409,7 @@ class Select extends Component {
       }
     });
     _defineProperty(this, "_listSelectHandler", function (selected, event) {
-      var _this$props$tryKeepOp;
+      var _selected$key, _this$props$tryKeepOp;
       let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       const isItem = item => List.isItemType(List.ListProps.Type.ITEM, item);
       const isCustomItem = item => List.isItemType(List.ListProps.Type.CUSTOM, item);
@@ -453,14 +420,16 @@ class Select extends Component {
       if (!isItem(selected) && !isCustomItem(selected) || selected.disabled || selected.isResetItem) {
         return;
       }
+      const lastInteractedKey = (_selected$key = selected === null || selected === void 0 ? void 0 : selected.key) !== null && _selected$key !== void 0 ? _selected$key : null;
       const tryKeepOpen = (_this$props$tryKeepOp = _this.props.tryKeepOpen) !== null && _this$props$tryKeepOp !== void 0 ? _this$props$tryKeepOp : opts.tryKeepOpen;
       if (!_this.props.multiple) {
+        var _selected$key2;
         if (!tryKeepOpen) {
           _this._hidePopup(isSelectItemEvent);
         }
         _this.setState({
           selected,
-          selectedIndex: _this._getSelectedIndex(selected, _this.props.data)
+          lastInteractedKey: (_selected$key2 = selected === null || selected === void 0 ? void 0 : selected.key) !== null && _selected$key2 !== void 0 ? _selected$key2 : null
         }, () => {
           const newFilterValue = _this.isInputMode() && !_this.props.hideSelected ? getItemLabel(selected) : '';
           _this.filterValue(newFilterValue);
@@ -486,7 +455,7 @@ class Select extends Component {
           const nextState = {
             filterValue: '',
             selected: nextSelection,
-            selectedIndex: _this._getSelectedIndex(selected, _this.props.data)
+            lastInteractedKey: tryKeepOpen ? lastInteractedKey : null
           };
           if (typeof _this.props.multiple === 'object' && _this.props.multiple.limit && nextSelection.length === _this.props.multiple.limit) {
             nextState.shownData = prevState.shownData.map(item => nextSelection.find(selectedItem => selectedItem.key === item.key) ? item : _objectSpread2(_objectSpread2({}, item), {}, {
@@ -499,11 +468,11 @@ class Select extends Component {
             });
           } else {
             const _prevState$multipleMa = prevState.multipleMap,
-              _selected$key = selected.key,
+              _selected$key3 = selected.key,
               {
-                [_selected$key]: _
+                [_selected$key3]: _
               } = _prevState$multipleMa,
-              restMultipleMap = _objectWithoutProperties(_prevState$multipleMa, [_selected$key].map(_toPropertyKey));
+              restMultipleMap = _objectWithoutProperties(_prevState$multipleMa, [_selected$key3].map(_toPropertyKey));
             nextState.multipleMap = restMultipleMap;
           }
           return _objectSpread2(_objectSpread2({}, prevState), nextState);
@@ -546,7 +515,6 @@ class Select extends Component {
         return {
           filterValue: '',
           selected: nextSelection,
-          selectedIndex: isSelectAll ? _this._getSelectedIndex(nextSelection, _this.props.data) : null,
           shownData: prevState.shownData.map(item => _objectSpread2(_objectSpread2({}, item), {}, {
             checkbox: isSelectAll
           })),
@@ -579,7 +547,7 @@ class Select extends Component {
       const empty = this.props.multiple ? [] : null;
       this.setState({
         selected: empty,
-        selectedIndex: null,
+        lastInteractedKey: null,
         filterValue: ''
       }, () => {
         if (this.props.onChange) {
@@ -622,23 +590,16 @@ class Select extends Component {
       });
       if (prevState.selected) {
         Object.assign(nextState, {
-          selectedIndex: getSelectedIndex(prevState.selected, data),
           filterValue: getValueForFilter(prevState.selected, type, filterValue)
         });
       }
     }
     if ('selected' in nextProps && nextProps.selected !== prevSelected) {
       const selected = nextProps.selected || (multiple ? [] : null);
-      const selectedIndex = getSelectedIndex(selected, data || prevData);
       Object.assign(nextState, {
         selected,
         filterValue: getValueForFilter(selected, type, filterValue)
       });
-      if (!Array.isArray(prevSelected) || !Array.isArray(selected) || !isSameSelected(prevSelected, selected)) {
-        Object.assign(nextState, {
-          selectedIndex
-        });
-      }
     }
     if (prevMultiple !== multiple && !dequal(prevMultiple, multiple)) {
       nextState.selected = multiple ? [] : null;
@@ -660,6 +621,10 @@ class Select extends Component {
         addButton
       });
     }
+    const isSelectionEmpty = nextProps.selected == null || Array.isArray(nextProps.selected) && nextProps.selected.length === 0;
+    if (isSelectionEmpty) {
+      nextState.lastInteractedKey = null;
+    }
     return nextState;
   }
   componentDidUpdate(prevProps, prevState) {
@@ -685,8 +650,28 @@ class Select extends Component {
   getValueForFilter(selected) {
     return getValueForFilter(selected, this.props.type, this.state.filterValue);
   }
-  _getSelectedIndex(selected, data) {
-    return getSelectedIndex(selected, data);
+  _getActiveIndex(items) {
+    const {
+      selected,
+      lastInteractedKey
+    } = this.state;
+    const isNonOptionItem = item => item.isResetItem || List.isItemType(List.ListProps.Type.SEPARATOR, item);
+    if (lastInteractedKey != null) {
+      const index = items.findIndex(item => item.key === lastInteractedKey && !isNonOptionItem(item));
+      if (index >= 0) return index;
+    }
+    let selectedItems = [];
+    if (Array.isArray(selected)) {
+      selectedItems = selected;
+    } else if (selected) {
+      selectedItems = [selected];
+    }
+    if (selectedItems.length > 0) {
+      const lastSelected = selectedItems[selectedItems.length - 1];
+      const index = items.findIndex(item => item.key === lastSelected.key);
+      if (index >= 0) return index;
+    }
+    return items.findIndex(item => !isNonOptionItem(item));
   }
   _getResetOption() {
     const isOptionsSelected = Array.isArray(this.state.selected) && this.state.selected.length;
@@ -740,6 +725,7 @@ class Select extends Component {
       shownData
     } = this.state;
     const _shownData = this._prependResetOption(shownData);
+    const activeIndex = this._getActiveIndex(_shownData);
     return jsx(I18nContext.Consumer, {
       children: _ref2 => {
         let {
@@ -759,7 +745,7 @@ class Select extends Component {
           toolbar: showPopup && this.getToolbar(),
           topbar: this.getTopbar(),
           loading: this.props.loading,
-          activeIndex: this.state.selectedIndex,
+          activeIndex: activeIndex,
           hidden: !showPopup,
           ref: this.popupRef,
           maxHeight: this.props.maxHeight,

package/components/select/select__filter.js

@@ -18,22 +18,17 @@ import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.replace.js';
-import 'core-js/modules/es.string.starts-with.js';
 import '../global/memoize.js';
-import 'core-js/modules/es.weak-map.js';
 import '../link/clickableLink.js';
 import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
 import '../global/get-uid.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import '../global/composeRefs.js';
 import 'memoize-one';
 import '../control-label/control-label.js';
 import '../control-help/control-help.js';
 import 'sniffr';
 import 'core-js/modules/es.symbol.description.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.trim.js';
 import 'react-virtualized/dist/es/List';
 import 'react-virtualized/dist/es/AutoSizer';
@@ -42,10 +37,8 @@ import 'react-virtualized/dist/es/CellMeasurer';
 import '../global/data-tests.js';
 import '../global/schedule-raf.js';
 import '../global/dom.js';
-import 'core-js/modules/es.string.split.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/create-stateful-context.js';
 import '../list/list__item.js';

package/components/select/select__popup.js

@@ -29,17 +29,11 @@ import '../icon/icon__constants.js';
 import '../_helpers/icon__svg.js';
 import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.string.replace.js';
-import 'core-js/modules/es.string.starts-with.js';
-import 'core-js/modules/es.weak-map.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'react-dom';
 import '../global/schedule-raf.js';
 import '../global/data-tests.js';
 import '../tab-trap/tab-trap.js';
 import 'core-js/modules/es.array.sort.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/es.symbol.description.js';
 import 'core-js/modules/es.string.trim.js';
 import 'react-virtualized/dist/es/List';
@@ -50,7 +44,6 @@ import '../global/create-stateful-context.js';
 import '../list/list__item.js';
 import '../avatar/avatar.js';
 import '../global/url.js';
-import 'core-js/modules/es.string.match.js';
 import '../_helpers/avatar-info.js';
 import '../avatar/avatar-size.js';
 import '../avatar/fallback-avatar.js';

package/components/shortcuts/core.js

@@ -1,8 +1,5 @@
 import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import Combokeys from 'combokeys';
 import sniffr from '../global/sniffer.js';
 import 'sniffr';

package/components/shortcuts/shortcut-title.js

@@ -1,5 +1,4 @@
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.split.js';
 import sniffr from '../global/sniffer.js';
 import 'sniffr';
 

package/components/shortcuts/shortcuts-hoc.js

@@ -4,12 +4,8 @@ import { jsx } from 'react/jsx-runtime';
 import { Component } from 'react';
 import getUID from '../global/get-uid.js';
 import Shortcuts from './shortcuts.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import './core.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';

package/components/shortcuts/shortcuts.js

@@ -1,10 +1,7 @@
 import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
 import { PureComponent } from 'react';
 import shortcuts from './core.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';

package/components/slider/slider.js

@@ -9,15 +9,10 @@ import Shortcuts from '../shortcuts/shortcuts.js';
 import getUID from '../global/get-uid.js';
 import { HUNDRED, toRange, validateValue, calculateMarks, toPercent, calculateValue, adjustValues } from './slider.utils.js';
 import '../shortcuts/core.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.string.match.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
-import 'core-js/modules/es.regexp.to-string.js';
-import 'core-js/modules/es.number.to-fixed.js';
 
 var styles = {"slider":"ring-slider-slider","disabled":"ring-slider-disabled","marked":"ring-slider-marked","rail":"ring-slider-rail","rounded":"ring-slider-rounded","track":"ring-slider-track","thumb":"ring-slider-thumb ring-global-resetButton","dragged":"ring-slider-dragged","tick":"ring-slider-tick","active":"ring-slider-active","markValue":"ring-slider-markValue","tag":"ring-slider-tag"};
 

package/components/slider/slider.utils.js

@@ -1,6 +1,4 @@
 import 'core-js/modules/es.array.reverse.js';
-import 'core-js/modules/es.number.to-fixed.js';
-import 'core-js/modules/es.regexp.to-string.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import { isArray } from '../global/typescript-utils.js';