@elastic/eui 123.0.0 → 123.1.0

package/es/components/form/range/range.js

@@ -1,21 +1,13 @@
-var _excluded = ["className", "compressed", "disabled", "fullWidth", "isLoading", "readOnly", "id", "max", "min", "name", "step", "showLabels", "showInput", "inputPopoverProps", "showTicks", "tickInterval", "ticks", "levels", "showRange", "showValue", "valueAppend", "valuePrepend", "onBlur", "onChange", "onFocus", "value", "tabIndex", "isInvalid", "theme"];
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["min", "max", "step", "compressed", "isLoading", "showLabels", "showInput", "showRange", "showTicks", "showValue", "levels", "className", "disabled", "fullWidth", "readOnly", "id", "name", "tickInterval", "ticks", "valueAppend", "valuePrepend", "onBlur", "onChange", "onFocus", "value", "tabIndex", "isInvalid", "inputPopoverProps"];
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.indexOf(n) >= 0) continue; t[n] = r[n]; } return t; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
-function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
-function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
-function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
-function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -24,13 +16,13 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  * Side Public License, v 1.
  */
 
-import React, { Component } from 'react';
+import React, { useRef, useState } from 'react';
 import PropTypes from "prop-types";
 import classNames from 'classnames';
 import { isWithinRange } from '../../../services/number';
 import { EuiInputPopover } from '../../popover';
-import { htmlIdGenerator, withEuiTheme } from '../../../services/';
-import { FormContext } from '../eui_form_context';
+import { useEuiTheme, useGeneratedHtmlId, useLatest } from '../../../services';
+import { useFormContext } from '../eui_form_context';
 import { getLevelColor } from './range_levels_colors';
 import { EuiRangeHighlight } from './range_highlight';
 import { EuiRangeInput } from './range_input';
@@ -41,249 +33,217 @@ import { EuiRangeTrack } from './range_track';
 import { EuiRangeWrapper } from './range_wrapper';
 import { euiRangeStyles } from './range.styles';
 import { EuiI18n } from '../../i18n';
