@elastic/eui 90.0.0 → 91.0.0

package/test-env/components/button/button_group/button_group.js

@@ -56,9 +56,6 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
     'euiButtonGroup-isDisabled': isDisabled
   }, className);
   var typeIsSingle = type === 'single';
-  var nameIfSingle = (0, _services.useGeneratedHtmlId)({
-    conditionalId: name
-  });
   return (0, _react2.jsx)("fieldset", (0, _extends2.default)({
     css: wrapperCssStyles,
     className: classes
@@ -70,15 +67,17 @@ var EuiButtonGroup = function EuiButtonGroup(_ref) {
   }, options.map(function (option, index) {
     return (0, _react2.jsx)(_button_group_button.EuiButtonGroupButton, (0, _extends2.default)({
       key: index,
-      name: nameIfSingle,
       isDisabled: isDisabled
     }, option, {
-      element: typeIsSingle ? 'label' : 'button',
+      onClick: typeIsSingle ? function () {
+        return onChange(option.id, option.value);
+      } : function () {
+        return onChange(option.id);
+      },
       isSelected: typeIsSingle ? option.id === idSelected : idToSelectedMap[option.id],
       color: color,
       size: buttonSize,
-      isIconOnly: isIconOnly,
-      onChange: onChange
+      isIconOnly: isIconOnly
     }));
   })));
 };
@@ -169,8 +168,7 @@ EuiButtonGroup.propTypes = {
     css: _propTypes.default.oneOfType([_propTypes.default.any, _propTypes.default.any])
   }).isRequired).isRequired,
   /**
-           * The `name` attribute for radio inputs;
-           * Defaults to a random string
+           * @deprecated No longer needed. You can safely remove this prop entirely
            */
   name: _propTypes.default.string,
   /**

package/test-env/components/button/button_group/button_group_button.js

@@ -17,7 +17,7 @@ var _inner_text = require("../../inner_text");
 var _button_display = require("../button_display/_button_display");
 var _button_group_button = require("./button_group_button.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "name", "onChange", "size", "value", "color", "element", "type"];
+var _excluded = ["className", "id", "isDisabled", "isIconOnly", "isSelected", "label", "value", "size", "color"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -33,44 +33,11 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
     _ref$isSelected = _ref.isSelected,
     isSelected = _ref$isSelected === void 0 ? false : _ref$isSelected,
     label = _ref.label,
-    name = _ref.name,
-    _onChange = _ref.onChange,
-    size = _ref.size,
     value = _ref.value,
+    size = _ref.size,
     _ref$color = _ref.color,
     _color = _ref$color === void 0 ? 'primary' : _ref$color,
-    _ref$element = _ref.element,
-    _element = _ref$element === void 0 ? 'button' : _ref$element,
-    _ref$type = _ref.type,
-    type = _ref$type === void 0 ? 'button' : _ref$type,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  // Force element to be a button if disabled
-  var element = isDisabled ? 'button' : _element;
-  var elementProps = {};
-  var singleInput;
-  if (element === 'label') {
-    singleInput = (0, _react2.jsx)("input", {
-      className: "euiScreenReaderOnly",
-      name: name,
-      checked: isSelected,
-      disabled: isDisabled,
-      value: value,
-      type: "radio",
-      onChange: function onChange() {
-        return _onChange(id, value);
-      },
-      "data-test-subj": id
-    });
-  } else {
-    elementProps = {
-      'data-test-subj': id,
-      isSelected: isSelected,
-      type: type,
-      onClick: function onClick() {
-        return _onChange(id);
-      }
-    };
-  }
   var isCompressed = size === 'compressed';
   var color = isDisabled ? 'disabled' : _color;
   var display = isSelected ? 'fill' : isCompressed ? 'empty' : 'base';
@@ -100,7 +67,6 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
   return (0, _react2.jsx)(_button_display.EuiButtonDisplay, (0, _extends2.default)({
     css: cssStyles,
     className: buttonClasses,
-    element: element,
     isDisabled: isDisabled,
     size: size === 'compressed' ? 's' : size,
     contentProps: {
@@ -111,8 +77,10 @@ var EuiButtonGroupButton = function EuiButtonGroupButton(_ref) {
       ref: buttonTextRef,
       'data-text': innerText
     },
-    title: innerText
-  }, elementProps, rest), singleInput, label);
+    title: innerText,
+    "data-test-subj": id,
+    isSelected: isSelected
+  }, rest), label);
 };
 exports.EuiButtonGroupButton = EuiButtonGroupButton;
 EuiButtonGroupButton.propTypes = {
@@ -125,13 +93,10 @@ EuiButtonGroupButton.propTypes = {
      */
   label: _propTypes.default.node.isRequired,
   isDisabled: _propTypes.default.bool,
-  /**
-     * The value of the radio input for 'single'.
-     */
   /**
      * The value of the radio input.
      */
-  value: _propTypes.default.oneOfType([_propTypes.default.any, _propTypes.default.string]),
+  value: _propTypes.default.any,
   /**
      * The type of the underlying HTML button
      */
