@elastic/eui 109.0.0 → 109.1.0

package/lib/components/datagrid/body/data_grid_body_custom.js

@@ -385,7 +385,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           /**
              * Overall size of button.
              * Matches the sizes of other EuiButtons
@@ -415,6 +414,19 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          /**
+             * Controls the disabled behavior via the native `disabled` attribute.
+             */
+          isDisabled: _propTypes.default.bool,
+          /**
+             * NOTE: Beta feature, may be changed or removed in the future
+             *
+             * Changes the native `disabled` attribute to `aria-disabled` to preserve focusability.
+             * This results in a semantically disabled button without the default browser handling of the disabled state.
+             *
+             * Use e.g. when a disabled button should have a tooltip.
+             */
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         /**
@@ -468,7 +480,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -477,6 +488,8 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -511,7 +524,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -520,6 +532,8 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -554,7 +568,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -563,6 +576,8 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -597,7 +612,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -606,6 +620,8 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -640,7 +656,6 @@ EuiDataGridBodyCustomRender.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -649,6 +664,8 @@ EuiDataGridBodyCustomRender.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,

package/lib/components/datagrid/body/data_grid_body_virtualized.js

@@ -553,7 +553,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           /**
              * Overall size of button.
              * Matches the sizes of other EuiButtons
@@ -583,6 +582,19 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          /**
+             * Controls the disabled behavior via the native `disabled` attribute.
+             */
+          isDisabled: _propTypes.default.bool,
+          /**
+             * NOTE: Beta feature, may be changed or removed in the future
+             *
+             * Changes the native `disabled` attribute to `aria-disabled` to preserve focusability.
+             * This results in a semantically disabled button without the default browser handling of the disabled state.
+             *
+             * Use e.g. when a disabled button should have a tooltip.
+             */
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         /**
@@ -636,7 +648,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -645,6 +656,8 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -679,7 +692,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -688,6 +700,8 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -722,7 +736,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -731,6 +744,8 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -765,7 +780,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -774,6 +788,8 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -808,7 +824,6 @@ EuiDataGridBodyVirtualized.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -817,6 +832,8 @@ EuiDataGridBodyVirtualized.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,

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

@@ -260,7 +260,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           /**
              * Overall size of button.
              * Matches the sizes of other EuiButtons
@@ -290,6 +289,19 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          /**
+             * Controls the disabled behavior via the native `disabled` attribute.
+             */
+          isDisabled: _propTypes.default.bool,
+          /**
+             * NOTE: Beta feature, may be changed or removed in the future
+             *
+             * Changes the native `disabled` attribute to `aria-disabled` to preserve focusability.
+             * This results in a semantically disabled button without the default browser handling of the disabled state.
+             *
+             * Use e.g. when a disabled button should have a tooltip.
+             */
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         /**
@@ -343,7 +355,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -352,6 +363,8 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -386,7 +399,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -395,6 +407,8 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -429,7 +443,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -438,6 +451,8 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -472,7 +487,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -481,6 +495,8 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -515,7 +531,6 @@ EuiDataGridHeaderCell.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -524,6 +539,8 @@ EuiDataGridHeaderCell.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,

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

@@ -23,11 +23,11 @@ var _react2 = require("@emotion/react");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+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 _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 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."); }
@@ -51,31 +51,48 @@ var useDataGridColumnSelector = exports.useDataGridColumnSelector = function use
         var id = _ref.id;
         return id;
       });
-      var availableSet = new Set(availableColumnIds);
-      // Filter visibleColumns to only include existing columns
+      // remove duplicate columns to ensure unique columns
+      var availableColumnIdsSet = new Set(availableColumnIds);
+      if (process.env.NODE_ENV === 'development') {
+        if (availableColumnIds.length > availableColumnIdsSet.size) {
+          var duplicateIds = [];
+          var _iterator = _createForOfIteratorHelper(availableColumnIds),
+            _step;
+          try {
+            var _loop = function _loop() {
+              var id = _step.value;
+              if (!duplicateIds.includes(id) && availableColumnIds.filter(function (_id) {
+                return _id === id;
+              }).length > 1) {
+                duplicateIds.push(id);
+              }
+            };
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              _loop();
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          console.warn("\u26A0\uFE0F EuiDataGrid: Duplicate column IDs detected and removed: ".concat(duplicateIds.join(', '), "."), '\n Column IDs must be unique. Only the first occurrence of each duplicate will be used.');
+        }
+      }
       var validVisibleColumns = visibleColumns.filter(function (id) {
-        return availableSet.has(id);
+        return availableColumnIdsSet.has(id);
       });
       var visibleSet = new Set(validVisibleColumns);
       var result = [];
       var visibleIndex = 0;
-      var _iterator = _createForOfIteratorHelper(availableColumnIds),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var columnId = _step.value;
-          if (visibleSet.has(columnId)) {
-            // Replace with next visible column in order
+      for (var _i = 0, _arr = _toConsumableArray(availableColumnIdsSet); _i < _arr.length; _i++) {
+        var columnId = _arr[_i];
+        if (visibleSet.has(columnId)) {
+          if (visibleIndex < validVisibleColumns.length) {
             result.push(validVisibleColumns[visibleIndex++]);
-          } else {
-            // Keep hidden column in original position
-            result.push(columnId);
           }
+        } else {
+          result.push(columnId);
         }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
       }
       return result;
       // doesn't depend on visibleColumns on purpose to keep it an initial state
@@ -140,7 +157,7 @@ var useDataGridColumnSelector = exports.useDataGridColumnSelector = function use
       anchorPosition: "downLeft",
       panelPaddingSize: "none",
       button: (0, _react2.jsx)(_data_grid_toolbar_control.EuiDataGridToolbarControl, {
-        badgeContent: numberOfHiddenFields > 0 ? "".concat(orderedVisibleColumns.length, "/").concat(availableColumns.length) : availableColumns.length,
+        badgeContent: numberOfHiddenFields > 0 ? "".concat(orderedVisibleColumns.length, "/").concat(sortedColumns.length) : sortedColumns.length,
         iconType: "tableDensityNormal",
         "data-test-subj": "dataGridColumnSelectorButton",
         onClick: function onClick() {

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

@@ -392,7 +392,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           /**
              * Overall size of button.
              * Matches the sizes of other EuiButtons
@@ -422,6 +421,19 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          /**
+             * Controls the disabled behavior via the native `disabled` attribute.
+             */
+          isDisabled: _propTypes.default.bool,
+          /**
+             * NOTE: Beta feature, may be changed or removed in the future
+             *
+             * Changes the native `disabled` attribute to `aria-disabled` to preserve focusability.
+             * This results in a semantically disabled button without the default browser handling of the disabled state.
+             *
+             * Use e.g. when a disabled button should have a tooltip.
+             */
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         /**
@@ -475,7 +487,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -484,6 +495,8 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -518,7 +531,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -527,6 +539,8 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -561,7 +575,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -570,6 +583,8 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -604,7 +619,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -613,6 +627,8 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,
@@ -647,7 +663,6 @@ DataGridSortingControl.propTypes = {
           color: _propTypes.default.any,
           "aria-label": _propTypes.default.string,
           "aria-labelledby": _propTypes.default.string,
-          isDisabled: _propTypes.default.bool,
           size: _propTypes.default.any,
           iconSize: _propTypes.default.any,
           isSelected: _propTypes.default.bool,
@@ -656,6 +671,8 @@ DataGridSortingControl.propTypes = {
           className: _propTypes.default.string,
           "data-test-subj": _propTypes.default.string,
           css: _propTypes.default.any,
+          isDisabled: _propTypes.default.bool,
+          hasAriaDisabled: _propTypes.default.bool,
           buttonRef: _propTypes.default.any
         }),
         onClick: _propTypes.default.func,

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

@@ -78,13 +78,6 @@ EuiDataGridToolbarControl.propTypes = {
      * Ensure the text of the button sits flush to the left, right, or both sides of its container
      */
   flush: _propTypes.default.any,