-import { jsx as ___EmotionJSX } from "@emotion/react";
-export var EuiRangeClass = /*#__PURE__*/function (_Component) {
-  function EuiRangeClass() {
-    var _this;
-    _classCallCheck(this, EuiRangeClass);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _callSuper(this, EuiRangeClass, [].concat(args));
-    _defineProperty(_this, "preventPopoverClose", false);
-    _defineProperty(_this, "state", {
-      id: _this.props.id || htmlIdGenerator()(),
-      isPopoverOpen: false,
-      trackWidth: 0
-    });
-    _defineProperty(_this, "handleOnChange", function (e) {
-      var isValid = isWithinRange(_this.props.min, _this.props.max, e.currentTarget.value);
-      if (_this.props.onChange) {
-        _this.props.onChange(e, isValid);
-      }
-    });
-    _defineProperty(_this, "setTrackWidth", function (_ref) {
-      var width = _ref.width;
-      _this.setState({
-        trackWidth: width
-      });
-    });
-    _defineProperty(_this, "onInputFocus", function (e) {
-      if (_this.props.onFocus) {
-        _this.props.onFocus(e);
-      }
-      _this.setState({
-        isPopoverOpen: true
-      });
-    });
-    _defineProperty(_this, "onInputBlur", function (e) {
-      return setTimeout(function () {
-        // Safari does not recognize any focus-related eventing for input[type=range]
-        // making it impossible to capture its state using active/focus/relatedTarget
-        // Instead, a prevention flag is set on mousedown, with a waiting period here.
-        // Mousedown is viable because in the popover case, it is inaccessible via keyboard (intentionally)
-        if (_this.preventPopoverClose) {
-          _this.preventPopoverClose = false;
-          return;
-        }
-        if (_this.props.onBlur) {
-          _this.props.onBlur(e);
-        }
-        _this.closePopover();
-      }, 200);
-    });
-    _defineProperty(_this, "closePopover", function () {
-      _this.preventPopoverClose = false;
-      _this.setState({
-        isPopoverOpen: false
-      });
-    });
-    _defineProperty(_this, "handleAriaValueText", function (ticks, currentVal) {
-      var target = ticks.find(function (tick) {
-        return tick.value.toString() === currentVal.toString();
-      });
-      if (target) {
-        return target.accessibleLabel ? "".concat(target.value, ", (").concat(target.accessibleLabel, ")") : typeof target.label === 'string' // Fall back to the label if it's a usable string
-        ? "".concat(target.value, ", (").concat(target.label, ")") : undefined;
-      }
-    });
-    return _this;
-  }
-  _inherits(EuiRangeClass, _Component);
-  return _createClass(EuiRangeClass, [{
-    key: "isValid",
-    get: function get() {
-      return isWithinRange(this.props.min, this.props.max, this.props.value || '');
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this2 = this;
-      var _ref2 = this.context,
-        defaultFullWidth = _ref2.defaultFullWidth;
-      var _this$props = this.props,
-        className = _this$props.className,
-        compressed = _this$props.compressed,
-        disabled = _this$props.disabled,
-        _this$props$fullWidth = _this$props.fullWidth,
-        fullWidth = _this$props$fullWidth === void 0 ? defaultFullWidth : _this$props$fullWidth,
-        isLoading = _this$props.isLoading,
-        readOnly = _this$props.readOnly,
-        propsId = _this$props.id,
-        max = _this$props.max,
-        min = _this$props.min,
-        name = _this$props.name,
-        step = _this$props.step,
-        showLabels = _this$props.showLabels,
-        showInput = _this$props.showInput,
-        inputPopoverProps = _this$props.inputPopoverProps,
-        showTicks = _this$props.showTicks,
-        tickInterval = _this$props.tickInterval,
-        ticks = _this$props.ticks,
-        levels = _this$props.levels,
-        showRange = _this$props.showRange,
-        showValue = _this$props.showValue,
-        valueAppend = _this$props.valueAppend,
-        valuePrepend = _this$props.valuePrepend,
-        onBlur = _this$props.onBlur,
-        onChange = _this$props.onChange,
-        onFocus = _this$props.onFocus,
-        value = _this$props.value,
-        tabIndex = _this$props.tabIndex,
-        isInvalid = _this$props.isInvalid,
-        theme = _this$props.theme,
-        rest = _objectWithoutProperties(_this$props, _excluded);
-      var id = this.state.id;
-      var showInputOnly = showInput === 'inputWithPopover';
-      var canShowDropdown = showInputOnly && !readOnly && !disabled;
-      var theInput = !!showInput ? ___EmotionJSX(EuiRangeInput, _extends({
-        id: id,
-        min: min,
-        max: max,
-        step: step,
-        value: value,
-        readOnly: readOnly,
-        disabled: disabled,
-        compressed: compressed,
-        onChange: this.handleOnChange,
-        name: name,
-        onFocus: canShowDropdown ? this.onInputFocus : onFocus,
-        onBlur: canShowDropdown ? this.onInputBlur : onBlur,
-        fullWidth: showInputOnly && fullWidth,
-        isLoading: showInputOnly && isLoading,
-        isInvalid: isInvalid,
-        autoSize: !showInputOnly
-      }, rest)) : null;
-      var classes = classNames('euiRange', className);
-      var styles = euiRangeStyles(theme);
-      var cssStyles = [styles.euiRange, showInput && styles.hasInput];
-      var thumbColor = levels && getLevelColor(levels, Number(value));
-      var sliderScreenReaderInstructions = ___EmotionJSX(EuiI18n, {
-        token: "euiRange.sliderScreenReaderInstructions",
-        default: "You are in a custom range slider. Use the Up and Down arrow keys to change the value."
-      });
-      var theRange = ___EmotionJSX(EuiRangeWrapper, {
-        className: classes,
-        css: cssStyles,
-        fullWidth: fullWidth,
-        compressed: compressed
-      }, showLabels && ___EmotionJSX(EuiRangeLabel, {
-        side: "min",
-        disabled: disabled
-      }, min), ___EmotionJSX(EuiRangeTrack, {
-        trackWidth: this.state.trackWidth,
-        disabled: disabled,
-        compressed: compressed,
-        max: max,
-        min: min,
-        step: step,
-        showTicks: showTicks,
-        tickInterval: tickInterval,
-        ticks: ticks,
-        levels: levels,
-        onChange: this.handleOnChange,
-        value: value,
-        "aria-hidden": !!showInput,
-        showRange: showRange
-      }, ___EmotionJSX(EuiRangeSlider, _extends({
-        ariaValueText: ticks ? this.handleAriaValueText(ticks, value) : undefined,
-        id: showInput ? undefined : id // Attach id only to the input if there is one
-        ,
-        name: name,
-        min: min,
-        max: max,
-        step: step,
-        value: value,
-        disabled: disabled,
-        onChange: this.handleOnChange,
-        showTicks: showTicks,
-        showRange: showRange,
-        tabIndex: showInput ? -1 : tabIndex,
-        onMouseDown: showInputOnly ? function () {
-          return _this2.preventPopoverClose = true;
-        } : undefined,
-        onFocus: showInput === true ? undefined : onFocus,
-        onBlur: showInputOnly ? this.onInputBlur : onBlur,
-        "aria-hidden": !!showInput,
-        thumbColor: thumbColor
-      }, rest, {
-        onResize: this.setTrackWidth
-      })), showRange && this.isValid && ___EmotionJSX(EuiRangeHighlight, {
-        showTicks: showTicks,
-        min: Number(min),
-        max: Number(max),
-        lowerValue: Number(min),
-        upperValue: Number(value),
-        levels: levels,
-        trackWidth: this.state.trackWidth
-      }), showValue && !!String(value).length && ___EmotionJSX(EuiRangeTooltip, {
-        value: value,
-        max: max,
-        min: min,
-        name: name,
-        showTicks: showTicks,
-        valuePrepend: valuePrepend,
-        valueAppend: valueAppend
-      })), showLabels && ___EmotionJSX(EuiRangeLabel, {
-        side: "max",
-        disabled: disabled
-      }, max), showInput && !showInputOnly && ___EmotionJSX(React.Fragment, null, ___EmotionJSX("div", {
-        className: showTicks || ticks ? 'euiRange__slimHorizontalSpacer' : 'euiRange__horizontalSpacer',
-        css: showTicks || ticks ? styles.euiRange__slimHorizontalSpacer : styles.euiRange__horizontalSpacer
-      }), theInput));
-      var thePopover = showInputOnly ? ___EmotionJSX(EuiInputPopover, _extends({}, inputPopoverProps, {
-        className: classNames('euiRange__popover', inputPopoverProps === null || inputPopoverProps === void 0 ? void 0 : inputPopoverProps.className),
-        input: theInput // `showInputOnly` confirms existence
-        ,
-        fullWidth: fullWidth,
-        isOpen: this.state.isPopoverOpen,
-        closePopover: this.closePopover,
-        disableFocusTrap: true,
-        popoverScreenReaderText: sliderScreenReaderInstructions
-      }), theRange) : undefined;
-      return thePopover ? thePopover : theRange;
-    }
-  }]);
-}(Component);
 
 /**
  * @see {@link https://eui.elastic.co/docs/components/forms/numeric/range-sliders/|EuiRange documentation}
  */
