@elastic/eui 90.0.0 → 91.0.0

package/lib/components/combo_box/combo_box_input/combo_box_input.js

@@ -11,16 +11,17 @@ var _services = require("../../../services");
 var _accessibility = require("../../accessibility");
 var _form_control_layout = require("../../form/form_control_layout");
 var _num_icons = require("../../form/form_control_layout/_num_icons");
+var _utils = require("../utils");
 var _combo_box_pill = require("./combo_box_pill");
 var _react2 = require("@emotion/react");
 var _excluded = ["key", "label", "color", "onClick", "append", "prepend", "truncationProps"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -64,6 +65,7 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     });
     _defineProperty(_assertThisInitialized(_this), "updateInputSize", function (inputValue) {
       if (!_this.widthUtils) return;
+      if (_this.asPlainText) return;
       _this.widthUtils.setTextToCheck(inputValue);
       // Canvas has minute subpixel differences in rendering compared to DOM
       // We'll buffer the input by ~2px just to ensure sufficient width
@@ -89,65 +91,42 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     _defineProperty(_assertThisInitialized(_this), "onKeyDown", function (event) {
       var _this$props2 = _this.props,
         searchValue = _this$props2.searchValue,
+        hasSelectedOptions = _this$props2.hasSelectedOptions,
         selectedOptions = _this$props2.selectedOptions,
         onRemoveOption = _this$props2.onRemoveOption,
         singleSelection = _this$props2.singleSelection,
         isListOpen = _this$props2.isListOpen,
-        onOpenListClick = _this$props2.onOpenListClick;
-
-      // When backspacing from an empty input, delete the last pill option in the list
+        onOpenListClick = _this$props2.onOpenListClick,
+        onChange = _this$props2.onChange;
       var searchIsEmpty = !searchValue.length;
-      var hasPills = selectedOptions.length;
-      if (event.key === _services.keys.BACKSPACE && searchIsEmpty && hasPills) {
-        onRemoveOption(selectedOptions[selectedOptions.length - 1]);
-        if (!!singleSelection && !isListOpen) {
-          onOpenListClick();
+      if (event.key === _services.keys.BACKSPACE) {
+        // When backspacing in a plain text combobox, change normally and remove the selection
+        if (_this.asPlainText) {
+          onChange(event.currentTarget.value);
+          if (hasSelectedOptions) {
+            onRemoveOption(selectedOptions[selectedOptions.length - 1]);
+          }
+        }
+        // When backspacing from an empty input, delete the last pill option in the list
+        else if (searchIsEmpty && hasSelectedOptions) {
+          onRemoveOption(selectedOptions[selectedOptions.length - 1]);
+          if (!!singleSelection && !isListOpen) {
+            onOpenListClick();
+          }
         }
       }
     });
-    return _this;
-  }
-  _createClass(EuiComboBoxInput, [{
-    key: "componentDidUpdate",
-    value: function componentDidUpdate(prevProps) {
-      if (prevProps.searchValue !== this.props.searchValue) {
-        this.updateInputSize(this.props.searchValue);
-      }
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props3 = this.props,
-        compressed = _this$props3.compressed,
-        focusedOptionId = _this$props3.focusedOptionId,
-        fullWidth = _this$props3.fullWidth,
-        hasSelectedOptions = _this$props3.hasSelectedOptions,
-        id = _this$props3.id,
-        isDisabled = _this$props3.isDisabled,
-        isListOpen = _this$props3.isListOpen,
-        noIcon = _this$props3.noIcon,
-        _onChange = _this$props3.onChange,
-        onClear = _this$props3.onClear,
-        onClick = _this$props3.onClick,
-        onCloseListClick = _this$props3.onCloseListClick,
-        onOpenListClick = _this$props3.onOpenListClick,
-        onRemoveOption = _this$props3.onRemoveOption,
-        placeholder = _this$props3.placeholder,
-        rootId = _this$props3.rootId,
-        searchValue = _this$props3.searchValue,
+    _defineProperty(_assertThisInitialized(_this), "renderPills", function () {
+      // Don't render a pill for plain text comboboxes - use the input instead
+      if (_this.asPlainText) return null;
+      // Don't render the single pill selection while searching
+      if (_this.props.singleSelection && _this.props.searchValue) return null;
+      var _this$props3 = _this.props,
         selectedOptions = _this$props3.selectedOptions,
-        singleSelectionProp = _this$props3.singleSelection,
-        value = _this$props3.value,
-        prepend = _this$props3.prepend,
-        append = _this$props3.append,
-        isLoading = _this$props3.isLoading,
-        isInvalid = _this$props3.isInvalid,
-        autoFocus = _this$props3.autoFocus,
-        ariaLabel = _this$props3['aria-label'],
-        ariaLabelledby = _this$props3['aria-labelledby'];
-      var singleSelection = Boolean(singleSelectionProp);
-      var asPlainText = singleSelectionProp && _typeof(singleSelectionProp) === 'object' && singleSelectionProp.asPlainText || false;
-      var pills = selectedOptions ? selectedOptions.map(function (option) {
+        isDisabled = _this$props3.isDisabled,
+        onRemoveOption = _this$props3.onRemoveOption;
+      if (!selectedOptions || !selectedOptions.length) return null;
+      return selectedOptions.map(function (option) {
         var key = option.key,
           label = option.label,
           color = option.color,
@@ -156,17 +135,77 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
           prepend = option.prepend,
           truncationProps = option.truncationProps,
           rest = _objectWithoutProperties(option, _excluded);
-        var pillOnClose = isDisabled || singleSelection || onClick ? undefined : onRemoveOption;
+        var pillOnClose = isDisabled || _this.props.singleSelection || onClick ? undefined : onRemoveOption;
         return (0, _react2.jsx)(_combo_box_pill.EuiComboBoxPill, _extends({
           option: option,
           onClose: pillOnClose,
           key: key !== null && key !== void 0 ? key : label.toLowerCase(),
           color: color,
           onClick: onClick,
-          onClickAriaLabel: onClick ? 'Change' : undefined,
-          asPlainText: asPlainText
+          onClickAriaLabel: onClick ? 'Change' : undefined
         }, rest), label);
-      }) : null;
+      });
+    });
+    return _this;
+  }
+  _createClass(EuiComboBoxInput, [{
+    key: "componentDidUpdate",
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.searchValue !== this.props.searchValue) {
+        this.updateInputSize(this.props.searchValue);
+      }
+    }
+  }, {
+    key: "asPlainText",
+    get: function get() {
+      var singleSelection = this.props.singleSelection;
+      var isSingleSelectionConfig = singleSelection && _typeof(singleSelection) === 'object';
+      return !!(isSingleSelectionConfig && singleSelection.asPlainText);
+    }
+  }, {
+    key: "searchValue",
+    get: function get() {
+      var _this$props4 = this.props,
+        searchValue = _this$props4.searchValue,
+        selectedOptions = _this$props4.selectedOptions;
+      if (this.asPlainText) {
+        var _selectedOptions$;
+        return searchValue || (selectedOptions === null || selectedOptions === void 0 ? void 0 : (_selectedOptions$ = selectedOptions[0]) === null || _selectedOptions$ === void 0 ? void 0 : _selectedOptions$.label) || '';
+      } else {
+        return searchValue;
+      }
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this$props5 = this.props,
+        compressed = _this$props5.compressed,
+        focusedOptionId = _this$props5.focusedOptionId,
+        fullWidth = _this$props5.fullWidth,
+        hasSelectedOptions = _this$props5.hasSelectedOptions,
+        id = _this$props5.id,
+        isDisabled = _this$props5.isDisabled,
+        isListOpen = _this$props5.isListOpen,
+        noIcon = _this$props5.noIcon,
+        _onChange = _this$props5.onChange,
+        onClear = _this$props5.onClear,
+        onClick = _this$props5.onClick,
+        onFocus = _this$props5.onFocus,
+        onCloseListClick = _this$props5.onCloseListClick,
+        onOpenListClick = _this$props5.onOpenListClick,
+        placeholder = _this$props5.placeholder,
+        rootId = _this$props5.rootId,
+        searchValue = _this$props5.searchValue,
+        selectedOptions = _this$props5.selectedOptions,
+        singleSelection = _this$props5.singleSelection,
+        value = _this$props5.value,
+        prepend = _this$props5.prepend,
+        append = _this$props5.append,
+        isLoading = _this$props5.isLoading,
+        isInvalid = _this$props5.isInvalid,
+        autoFocus = _this$props5.autoFocus,
+        ariaLabel = _this$props5['aria-label'],
+        ariaLabelledby = _this$props5['aria-labelledby'];
       var removeOptionMessage;
       var removeOptionMessageId;
       if (this.state.hasFocus) {
@@ -183,12 +222,7 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
           id: removeOptionMessageId
         }, removeOptionMessageContent));
       }
-      var placeholderMessage;
-      if (placeholder && selectedOptions && !selectedOptions.length && !searchValue) {
-        placeholderMessage = (0, _react2.jsx)("p", {
-          className: "euiComboBoxPlaceholder"
-        }, placeholder);
-      }
+      var showPlaceholder = placeholder && !(selectedOptions !== null && selectedOptions !== void 0 && selectedOptions.length) && !searchValue;
       var clickProps = {};
       if (!isDisabled && onClear && hasSelectedOptions) {
         clickProps.clear = {
@@ -218,6 +252,7 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         'euiComboBox__inputWrap--compressed': compressed,
         'euiComboBox__inputWrap--fullWidth': fullWidth,
         'euiComboBox__inputWrap--noWrap': singleSelection,
+        'euiComboBox__inputWrap--plainText': this.asPlainText || showPlaceholder,
         'euiComboBox__inputWrap--inGroup': prepend || append
       });
       return (0, _react2.jsx)(_form_control_layout.EuiFormControlLayout, _extends({
@@ -235,7 +270,10 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         "data-test-subj": "comboBoxInput",
         onClick: onClick,
         tabIndex: -1 // becomes onBlur event's relatedTarget, otherwise relatedTarget is null when clicking on this div
-      }, !singleSelection || !searchValue ? pills : null, placeholderMessage, (0, _react2.jsx)("input", {
+      }, this.renderPills(), (0, _react2.jsx)(_utils.EuiComboBoxOptionAppendPrepend, {
+        option: this.asPlainText ? selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions[0] : undefined,
+        classNamePrefix: "euiComboBoxPlainTextSelection"
+      }, (0, _react2.jsx)("input", {
         "aria-activedescendant": focusedOptionId,
         "aria-autocomplete": "list",
         "aria-controls": isListOpen ? rootId('listbox') : '',
@@ -256,11 +294,15 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
         ref: this.inputRefCallback,
         role: "combobox",
         style: {
-          inlineSize: this.state.inputWidth
+          inlineSize: this.asPlainText || showPlaceholder ? '100%' : this.state.inputWidth
         },
-        value: searchValue,
+        placeholder: showPlaceholder ? placeholder : undefined,
+        value: this.searchValue,
         autoFocus: autoFocus
-      }), removeOptionMessage));
+        // Force the menu to re-open on every input click - only necessary when plain text
+        ,
+        onClick: this.asPlainText ? onFocus : undefined // Type shenanigans - event should be mostly the same
+      })), removeOptionMessage));
     }
   }]);
   return EuiComboBoxInput;