@@ -161,18 +126,10 @@ EuiButtonGroupButton.propTypes = {
   "aria-label": _propTypes.default.string,
   "data-test-subj": _propTypes.default.string,
   css: _propTypes.default.any,
-  /**
-     * Element to display based on single or multi
-     */
-  element: _propTypes.default.oneOf(["button", "label"]).isRequired,
   /**
      * Styles the selected button to look selected (usually with `fill`)
      */
   isSelected: _propTypes.default.bool,
-  /**
-     * Name of the whole group for 'single'.
-     */
-  name: _propTypes.default.string,
   /**
      * Inherit from EuiButtonGroup
      */
@@ -188,5 +145,5 @@ EuiButtonGroupButton.propTypes = {
   /**
      * Inherit from EuiButtonGroup
      */
-  onChange: _propTypes.default.func.isRequired
+  onClick: _propTypes.default.func.isRequired
 };

package/test-env/components/button/button_group/button_group_button.styles.js

@@ -56,25 +56,15 @@ var euiButtonGroupButtonStyles = function euiButtonGroupButtonStyles(euiThemeCon
     }
   };
 };
-
-/**
- * Focus utilities - made complex by the two different button styles
- * and the fact that `label`/`input` combos need :focus-within,
- * but `button` does not
- */
 exports.euiButtonGroupButtonStyles = euiButtonGroupButtonStyles;
-var _outlineSelectors = function _outlineSelectors(outlineCss) {
-  return /*#__PURE__*/(0, _react.css)("&:is(button){&:focus-visible{", outlineCss, ";}}&:is(label){&:focus-within{", outlineCss, ";}@supports selector(:has(*)){/* Once all evergreen browsers support :has, we can remove\n           @supports and the outline: none reset just use this selector */&:focus-within{outline:none;}&:has(:focus-visible){", outlineCss, ";}}}");
-};
 var _compressedButtonFocusColor = function _compressedButtonFocusColor(euiThemeContext, color) {
-  var euiTheme = euiThemeContext.euiTheme;
   var _euiButtonFillColor = (0, _button.euiButtonFillColor)(euiThemeContext, color),
     backgroundColor = _euiButtonFillColor.backgroundColor;
-  return _outlineSelectors("outline: ".concat(euiTheme.focus.width, " solid ").concat(backgroundColor, ";"));
+  return /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'center', backgroundColor), " &:is(.euiButtonGroupButton-isSelected){outline-offset:0;}}");
 };
 exports._compressedButtonFocusColor = _compressedButtonFocusColor;
 var _uncompressedButtonFocus = function _uncompressedButtonFocus(euiThemeContext) {
   var euiTheme = euiThemeContext.euiTheme;
-  return _outlineSelectors((0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.colors.fullShade));
+  return /*#__PURE__*/(0, _react.css)("&:focus-visible{", (0, _global_styling.euiOutline)(euiThemeContext, 'inset', euiTheme.colors.fullShade), ";}");
 };
 exports._uncompressedButtonFocus = _uncompressedButtonFocus;

package/test-env/components/collapsible_nav/collapsible_nav_group/collapsible_nav_group.js

@@ -193,6 +193,14 @@ EuiCollapsibleNavGroup.propTypes = {
        * When using `fieldset`, it will enforce `buttonElement = legend` as well.
        */
   element: _propTypes.default.oneOf(["div", "fieldset"]),
+  /**
+       * Defaults to the [group role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/group_role).
+       *
+       * If your accordion contains significant enough content to be a document
+       * [landmark role](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Roles/region_role#accessibility_concerns), consider using the `region` role instead.
+       * @default group
+       */
+  role: _propTypes.default.any,
   /**
        * Class that will apply to the trigger for the accordion.
        */

package/test-env/components/collapsible_nav_beta/collapsible_nav_group/collapsible_nav_group.js

@@ -43,17 +43,22 @@ var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
   var euiTheme = (0, _services.useEuiTheme)();
   var styles = (0, _collapsible_nav_group.euiCollapsibleNavGroupStyles)(euiTheme);
   var cssStyles = [styles.euiCollapsibleNavGroup, isPush && isCollapsed ? styles.euiCollapsibleNavGroup__title : styles.isWrapper, wrapperProps === null || wrapperProps === void 0 ? void 0 : wrapperProps.css];
+  var labelledById = (0, _services.useGeneratedHtmlId)();
   return (0, _react2.jsx)("div", (0, _extends2.default)({}, wrapperProps, {
     className: classes,
     css: cssStyles
   }), isCollapsed && isPush ? (0, _react2.jsx)(_collapsed_nav_popover.EuiCollapsedNavPopover, (0, _extends2.default)({
     className: classes,
     items: items
-  }, props)) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavItem, (0, _extends2.default)({}, props, {
+  }, props)) : (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavItem, (0, _extends2.default)({
+    id: labelledById
+  }, props, {
     css: styles.euiCollapsibleNavGroup__title
   })), (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavSubItems, {
     items: items,
-    isGroup: true
+    isGroup: true,
+    role: "group",
+    "aria-labelledby": props.id || labelledById
   })));
 };
 exports.EuiCollapsibleNavGroup = EuiCollapsibleNavGroup;