-_defineProperty(EuiRangeClass, "contextType", FormContext);
-_defineProperty(EuiRangeClass, "defaultProps", {
-  min: 0,
-  max: 100,
-  step: 1,
-  compressed: false,
-  isLoading: false,
-  showLabels: false,
-  showInput: false,
-  showRange: false,
-  showTicks: false,
-  showValue: false,
-  levels: []
-});
-EuiRangeClass.propTypes = {
+import { jsx as ___EmotionJSX } from "@emotion/react";
+export var EuiRange = function EuiRange(_ref) {
+  var _ref$min = _ref.min,
+    min = _ref$min === void 0 ? 0 : _ref$min,
+    _ref$max = _ref.max,
+    max = _ref$max === void 0 ? 100 : _ref$max,
+    _ref$step = _ref.step,
+    step = _ref$step === void 0 ? 1 : _ref$step,
+    _ref$compressed = _ref.compressed,
+    compressed = _ref$compressed === void 0 ? false : _ref$compressed,
+    _ref$isLoading = _ref.isLoading,
+    isLoading = _ref$isLoading === void 0 ? false : _ref$isLoading,
+    _ref$showLabels = _ref.showLabels,
+    showLabels = _ref$showLabels === void 0 ? false : _ref$showLabels,
+    _ref$showInput = _ref.showInput,
+    showInput = _ref$showInput === void 0 ? false : _ref$showInput,
+    _ref$showRange = _ref.showRange,
+    showRange = _ref$showRange === void 0 ? false : _ref$showRange,
+    _ref$showTicks = _ref.showTicks,
+    showTicks = _ref$showTicks === void 0 ? false : _ref$showTicks,
+    _ref$showValue = _ref.showValue,
+    showValue = _ref$showValue === void 0 ? false : _ref$showValue,
+    _ref$levels = _ref.levels,
+    levels = _ref$levels === void 0 ? [] : _ref$levels,
+    className = _ref.className,
+    disabled = _ref.disabled,
+    _fullWidth = _ref.fullWidth,
+    readOnly = _ref.readOnly,
+    propsId = _ref.id,
+    name = _ref.name,
+    tickInterval = _ref.tickInterval,
+    ticks = _ref.ticks,
+    valueAppend = _ref.valueAppend,
+    valuePrepend = _ref.valuePrepend,
+    onBlur = _ref.onBlur,
+    onChange = _ref.onChange,
+    onFocus = _ref.onFocus,
+    value = _ref.value,
+    tabIndex = _ref.tabIndex,
+    isInvalid = _ref.isInvalid,
+    inputPopoverProps = _ref.inputPopoverProps,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var theme = useEuiTheme();
+  var _useFormContext = useFormContext(),
+    defaultFullWidth = _useFormContext.defaultFullWidth;
+  var generatedId = useGeneratedHtmlId();
+  var onBlurRef = useLatest(onBlur);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isPopoverOpen = _useState2[0],
+    setIsPopoverOpen = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    trackWidth = _useState4[0],
+    setTrackWidth = _useState4[1];
+  var preventPopoverClose = useRef(false);
+  var id = propsId || generatedId;
+  var isValid = isWithinRange(min, max, value || '');
+  var showInputOnly = showInput === 'inputWithPopover';
+  var canShowDropdown = showInputOnly && !readOnly && !disabled;
+  var classes = classNames('euiRange', className);
+  var styles = euiRangeStyles(theme);
+  var cssStyles = [styles.euiRange, showInput && styles.hasInput];
+  var thumbColor = levels && getLevelColor(levels, Number(value));
+  var fullWidth = _fullWidth !== null && _fullWidth !== void 0 ? _fullWidth : defaultFullWidth;
+  var handleOnChange = function handleOnChange(e) {
+    var isValid = isWithinRange(min, max, e.currentTarget.value);
+    onChange === null || onChange === void 0 || onChange(e, isValid);
+  };
+  var handleSetTrackWidth = function handleSetTrackWidth(_ref2) {
+    var width = _ref2.width;
+    setTrackWidth(width);
+  };
+  var onInputFocus = function onInputFocus(e) {
+    onFocus === null || onFocus === void 0 || onFocus(e);
+    setIsPopoverOpen(true);
+  };
+  var onInputBlur = function onInputBlur(e) {
+    return setTimeout(function () {
+      var _onBlurRef$current;
+      // Safari does not recognize any focus-related eventing for input[type=range]
+      // making it impossible to capture its state using active/focus/relatedTarget
+      // Instead, a prevention flag is set on mousedown, with a waiting period here.
+      // Mousedown is viable because in the popover case, it is inaccessible via keyboard (intentionally)
+      if (preventPopoverClose.current) {
+        preventPopoverClose.current = false;
+        return;
+      }
+      (_onBlurRef$current = onBlurRef.current) === null || _onBlurRef$current === void 0 || _onBlurRef$current.call(onBlurRef, e);
+      closePopover();
+    }, 200);
+  };
+  var closePopover = function closePopover() {
+    preventPopoverClose.current = false;
+    setIsPopoverOpen(false);
+  };
+  var handleAriaValueText = function handleAriaValueText(ticks, currentVal) {
+    var target = ticks.find(function (tick) {
+      return tick.value.toString() === currentVal.toString();
+    });
+    if (target) {
+      return target.accessibleLabel ? "".concat(target.value, ", (").concat(target.accessibleLabel, ")") : typeof target.label === 'string' // Fall back to the label if it's a usable string
+      ? "".concat(target.value, ", (").concat(target.label, ")") : undefined;
+    }
+  };
+  var input = showInput ? ___EmotionJSX(EuiRangeInput, _extends({
+    id: id,
+    min: min,
+    max: max,
+    step: step,
+    value: value,
+    readOnly: readOnly,
+    disabled: disabled,
+    compressed: compressed,
+    onChange: handleOnChange,
+    name: name,
+    onFocus: canShowDropdown ? onInputFocus : onFocus,
+    onBlur: canShowDropdown ? onInputBlur : onBlur,
+    fullWidth: showInputOnly && fullWidth,
+    isLoading: showInputOnly && isLoading,
+    isInvalid: isInvalid,
+    autoSize: !showInputOnly
+  }, rest)) : null;
+  var sliderScreenReaderInstructions = ___EmotionJSX(EuiI18n, {
+    token: "euiRange.sliderScreenReaderInstructions",
+    default: "You are in a custom range slider. Use the Up and Down arrow keys to change the value."
+  });
+  var range = ___EmotionJSX(EuiRangeWrapper, {
+    className: classes,
+    css: cssStyles,
+    fullWidth: fullWidth,
+    compressed: compressed
+  }, showLabels && ___EmotionJSX(EuiRangeLabel, {
+    side: "min",
+    disabled: disabled
+  }, min), ___EmotionJSX(EuiRangeTrack, {
+    trackWidth: trackWidth,
+    disabled: disabled,
+    compressed: compressed,
+    max: max,
+    min: min,
+    step: step,
+    showTicks: showTicks,
+    tickInterval: tickInterval,
+    ticks: ticks,
+    levels: levels,
+    onChange: handleOnChange,
+    value: value,
+    "aria-hidden": !!showInput,
+    showRange: showRange
+  }, ___EmotionJSX(EuiRangeSlider, _extends({
+    ariaValueText: ticks ? handleAriaValueText(ticks, value) : undefined,
+    id: showInput ? undefined : id,
+    name: name,
+    min: min,
+    max: max,
+    step: step,
+    value: value,
+    disabled: disabled,
+    onChange: handleOnChange,
+    showTicks: showTicks,
+    showRange: showRange,
+    tabIndex: showInput ? -1 : tabIndex,
+    onMouseDown: showInputOnly ? function () {
+      return preventPopoverClose.current = true;
+    } : undefined,
+    onFocus: showInput === true ? undefined : onFocus,
+    onBlur: showInputOnly ? onInputBlur : onBlur,
+    "aria-hidden": !!showInput,
+    thumbColor: thumbColor
+  }, rest, {
+    onResize: handleSetTrackWidth
+  })), showRange && isValid && ___EmotionJSX(EuiRangeHighlight, {
+    showTicks: showTicks,
+    min: Number(min),
+    max: Number(max),
+    lowerValue: Number(min),
+    upperValue: Number(value),
+    levels: levels,
+    trackWidth: trackWidth
+  }), showValue && !!String(value).length && ___EmotionJSX(EuiRangeTooltip, {
+    value: value,
+    max: max,
+    min: min,
+    name: name,
+    showTicks: showTicks,
+    valuePrepend: valuePrepend,
+    valueAppend: valueAppend
+  })), showLabels && ___EmotionJSX(EuiRangeLabel, {
+    side: "max",
+    disabled: disabled
+  }, max), showInput && !showInputOnly && ___EmotionJSX(React.Fragment, null, ___EmotionJSX("div", {
+    className: showTicks || ticks ? 'euiRange__slimHorizontalSpacer' : 'euiRange__horizontalSpacer',
+    css: showTicks || ticks ? styles.euiRange__slimHorizontalSpacer : styles.euiRange__horizontalSpacer
+  }), input));
+  var popover = showInputOnly && input ? ___EmotionJSX(EuiInputPopover, _extends({}, inputPopoverProps, {
+    className: classNames('euiRange__popover', inputPopoverProps === null || inputPopoverProps === void 0 ? void 0 : inputPopoverProps.className),
+    input: input,
+    fullWidth: fullWidth,
+    isOpen: isPopoverOpen,
+    closePopover: closePopover,
+    disableFocusTrap: true,
+    popoverScreenReaderText: sliderScreenReaderInstructions
+  }), range) : undefined;
+  return popover !== null && popover !== void 0 ? popover : range;
+};
+EuiRange.propTypes = {
   /**
      * Shows a tooltip styled value
      */
@@ -420,4 +380,4 @@ EuiRangeClass.propTypes = {
     panelMinWidth: PropTypes.number
   })
 };