package/lib/components/combo_box/combo_box_input/combo_box_pill.js

@@ -9,8 +9,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _badge = require("../../badge");
 var _i18n = require("../../i18n");
+var _utils = require("../utils");
 var _react2 = require("@emotion/react");
-var _excluded = ["asPlainText", "children", "className", "color", "onClick", "onClickAriaLabel", "onClose", "option"];
+var _excluded = ["children", "className", "color", "onClick", "onClickAriaLabel", "onClose", "option"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -62,7 +63,6 @@ var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this2 = this;
       var _this$props2 = this.props,
-        asPlainText = _this$props2.asPlainText,
         children = _this$props2.children,
         className = _this$props2.className,
         color = _this$props2.color,
@@ -71,20 +71,17 @@ var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
         onClose = _this$props2.onClose,
         option = _this$props2.option,
         rest = _objectWithoutProperties(_this$props2, _excluded);
-      var classes = (0, _classnames.default)('euiComboBoxPill', {
-        'euiComboBoxPill--plainText': asPlainText
-      }, className);
+      var classes = (0, _classnames.default)('euiComboBoxPill', className);
       var onClickProps = onClick && onClickAriaLabel ? {
         onClick: onClick,
         onClickAriaLabel: onClickAriaLabel
       } : {};
-      var content = (0, _react2.jsx)(_react.default.Fragment, null, option.prepend && (0, _react2.jsx)("span", {
-        className: "euiComboBoxPill__prepend"
-      }, option.prepend), (0, _react2.jsx)("span", {
+      var content = (0, _react2.jsx)(_utils.EuiComboBoxOptionAppendPrepend, {
+        option: option,
+        classNamePrefix: "euiComboBoxPill"
+      }, (0, _react2.jsx)("span", {
         className: "eui-textTruncate"
-      }, children), option.append && (0, _react2.jsx)("span", {
-        className: "euiComboBoxPill__append"
-      }, option.append));
+      }, children));
       if (onClose) {
         return (0, _react2.jsx)(_i18n.EuiI18n, {
           token: "euiComboBoxPill.removeSelection",
@@ -105,12 +102,6 @@ var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
           }, onClickProps, rest), content);
         });
       }