package/test-env/components/collapsible_nav_beta/collapsible_nav_item/collapsible_nav_group.js

@@ -51,10 +51,12 @@ var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
     }
   } : undefined; // Prevents Emotion from generating a selector if no styles need to be applied
 
+  var labelledById = (0, _services.useGeneratedHtmlId)();
   return (0, _react2.jsx)("div", (0, _extends2.default)({
     className: classes
   }, cssStyles, rest), (0, _react2.jsx)(_collapsible_nav_link.EuiCollapsibleNavLink, (0, _extends2.default)({
-    href: href
+    href: href,
+    id: labelledById
   }, linkProps, {
     isSelected: isSelected,
     isSubItem: isSubItem,
@@ -62,7 +64,9 @@ var EuiCollapsibleNavGroup = function EuiCollapsibleNavGroup(_ref) {
   }), header), (0, _react2.jsx)(_collapsible_nav_item.EuiCollapsibleNavSubItems, {
     items: items,
     isSubItem: isSubItem,
-    className: "euiCollapsibleNavGroup__children"
+    className: "euiCollapsibleNavGroup__children",
+    role: "group",
+    "aria-labelledby": (linkProps === null || linkProps === void 0 ? void 0 : linkProps.id) || labelledById
   }));
 };
 exports.EuiCollapsibleNavGroup = EuiCollapsibleNavGroup;

package/test-env/components/combo_box/combo_box.js

@@ -411,14 +411,16 @@ var EuiComboBox = /*#__PURE__*/function (_Component) {
       var _this$props10 = _this.props,
         onSearchChange = _this$props10.onSearchChange,
         delimiter = _this$props10.delimiter;
-      if (onSearchChange) {
-        var _hasMatchingOptions = _this.state.matchingOptions.length > 0;
-        onSearchChange(searchValue, _hasMatchingOptions);
-      }
       _this.setState({
         searchValue: searchValue
       }, function () {
-        if (searchValue && _this.state.isListOpen === false) _this.openList();
+        if (searchValue && _this.state.isListOpen === false) {
+          _this.openList();
+        }
+        if (onSearchChange) {
+          var _hasMatchingOptions = _this.state.matchingOptions.length > 0;
+          onSearchChange(searchValue, _hasMatchingOptions);
+        }
       });
       if (delimiter && searchValue.endsWith(delimiter)) {
         _this.setCustomOptions(false);

package/test-env/components/combo_box/combo_box_input/combo_box_input.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EuiComboBoxInput = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -23,6 +23,7 @@ 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"];
@@ -60,6 +61,7 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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
@@ -85,65 +87,42 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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;
-  }
-  (0, _createClass2.default)(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,
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_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 && (0, _typeof2.default)(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,
@@ -152,17 +131,77 @@ var EuiComboBoxInput = /*#__PURE__*/function (_Component) {
           prepend = option.prepend,
           truncationProps = option.truncationProps,
           rest = (0, _objectWithoutProperties2.default)(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, (0, _extends2.default)({
           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;
+  }
+  (0, _createClass2.default)(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 && (0, _typeof2.default)(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) {
@@ -179,12 +218,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 = {
@@ -214,6 +248,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, (0, _extends2.default)({
@@ -231,7 +266,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') : '',
@@ -252,11 +290,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/test-env/components/combo_box/combo_box_input/combo_box_pill.js

@@ -20,8 +20,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 _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 _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -57,7 +58,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,
@@ -66,20 +66,17 @@ var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
         onClose = _this$props2.onClose,
         option = _this$props2.option,
         rest = (0, _objectWithoutProperties2.default)(_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",
@@ -100,12 +97,6 @@ var EuiComboBoxPill = /*#__PURE__*/function (_Component) {
           }, onClickProps, rest), content);
         });
       }
-      if (asPlainText) {
-        return (0, _react2.jsx)("span", (0, _extends2.default)({
-          className: classes,
-          "data-test-subj": "euiComboBoxPill"
-        }, rest), content);
-      }
       return (0, _react2.jsx)(_badge.EuiBadge, (0, _extends2.default)({
         className: classes,
         color: color,
@@ -121,7 +112,6 @@ exports.EuiComboBoxPill = EuiComboBoxPill;
   color: 'hollow'
 });
 EuiComboBoxPill.propTypes = {
-  asPlainText: _propTypes.default.bool,
   children: _propTypes.default.string,
   className: _propTypes.default.string,
   color: _propTypes.default.string,

package/test-env/components/combo_box/combo_box_options_list/combo_box_options_list.js

@@ -30,6 +30,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"],
@@ -128,13 +129,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));
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "optionWidth", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "setOptionWidth", function (width) {

package/test-env/components/combo_box/utils.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EuiComboBoxOptionAppendPrepend = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+/*
+ * 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;