-export var EuiRange = withEuiTheme(EuiRangeClass);
+EuiRange.displayName = 'EuiRange';

package/es/components/form/super_select/super_select_control.js

@@ -1,4 +1,4 @@
-var _excluded = ["buttonRef", "className", "options", "id", "name", "fullWidth", "isLoading", "isInvalid", "isDropdownOpen", "readOnly", "defaultValue", "compressed", "value", "placeholder", "prepend", "append", "disabled"];
+var _excluded = ["buttonRef", "className", "options", "id", "name", "fullWidth", "isLoading", "isInvalid", "isDropdownOpen", "readOnly", "defaultValue", "compressed", "value", "placeholder", "prepend", "append", "disabled", "aria-label", "aria-labelledby"];
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -18,7 +18,7 @@ function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t =
 
 import React, { useEffect, useState, useMemo } from 'react';
 import classNames from 'classnames';
-import { useEuiMemoizedStyles } from '../../../services';
+import { useEuiMemoizedStyles, useGeneratedHtmlId } from '../../../services';
 import { EuiScreenReaderOnly } from '../../accessibility';
 import { EuiFormControlLayout } from '../form_control_layout';
 import { useFormContext } from '../eui_form_context';
@@ -48,6 +48,8 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
     prepend = props.prepend,
     append = props.append,
     disabled = props.disabled,