-      if (asPlainText) {
-        return (0, _react2.jsx)("span", _extends({
-          className: classes,
-          "data-test-subj": "euiComboBoxPill"
-        }, rest), content);
-      }
       return (0, _react2.jsx)(_badge.EuiBadge, _extends({
         className: classes,
         color: color,
@@ -126,7 +117,6 @@ _defineProperty(EuiComboBoxPill, "defaultProps", {
   color: 'hollow'
 });
 EuiComboBoxPill.propTypes = {
-  asPlainText: _propTypes.default.bool,
   children: _propTypes.default.string,
   className: _propTypes.default.string,
   color: _propTypes.default.string,

package/lib/components/combo_box/combo_box_options_list/combo_box_options_list.js

@@ -19,6 +19,7 @@ var _filter_select_item = require("../../filter_group/filter_select_item");
 var _badge = require("../../badge");
 var _text_truncate = require("../../text_truncate");
 var _input_popover = require("../../popover/input_popover");
+var _utils = require("../utils");
 var _react2 = require("@emotion/react");
 var _excluded = ["children"],
   _excluded2 = ["key", "isGroupLabelOption", "label", "value", "prepend", "append", "truncationProps"],
@@ -133,13 +134,12 @@ var EuiComboBoxOptionsList = /*#__PURE__*/function (_Component) {
         title: label
       }, rest), (0, _react2.jsx)("span", {
         className: "euiComboBoxOption__contentWrapper"
-      }, prepend && (0, _react2.jsx)("span", {
-        className: "euiComboBoxOption__prepend"
-      }, prepend), (0, _react2.jsx)("span", {
+      }, (0, _react2.jsx)(_utils.EuiComboBoxOptionAppendPrepend, {
+        option: option,
+        classNamePrefix: "euiComboBoxOption"
+      }, (0, _react2.jsx)("span", {
         className: "euiComboBoxOption__content"
-      }, renderOption ? renderOption(option, searchValue, 'euiComboBoxOption__renderOption') : _this.renderTruncatedOption(label, truncationProps)), append && (0, _react2.jsx)("span", {
-        className: "euiComboBoxOption__append"
-      }, append), optionIsFocused && !optionIsDisabled ? hitEnterBadge : null));
+      }, renderOption ? renderOption(option, searchValue, 'euiComboBoxOption__renderOption') : _this.renderTruncatedOption(label, truncationProps))), optionIsFocused && !optionIsDisabled ? hitEnterBadge : null));
     });
     _defineProperty(_assertThisInitialized(_this), "optionWidth", void 0);
     _defineProperty(_assertThisInitialized(_this), "setOptionWidth", function (width) {

package/lib/components/combo_box/utils.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EuiComboBoxOptionAppendPrepend = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * DRY util for rendering an option with its prepend and append properties
+ */
+var EuiComboBoxOptionAppendPrepend = function EuiComboBoxOptionAppendPrepend(_ref) {
+  var children = _ref.children,
+    option = _ref.option,
+    classNamePrefix = _ref.classNamePrefix;
+  return (0, _react2.jsx)(_react.default.Fragment, null, (option === null || option === void 0 ? void 0 : option.prepend) && (0, _react2.jsx)("span", {
+    className: "".concat(classNamePrefix, "__prepend")
+  }, option.prepend), children, (option === null || option === void 0 ? void 0 : option.append) && (0, _react2.jsx)("span", {
+    className: "".concat(classNamePrefix, "__append")
+  }, option.append));
+};
+exports.EuiComboBoxOptionAppendPrepend = EuiComboBoxOptionAppendPrepend;

package/lib/components/datagrid/body/header/data_grid_header_cell.js

@@ -115,7 +115,7 @@ var EuiDataGridHeaderCell = function EuiDataGridHeaderCell(_ref) {
     title: displayAsText || id
   }, display || displayAsText || id), sortingScreenReaderText && (0, _react2.jsx)(_accessibility2.EuiScreenReaderOnly, null, (0, _react2.jsx)("p", null, sortingScreenReaderText))) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_popover.EuiPopover, _extends({
     className: "eui-fullWidth",
-    anchorClassName: "eui-fullWidth",
+    display: "block",
     panelPaddingSize: "none",
     offset: 7,
     button: (0, _react2.jsx)("button", {

package/lib/components/datagrid/controls/column_selector.js

@@ -129,7 +129,7 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
         return setIsOpen(!isOpen);
       }
     }, buttonText)
-  }, (0, _react2.jsx)("div", null, allowColumnHiding && (0, _react2.jsx)(_popover.EuiPopoverTitle, null, (0, _react2.jsx)(_i18n.EuiI18n, {
+  }, allowColumnHiding && (0, _react2.jsx)(_popover.EuiPopoverTitle, null, (0, _react2.jsx)(_i18n.EuiI18n, {
     tokens: ['euiColumnSelector.search', 'euiColumnSelector.searchcolumns'],
     defaults: ['Search', 'Search columns']
   }, function (_ref3) {
@@ -146,13 +146,12 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
       },
       "data-test-subj": "dataGridColumnSelectorSearch"
     });
-  })), (0, _react2.jsx)("div", {
-    className: "euiDataGrid__controlScroll"
-  }, (0, _react2.jsx)(_drag_and_drop.EuiDragDropContext, {
+  })), (0, _react2.jsx)(_drag_and_drop.EuiDragDropContext, {
     onDragEnd: onDragEnd
   }, (0, _react2.jsx)(_drag_and_drop.EuiDroppable, {
     droppableId: "columnOrder",
-    isDropDisabled: !isDragEnabled
+    isDropDisabled: !isDragEnabled,
+    className: "euiDataGrid__controlScroll"
   }, (0, _react2.jsx)(_react.default.Fragment, null, filteredColumns.map(function (id, index) {
     return (0, _react2.jsx)(_drag_and_drop.EuiDraggable, {
       key: id,
@@ -205,7 +204,7 @@ var useDataGridColumnSelector = function useDataGridColumnSelector(availableColu
         color: "subdued"
       }))));
     });
-  })))))), allowColumnHiding && (0, _react2.jsx)(_popover.EuiPopoverFooter, null, (0, _react2.jsx)(_flex.EuiFlexGroup, {
+  })))), allowColumnHiding && (0, _react2.jsx)(_popover.EuiPopoverFooter, null, (0, _react2.jsx)(_flex.EuiFlexGroup, {
     gutterSize: "s",
     responsive: false,
     justifyContent: "spaceBetween"

package/lib/components/datagrid/controls/column_sorting.js

@@ -136,15 +136,12 @@ var useDataGridColumnSorting = function useDataGridColumnSorting(columns, sortin
         return setIsOpen(!isOpen);
       }
     }, sorting.columns.length > 0 ? sortingButtonTextActive : sortingButtonText)
-  }, sorting.columns.length > 0 ? (0, _react2.jsx)("div", {
-    role: "region",
-    "aria-live": "assertive",
-    className: "euiDataGrid__controlScroll"
-  }, (0, _react2.jsx)(_drag_and_drop.EuiDragDropContext, {
+  }, sorting.columns.length > 0 ? (0, _react2.jsx)(_drag_and_drop.EuiDragDropContext, {
     onDragEnd: onDragEnd
   }, (0, _react2.jsx)(_drag_and_drop.EuiDroppable, {
-    droppableId: "columnSorting"
-  }, (0, _react2.jsx)(_react.Fragment, null, sorting.columns.map(function (_ref6, index) {
+    droppableId: "columnSorting",
+    className: "euiDataGrid__controlScroll"
+  }, (0, _react2.jsx)(_react.default.Fragment, null, sorting.columns.map(function (_ref6, index) {
     var id = _ref6.id,
       direction = _ref6.direction;
     return (0, _react2.jsx)(_column_sorting_draggable.EuiDataGridColumnSortingDraggable, {
@@ -157,7 +154,7 @@ var useDataGridColumnSorting = function useDataGridColumnSorting(columns, sortin
       schema: schema,
       schemaDetectors: schemaDetectors
     });
-  }))))) : (0, _react2.jsx)(_text.EuiText, {
+  })))) : (0, _react2.jsx)(_text.EuiText, {
     size: "s",
     color: "subdued"
   }, (0, _react2.jsx)("p", {

package/lib/components/datagrid/controls/display_selector.js

@@ -88,6 +88,7 @@ var convertRowHeightsOptionsToSelection = function convertRowHeightsOptionsToSel
   }
   return rowHeightButtonOptions[0];
 };
+var defaultLineCountValue = String(2);
 var useDataGridDisplaySelector = function useDataGridDisplaySelector(showDisplaySelector, initialStyles, initialRowHeightsOptions) {
   var _showDisplaySelector$, _rowHeightsOptions$de2;
   var _useState = (0, _react.useState)(false),
@@ -115,10 +116,10 @@ var useDataGridDisplaySelector = function useDataGridDisplaySelector(showDisplay
   }, []);
 
   // Row height logic
-  var _useState7 = (0, _react.useState)(2),
+  var _useState7 = (0, _react.useState)(defaultLineCountValue),
     _useState8 = _slicedToArray(_useState7, 2),
-    lineCount = _useState8[0],
-    setLineCount = _useState8[1];
+    lineCountInput = _useState8[0],
+    setLineCountInput = _useState8[1];
   var setRowHeight = (0, _react.useCallback)(function (option) {
     var rowHeightsOptions = {
       rowHeights: {} // Unset all row-specific heights
@@ -128,25 +129,27 @@ var useDataGridDisplaySelector = function useDataGridDisplaySelector(showDisplay
       rowHeightsOptions.defaultHeight = 'auto';
     } else if (option === 'lineCount') {
       rowHeightsOptions.defaultHeight = {
-        lineCount: lineCount
+        lineCount: Number(lineCountInput)
       };
     } else {
       rowHeightsOptions.defaultHeight = undefined;
     }
     setUserRowHeightsOptions(rowHeightsOptions);
-  }, [lineCount]);
+  }, [lineCountInput]);
   var setLineCountHeight = (0, _react.useCallback)(function (event) {
+    setLineCountInput(event.currentTarget.value);
     var newLineCount = Number(event.currentTarget.value);
-    if (newLineCount < 1) return; // Don't let users set a 0 or negative line count
 
-    setLineCount(newLineCount);
-    setUserRowHeightsOptions({
-      rowHeights: {},
-      // Unset all row-specific line counts
-      defaultHeight: {
-        lineCount: newLineCount
-      }
-    });
+    // Don't let users set a 0 or negative line count
+    if (newLineCount > 0) {
+      setUserRowHeightsOptions({
+        rowHeights: {},
+        // Unset all row-specific line counts
+        defaultHeight: {
+          lineCount: newLineCount
+        }
+      });
+    }
   }, []);
 
   // Merge the developer-specified configurations with user overrides
@@ -166,8 +169,9 @@ var useDataGridDisplaySelector = function useDataGridDisplaySelector(showDisplay
   }, [rowHeightsOptions]);
   (0, _react.useEffect)(function () {
     var _rowHeightsOptions$de;
+    setLineCountInput(
     // @ts-ignore - optional chaining operator handles types & cases that aren't lineCount
-    setLineCount((rowHeightsOptions === null || rowHeightsOptions === void 0 ? void 0 : (_rowHeightsOptions$de = rowHeightsOptions.defaultHeight) === null || _rowHeightsOptions$de === void 0 ? void 0 : _rowHeightsOptions$de.lineCount) || 2);
+    (rowHeightsOptions === null || rowHeightsOptions === void 0 ? void 0 : (_rowHeightsOptions$de = rowHeightsOptions.defaultHeight) === null || _rowHeightsOptions$de === void 0 ? void 0 : _rowHeightsOptions$de.lineCount) || defaultLineCountValue);
     // @ts-ignore - same as above
   }, [rowHeightsOptions === null || rowHeightsOptions === void 0 ? void 0 : (_rowHeightsOptions$de2 = rowHeightsOptions.defaultHeight) === null || _rowHeightsOptions$de2 === void 0 ? void 0 : _rowHeightsOptions$de2.lineCount]);
 
@@ -299,7 +303,8 @@ var useDataGridDisplaySelector = function useDataGridDisplaySelector(showDisplay
       min: 1,
       max: 20,
       step: 1,
-      value: lineCount,
+      required: true,
+      value: lineCountInput,
       onChange: setLineCountHeight,
       "data-test-subj": "lineCountNumber"
     })));