-  /**
-     * `disabled` is also allowed
-     */
-  /**
-     * `disabled` is also allowed
-     */
-  isDisabled: _propTypes.default.bool,
   /**
      * Force disables the button and changes the icon to a loading spinner
      */
@@ -139,10 +132,23 @@ EuiDataGridToolbarControl.propTypes = {
     "data-text": _propTypes.default.string
   }).isRequired, _propTypes.default.oneOf([false])]),
   iconSize: _propTypes.default.any,
+  /**
+     * Controls the disabled behavior via the native `disabled` attribute.
+     */
+  isDisabled: _propTypes.default.bool,
   className: _propTypes.default.string,
   "aria-label": _propTypes.default.string,
   "data-test-subj": _propTypes.default.string,
   css: _propTypes.default.any,
+  /**
+     * NOTE: Beta feature, may be changed or removed in the future
+     *
+     * Changes the native `disabled` attribute to `aria-disabled` to preserve focusability.
+     * This results in a semantically disabled button without the default browser handling of the disabled state.
+     *
+     * Use e.g. when a disabled button should have a tooltip.
+     */
+  hasAriaDisabled: _propTypes.default.bool,
   badgeContent: _propTypes.default.oneOfType([_propTypes.default.number.isRequired, _propTypes.default.string.isRequired])
 };
 var betterScreenReaderSlashes = function betterScreenReaderSlashes(badgeContent) {

package/lib/components/datagrid/data_grid.js

@@ -175,7 +175,11 @@ var EuiDataGrid = exports.EuiDataGrid = /*#__PURE__*/(0, _react.memo)( /*#__PURE
    */
   var displayValues = (0, _react.useMemo)(function () {
     return columns.reduce(function (acc, column) {
-      return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, column.id, column.displayAsText || column.id));
+      // prevent duplicate values
+      if (!acc[column.id]) {
+        return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, column.id, column.displayAsText || column.id));
+      }
+      return acc;
     }, {});
   }, [columns]);
   var _useDataGridDisplaySe = (0, _controls.useDataGridDisplaySelector)((0, _controls.checkOrDefaultToolBarDisplayOptions)(toolbarVisibility, 'showDisplaySelector'), gridStyleWithDefaults, _rowHeightsOptions),