+    ariaLabel = props['aria-label'],
+    ariaLabelledByProp = props['aria-labelledby'],
     rest = _objectWithoutProperties(props, _excluded);
   var classes = classNames('euiSuperSelectControl', {
     'euiSuperSelectControl-isLoading': isLoading,
@@ -82,15 +84,32 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
       }
     }
   }, [id]);
-  var buttonId = hasFormLabel ? "".concat(id, "-button") : undefined;
-  var ariaLabelledBy = hasFormLabel ? "".concat(buttonId, " ").concat(formLabelId) : undefined;
+
+  // `aria-label`s are rendered as a separate screen reader only element instead
+  // of being set on the <button>, so that the label can be combined with (rather
+  // than override) the currently selected value, which is the button's content
+  var ariaLabelId = useGeneratedHtmlId({
+    suffix: 'label'
+  });
+  var generatedButtonId = useGeneratedHtmlId({
+    suffix: 'button'
+  });
+
+  // Consumer-passed labels take precedence over the label rendered by EuiFormRow
+  var externalLabelId = ariaLabelledByProp || (ariaLabel ? ariaLabelId : hasFormLabel ? formLabelId : undefined);
+  var buttonId = externalLabelId ? hasFormLabel ? "".concat(id, "-button") : generatedButtonId : undefined;
+  // Self-reference the button so that its content (the selected value) remains
+  // part of the accessible name alongside the external label
+  var ariaLabelledBy = externalLabelId ? "".concat(buttonId, " ").concat(externalLabelId) : undefined;
   return ___EmotionJSX(React.Fragment, null, ___EmotionJSX("input", {
     type: "hidden",
     id: id,
     name: name,
     value: String(inputValue !== null && inputValue !== void 0 ? inputValue : ''),
     readOnly: readOnly
-  }), ___EmotionJSX(EuiFormControlLayout, {
+  }), ariaLabel && !ariaLabelledByProp && ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("span", {
+    id: ariaLabelId
+  }, ariaLabel)), ___EmotionJSX(EuiFormControlLayout, {
     isDropdown: true,
     fullWidth: fullWidth,
     isLoading: isLoading,
@@ -113,8 +132,5 @@ export var EuiSuperSelectControl = function EuiSuperSelectControl(props) {
   }), showPlaceholder ? ___EmotionJSX("span", {
     className: "euiSuperSelectControl__placeholder",
     css: styles.euiSuperSelect__placeholder
-  }, placeholder) : selectedValue, hasFormLabel &&
-  // Add a slight pause between reading out the multiple aria-labelledby elements,
-  // mimicking how screen readers handle native <select> elements
-  ___EmotionJSX(EuiScreenReaderOnly, null, ___EmotionJSX("span", null, ", ")))));
+  }, placeholder) : selectedValue)));
 };