@elastic/eui 108.0.0 → 109.1.0-snapshot.1763390960850

package/optimize/es/test/cypress/matchers.d.ts

@@ -0,0 +1,20 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+declare global {
+  namespace Chai {
+    interface Assertion {
+      euiDisabled: Assertion;
+      euiEnabled: Assertion;
+    }
+  }
+}
+
+export declare const registerEuiCypressMatchers: () => void;
+export declare const setupEuiCypressMatchers: () => void;

package/optimize/es/test/cypress/matchers.js

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+/// <reference types="cypress" />
+
+export function registerEuiCypressMatchers() {
+  var chai = window.chai;
+  if (chai && !chai.__euiMatchersRegistered) {
+    chai.use(function (_chai) {
+      _chai.Assertion.addProperty('euiDisabled', function () {
+        var element = this._obj[0] || this._obj;
+        var hasDisabledAttribute = element.hasAttribute('disabled');
+        var hasAriaDisabled = element.getAttribute('aria-disabled') === 'true';
+        var isDisabled = hasDisabledAttribute || hasAriaDisabled;
+        this.assert(isDisabled, 'expected element to be EUI disabled (= have `disabled` attribute or `aria-disabled="true"`)', 'expected element not to be EUI disabled (= not have `disabled` attribute or `aria-disabled="true"`)', true, isDisabled);
+      });
+      _chai.Assertion.addProperty('euiEnabled', function () {
+        var element = this._obj[0] || this._obj;
+        var hasDisabledAttribute = element.hasAttribute('disabled');
+        var hasAriaDisabled = element.getAttribute('aria-disabled') === 'true';
+        var isDisabled = hasDisabledAttribute || hasAriaDisabled;
+        this.assert(!isDisabled, 'expected element to be EUI enabled (= not have `disabled` attribute or `aria-disabled="true"`)', 'expected element not to be EUI enabled (= have `disabled` attribute or `aria-disabled="true"`)', false, isDisabled);
+      });
+    });
+
+    // Mark as registered to prevent double registration
+    chai.__euiMatchersRegistered = true;
+  }
+}
+
+// Register matchers when support file loads
+export var setupEuiCypressMatchers = function setupEuiCypressMatchers() {
+  if (typeof window !== 'undefined') {
+    // Try to register immediately
+    if (window.chai) {
+      registerEuiCypressMatchers();
+    } else {
+      // Wait for chai to be available
+      var pollForChai = function pollForChai() {
+        if (window.chai) {
+          registerEuiCypressMatchers();
+        } else {
+          setTimeout(pollForChai, 10);
+        }
+      };
+      pollForChai();
+    }
+  }
+};

package/optimize/es/test/cypress/test_reposition_on_scroll.js

@@ -0,0 +1,63 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+/*
+ * 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.
+ */
+
+/// <reference types="cypress" />
+/// <reference types="cypress-real-events" />
+/// <reference types="../../../cypress/support" />
+
+import React from 'react';
+import { jsx as ___EmotionJSX } from "@emotion/react";
+export var testRepositionOnScroll = function testRepositionOnScroll(_ref) {
+  var shouldReposition = _ref.shouldReposition,
+    propValue = _ref.propValue,
+    componentDefaultValue = _ref.componentDefaultValue,
+    componentName = _ref.componentName,
+    triggerSelector = _ref.triggerSelector,
+    panelSelector = _ref.panelSelector,
+    renderComponent = _ref.renderComponent;
+  var repositionProps = {
+    repositionOnScroll: typeof propValue === 'boolean' ? propValue : undefined
+  };
+  var providerProps = typeof componentDefaultValue === 'boolean' ? {
+    providerProps: {
+      componentDefaults: _defineProperty({}, componentName, {
+        repositionOnScroll: componentDefaultValue
+      })
+    }
+  } : undefined;
+  cy.mount(___EmotionJSX(React.Fragment, null, ___EmotionJSX("div", {
+    style: {
+      height: '200vh'
+    }
+  }), ___EmotionJSX("div", {
+    style: {
+      position: 'fixed',
+      bottom: '16px',
+      right: '16px'
+    }
+  }, renderComponent(repositionProps))), providerProps);
+  cy.get(triggerSelector).click();
+
+  // Wait for positioning to finish
+  cy.get(panelSelector).as('panel').should('exist').waitForPositionToSettle();
+  cy.get('@panel').then(function ($panel) {
+    var initialRect = $panel[0].getBoundingClientRect();
+    cy.scrollTo(0, 500);
+
+    // Wait for re-positioning to finish
+    cy.get('@panel').waitForPositionToSettle().then(function ($repositionedPanel) {
+      var finalRect = $repositionedPanel[0].getBoundingClientRect();
+      if (shouldReposition) {
+        expect(finalRect.top).to.equal(initialRect.top);
+      } else {
+        expect(finalRect.top).to.not.equal(initialRect.top);
+      }
+    });
+  });
+};

package/optimize/es/test/enzyme/enzyme_matchers.d.ts

@@ -0,0 +1,36 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+import { ReactWrapper } from 'enzyme';
+
+declare global {
+  namespace jest {
+    interface Matchers<R> {
+      /**
+       * Checks if an Enzyme wrapper has EUI disabled state (it checks `disabled`, `isDisabled` and `aria-disabled` props)
+       */
+      toHaveEuiDisabledProp(): R;
+    }
+  }
+}
+
+export declare const toHaveEuiDisabledProp: (wrapper: ReactWrapper<any>) => {
+  message: () => string;
+  pass: boolean;
+};
+
+export declare const hasEuiDisabledProp: (
+  props: Record<string, any>
+) => boolean;
+
+export declare const euiEnzymeMatchers: {
+  toHaveEuiDisabledProp: typeof toHaveEuiDisabledProp;
+};
+
+export declare const setupEuiEnzymeMatchers: () => void;

package/optimize/es/test/enzyme/enzyme_matchers.js

@@ -0,0 +1,43 @@
+import _typeof from "@babel/runtime/helpers/typeof";
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+/* eslint-env jest */
+
+export var euiEnzymeMatchers = {
+  /**
+   * Checks if an Enzyme wrapper has an EUI disabled state.
+   * It looks for `disabled`, `isDisabled` and `aria-disabled` props
+   */
+  toHaveEuiDisabledProp: function toHaveEuiDisabledProp(props) {
+    if (!props || _typeof(props) !== 'object') {
+      throw new Error('toHaveEuiDisabledProp() must be called with the props value from ReactWrapper.props()');
+    }
+    var isDisabled = hasEuiDisabledProp(props);
+    return {
+      message: function message() {
+        return isDisabled ? 'Expected component NOT to have EUI disabled prop, but it was disabled' : 'Expected component to have EUI disabled prop (`disabled`, `isDisabled` or `aria-disabled="true"`)';
+      },
+      pass: isDisabled
+    };
+  }
+};
+export var setupEuiEnzymeMatchers = function setupEuiEnzymeMatchers() {
+  expect.extend(euiEnzymeMatchers);
+};
+
+/* Utilities */
+
+/**
+ * Checks if a ReactWrapper has one of the following disabled props enabled:
+ * `disabled`, `isDisabled` or attribute or `aria-disabled="true"`.
+ */
+export var hasEuiDisabledProp = function hasEuiDisabledProp(props) {
+  return props.disabled === true || props.isDisabled === true || props['aria-disabled'] === true || props['aria-disabled'] === 'true';
+};

package/optimize/es/test/enzyme/index.d.ts

@@ -0,0 +1,14 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+export {
+  euiEnzymeMatchers,
+  setupEuiEnzymeMatchers,
+  hasEuiDisabledProp,
+} from './enzyme_matchers';

package/optimize/es/test/enzyme/index.js

@@ -0,0 +1,10 @@
+/*
+ * 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", the "GNU Affero General Public License v3.0 only", 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", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+export { euiEnzymeMatchers, setupEuiEnzymeMatchers, hasEuiDisabledProp } from './enzyme_matchers';

package/optimize/es/test/rtl/index.d.ts

@@ -1,3 +1,11 @@
 export * from './component_helpers';
-export { queryByTestSubject, queryAllByTestSubject, getByTestSubject, getAllByTestSubject, findAllByTestSubject, findByTestSubject, } from './data_test_subj_queries';
+export {
+  queryByTestSubject,
+  queryAllByTestSubject,
+  getByTestSubject,
+  getAllByTestSubject,
+  findAllByTestSubject,
+  findByTestSubject,
+} from './data_test_subj_queries';
 export { render, screen, within } from './custom_render';
+export { euiMatchers, setupEuiMatchers, isEuiDisabled } from './matchers';

package/optimize/es/test/rtl/index.js

@@ -9,4 +9,5 @@
 export * from './component_helpers';
 export { queryByTestSubject, queryAllByTestSubject, getByTestSubject, getAllByTestSubject, findAllByTestSubject, findByTestSubject } from './data_test_subj_queries';
 export { render, screen, within } from './custom_render';
-export * from './render_hook';
+export * from './render_hook';
+export { euiMatchers, setupEuiMatchers, isEuiDisabled } from './matchers';

package/optimize/es/test/rtl/matchers.d.ts

@@ -0,0 +1,36 @@
+declare global {
+  /* eslint-disable-next-line @typescript-eslint/no-namespace,no-redeclare */
+  namespace jest {
+    interface Matchers<R> {
+      /**
+       * Custom matcher to check the disabled state of a DOM element.
+       * Ensures that both `disabled` and `aria-disabled` attributes are checked.
+       */
+      toBeEuiDisabled(): R;
+      /**
+       * Custom matcher to check a DOM element is enabled (= not disabled).
+       * Ensures that both `disabled` and `aria-disabled` attributes are checked.
+       */
+      toBeEuiEnabled(): R;
+    }
+  }
+}
+
+export declare const toBeEuiDisabled: (element: HTMLElement) => {
+  message: () => string;
+  pass: boolean;
+};
+
+export declare const toBeEuiEnabled: (element: HTMLElement) => {
+  message: () => string;
+  pass: boolean;
+};
+
+export declare const isEuiDisabled: (element: HTMLElement) => boolean;
+
+export declare const euiMatchers: {
+  toBeEuiDisabled: typeof toBeEuiDisabled;
+  toBeEuiEnabled: typeof toBeEuiEnabled;
+};
+
+export declare const setupEuiMatchers: () => void;

package/optimize/es/test/rtl/matchers.js

@@ -0,0 +1,82 @@
+/*
+ * 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.
+ */
+
+import { elementCanBeDisabled } from '../../utils';
+var NATIVE_DISABLED_ATTR = 'disabled';
+var CUSTOM_DISABLED_ATTR = 'aria-disabled';
+var toBeEuiDisabled = function toBeEuiDisabled(element) {
+  var _getEuiDisabledState = getEuiDisabledState(element),
+    isDisabled = _getEuiDisabledState.isDisabled,
+    canBeDisabled = _getEuiDisabledState.canBeDisabled,
+    isNativelyDisabled = _getEuiDisabledState.isNativelyDisabled;
+  return {
+    message: function message() {
+      if (isDisabled) {
+        var method = isNativelyDisabled ? "`".concat(NATIVE_DISABLED_ATTR, "`") : "`".concat(CUSTOM_DISABLED_ATTR, "=\"true\"`");
+        if (!canBeDisabled) {
+          return "Element cannot be disabled (based on its role), but it was disabled via ".concat(method);
+        } else {
+          return "Expected element NOT to be disabled, but it was disabled via ".concat(method);
+        }
+      } else {
+        return "Expected element to be disabled via either `".concat(NATIVE_DISABLED_ATTR, "` or `").concat(CUSTOM_DISABLED_ATTR, "=\"true\"` attribute, but found neither");
+      }
+    },
+    pass: isDisabled
+  };
+};
+var toBeEuiEnabled = function toBeEuiEnabled(element) {
+  var _getEuiDisabledState2 = getEuiDisabledState(element),
+    isDisabled = _getEuiDisabledState2.isDisabled,
+    isNativelyDisabled = _getEuiDisabledState2.isNativelyDisabled,
+    isAriaDisabled = _getEuiDisabledState2.isAriaDisabled;
+  return {
+    message: function message() {
+      var attributes = [isNativelyDisabled ? "`".concat(NATIVE_DISABLED_ATTR, "`") : undefined, isAriaDisabled ? "`".concat(CUSTOM_DISABLED_ATTR, "=\"true\"`") : undefined].filter(function (item) {
+        return item !== undefined;
+      }).join(' and ');
+      return "Expected element NOT to have attributes: ".concat(attributes, ".");
+    },
+    pass: !isDisabled
+  };
+};
+export var euiMatchers = {
+  toBeEuiDisabled: toBeEuiDisabled,
+  toBeEuiEnabled: toBeEuiEnabled
+};
+export var setupEuiMatchers = function setupEuiMatchers() {
+  expect.extend(euiMatchers);
+};
+export default euiMatchers;
+
+/* Utilities */
+
+/**
+ * Retrieve an element's disabled state details.
+ * Checks wheather the element has an `disabled` attribute or `aria-disabled="true"` attribute
+ * @returns { isDisabled: boolean; canBeDisabled: boolean; isNativelyDisabled: boolean; isAriaDisabled: boolean }
+ */
+export var getEuiDisabledState = function getEuiDisabledState(element) {
+  var canBeDisabled = elementCanBeDisabled(element);
+  var isNativelyDisabled = element.hasAttribute('disabled');
+  var isAriaDisabled = element.getAttribute('aria-disabled') === 'true';
+  var isDisabled = canBeDisabled && (isNativelyDisabled || isAriaDisabled);
+  return {
+    isDisabled: isDisabled,
+    canBeDisabled: canBeDisabled,
+    isNativelyDisabled: isNativelyDisabled,
+    isAriaDisabled: isAriaDisabled
+  };
+};
+
+/**
+ * Checks if an element is disabled via `disabled` attribute or `aria-disabled="true"`.
+ */
+export var isEuiDisabled = function isEuiDisabled(element) {
+  return getEuiDisabledState(element).isDisabled;
+};

package/optimize/es/utils/element_can_be_disabled.js

@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+var SUPPORTED_ELEMENTS = ['fieldset', 'input', 'select', 'optgroup', 'option', 'button', 'textarea'];
+export var elementCanBeDisabled = function elementCanBeDisabled(htmlElement) {
+  var _htmlElement$getAttri;
+  if (!htmlElement) return false;
+  var tagName = htmlElement.tagName && htmlElement.tagName.toLowerCase();
+  var roleName = (_htmlElement$getAttri = htmlElement.getAttribute('role')) !== null && _htmlElement$getAttri !== void 0 ? _htmlElement$getAttri : '';
+  return SUPPORTED_ELEMENTS.includes(roleName) || SUPPORTED_ELEMENTS.includes(tagName);
+};

package/optimize/es/utils/index.js

@@ -8,4 +8,5 @@
 
 export * from './prop_types';
 export * from './is_jest';
-export * from './type_guards';
+export * from './type_guards';
+export { elementCanBeDisabled } from './element_can_be_disabled';

package/optimize/lib/components/basic_table/collapsed_item_actions.js

@@ -87,7 +87,9 @@ var CollapsedItemActions = exports.CollapsedItemActions = function CollapsedItem
           },
           toolTipContent: toolTipContent,
           toolTipProps: {
-            delay: 'long'
+            delay: 'long',
+            // Avoid screen-readers announcing the same text twice
+            disableScreenReaderOutput: typeof buttonContent === 'string' && buttonContent === toolTipContent
           }
         }, buttonContent));
       }

package/optimize/lib/components/basic_table/default_item_action.js

@@ -39,6 +39,12 @@ var DefaultItemAction = exports.DefaultItemAction = function DefaultItemAction(_
   var icon = action.icon ? (0, _action_types.callWithItemIfFunction)(item)(action.icon) : undefined;
   var actionContent = (0, _action_types.callWithItemIfFunction)(item)(action.name);
   var tooltipContent = (0, _action_types.callWithItemIfFunction)(item)(action.description);
+  var tooltipProps = {
+    content: tooltipContent,
+    delay: 'long',
+    // Avoid screen-readers announcing the same text twice
+    disableScreenReaderOutput: typeof actionContent === 'string' && actionContent === tooltipContent
+  };
   var href = (0, _action_types.callWithItemIfFunction)(item)(action.href);
   var dataTestSubj = (0, _action_types.callWithItemIfFunction)(item)(action['data-test-subj']);
   var ariaLabelId = (0, _accessibility.useGeneratedHtmlId)();
@@ -82,8 +88,5 @@ var DefaultItemAction = exports.DefaultItemAction = function DefaultItemAction(_
       flush: "right"
     }, actionContent);
   }
-  return enabled ? (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_tool_tip.EuiToolTip, {
-    content: tooltipContent,
-    delay: "long"
-  }, button), ariaLabelledBy) : (0, _react2.jsx)(_react.default.Fragment, null, button, ariaLabelledBy);
+  return enabled ? (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_tool_tip.EuiToolTip, tooltipProps, button), ariaLabelledBy) : (0, _react2.jsx)(_react.default.Fragment, null, button, ariaLabelledBy);
 };

package/optimize/lib/components/bottom_bar/bottom_bar.js

@@ -56,6 +56,8 @@ var _EuiBottomBar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     style = _ref.style,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var styles = (0, _services.useEuiMemoizedStyles)(_bottom_bar.euiBottomBarStyles);
+  var _useEuiThemeCSSVariab = (0, _services.useEuiThemeCSSVariables)(),
+    setGlobalCSSVariables = _useEuiThemeCSSVariab.setGlobalCSSVariables;
 
   // Force some props if `fixed` position, but not if the user has supplied these
   affordForDisplacement = position !== 'fixed' ? false : affordForDisplacement;
@@ -70,6 +72,11 @@ var _EuiBottomBar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   (0, _react.useEffect)(function () {
     if (affordForDisplacement && usePortal) {
       document.body.style.paddingBottom = "".concat(dimensions.height, "px");
+
+      // EUI doesn't use this css variable, but it is useful for consumers
+      setGlobalCSSVariables({
+        '--euiBottomBarOffset': "".concat(dimensions.height, "px")
+      });
     }
     if (bodyClassName) {
       document.body.classList.add(bodyClassName);
@@ -77,12 +84,15 @@ var _EuiBottomBar = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return function () {
       if (affordForDisplacement && usePortal) {
         document.body.style.paddingBottom = '';
+        setGlobalCSSVariables({
+          '--euiBottomBarOffset': null
+        });
       }
       if (bodyClassName) {
         document.body.classList.remove(bodyClassName);
       }
     };
-  }, [affordForDisplacement, usePortal, dimensions, bodyClassName]);
+  }, [affordForDisplacement, usePortal, dimensions, bodyClassName, setGlobalCSSVariables]);
   var classes = (0, _classnames.default)('euiBottomBar', "euiBottomBar--".concat(position), className);
   var cssStyles = [styles.euiBottomBar, styles[position], styles[paddingSize]];
   var newStyle = _objectSpread({

package/optimize/lib/components/button/button_display/_button_display.js

@@ -13,10 +13,12 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _services = require("../../../services");
+var _href_validator = require("../../../services/security/href_validator");
+var _useEuiDisabledElement = require("../../../services/hooks/useEuiDisabledElement");
 var _button_display = require("./_button_display.styles");
 var _button_display_content = require("./_button_display_content");
-var _href_validator = require("../../../services/security/href_validator");
-var _excluded = ["element", "type", "children", "iconType", "iconSide", "iconSize", "size", "isDisabled", "disabled", "isLoading", "isSelected", "fullWidth", "minWidth", "contentProps", "textProps", "href", "target", "rel", "style"];
+var _excluded = ["element", "type", "children", "iconType", "iconSide", "iconSize", "size", "isDisabled", "disabled", "hasAriaDisabled", "isLoading", "isSelected", "fullWidth", "minWidth", "contentProps", "textProps", "href", "target", "rel", "style"],
+  _excluded2 = ["ref"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -62,6 +64,8 @@ var EuiButtonDisplay = exports.EuiButtonDisplay = /*#__PURE__*/(0, _react.forwar
     size = _ref2$size === void 0 ? 'm' : _ref2$size,
     isDisabled = _ref2.isDisabled,
     disabled = _ref2.disabled,
+    _ref2$hasAriaDisabled = _ref2.hasAriaDisabled,
+    hasAriaDisabled = _ref2$hasAriaDisabled === void 0 ? false : _ref2$hasAriaDisabled,
     isLoading = _ref2.isLoading,
     isSelected = _ref2.isSelected,
     fullWidth = _ref2.fullWidth,
@@ -78,6 +82,14 @@ var EuiButtonDisplay = exports.EuiButtonDisplay = /*#__PURE__*/(0, _react.forwar
     isDisabled: isDisabled || disabled,
     isLoading: isLoading
   });
+  var _useEuiDisabledElemen = (0, _useEuiDisabledElement.useEuiDisabledElement)({
+      isDisabled: buttonIsDisabled,
+      hasAriaDisabled: hasAriaDisabled,
+      onKeyDown: rest.onKeyDown
+    }),
+    disabledRef = _useEuiDisabledElemen.ref,
+    disabledButtonProps = (0, _objectWithoutProperties2.default)(_useEuiDisabledElemen, _excluded2);
+  var setCombinedRef = (0, _services.useCombinedRefs)([disabledRef, ref]);
   var styles = (0, _services.useEuiMemoizedStyles)(_button_display.euiButtonDisplayStyles);
   var cssStyles = [styles.euiButtonDisplay, styles[size], fullWidth && styles.fullWidth, minWidth == null && [styles.defaultMinWidth.defaultMinWidth, styles.defaultMinWidth[size]], buttonIsDisabled && styles.isDisabled];
   var innerNode = (0, _react2.jsx)(_button_display_content.EuiButtonDisplayContent, (0, _extends2.default)({
@@ -89,13 +101,14 @@ var EuiButtonDisplay = exports.EuiButtonDisplay = /*#__PURE__*/(0, _react.forwar
     textProps: textProps
   }, contentProps), children);
   var element = buttonIsDisabled ? 'button' : href ? 'a' : _element;
-  var elementProps = {};
-  // Element-specific attributes
+  var elementProps = {
+    ref: setCombinedRef
+  };
+  var buttonProps = {};
   if (element === 'button') {
-    elementProps = _objectSpread(_objectSpread({}, elementProps), {}, {
-      disabled: buttonIsDisabled,
+    buttonProps = _objectSpread({
       'aria-pressed': isSelected
-    });
+    }, disabledButtonProps);
   }
   var relObj = {};
   if (href && !buttonIsDisabled) {
@@ -109,12 +122,11 @@ var EuiButtonDisplay = exports.EuiButtonDisplay = /*#__PURE__*/(0, _react.forwar
   } else {
     relObj.type = type;
   }
-  return (0, _react2.createElement)(element, _objectSpread(_objectSpread(_objectSpread({
+  return (0, _react2.createElement)(element, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     css: cssStyles,
     style: minWidth ? _objectSpread(_objectSpread({}, style), {}, {
       minInlineSize: minWidth
-    }) : style,
-    ref: ref
-  }, elementProps), relObj), rest), innerNode);
+    }) : style
+  }, elementProps), relObj), rest), buttonProps), innerNode);
 });
 EuiButtonDisplay.displayName = 'EuiButtonDisplay';

package/optimize/lib/components/button/button_display/_button_display.styles.js

@@ -20,11 +20,11 @@ var euiButtonBaseCSS = exports.euiButtonBaseCSS = function euiButtonBaseCSS() {
   return "\n    display: inline-block;\n    appearance: none;\n    cursor: pointer;\n    ".concat((0, _global_styling.logicalTextAlignCSS)('center'), ";\n    white-space: nowrap;\n    ").concat((0, _global_styling.logicalCSS)('max-width', '100%'), ";\n    vertical-align: middle;\n  ");
 };
 var _ref = process.env.NODE_ENV === "production" ? {
-  name: "8595p9-isDisabled",
-  styles: "cursor:not-allowed;label:isDisabled;"
+  name: "col2gx-isDisabled",
+  styles: "cursor:not-allowed;&[aria-disabled='true']{pointer-events:none;>*{pointer-events:none;}};label:isDisabled;"
 } : {
-  name: "8595p9-isDisabled",
-  styles: "cursor:not-allowed;label:isDisabled;",
+  name: "col2gx-isDisabled",
+  styles: "cursor:not-allowed;&[aria-disabled='true']{pointer-events:none;>*{pointer-events:none;}};label:isDisabled;",
   toString: _EMOTION_STRINGIFIED_CSS_ERROR__
 };
 var euiButtonDisplayStyles = exports.euiButtonDisplayStyles = function euiButtonDisplayStyles(euiThemeContext) {

package/optimize/lib/components/button/button_empty/button_empty.js

@@ -11,12 +11,14 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _services = require("../../../services");
-var _button_display_content = require("../button_display/_button_display_content");
+var _useEuiDisabledElement = require("../../../services/hooks/useEuiDisabledElement");
 var _button = require("../../../global_styling/mixins/_button");
+var _button_display_content = require("../button_display/_button_display_content");
 var _button_display = require("../button_display/_button_display");
 var _button_empty = require("./button_empty.styles");
 var _react2 = require("@emotion/react");
-var _excluded = ["children", "className", "iconType", "iconSide", "iconSize", "color", "size", "flush", "isDisabled", "disabled", "isLoading", "href", "target", "rel", "type", "buttonRef", "contentProps", "textProps", "isSelected"];
+var _excluded = ["children", "className", "iconType", "iconSide", "iconSize", "color", "size", "flush", "isDisabled", "disabled", "hasAriaDisabled", "isLoading", "href", "target", "rel", "type", "buttonRef", "contentProps", "textProps", "isSelected"],
+  _excluded2 = ["ref"];
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -49,6 +51,8 @@ var EuiButtonEmpty = exports.EuiButtonEmpty = function EuiButtonEmpty(_ref) {
     flush = _ref.flush,
     _isDisabled = _ref.isDisabled,
     disabled = _ref.disabled,
+    _ref$hasAriaDisabled = _ref.hasAriaDisabled,
+    hasAriaDisabled = _ref$hasAriaDisabled === void 0 ? false : _ref$hasAriaDisabled,
     isLoading = _ref.isLoading,
     href = _ref.href,
     target = _ref.target,
@@ -65,6 +69,14 @@ var EuiButtonEmpty = exports.EuiButtonEmpty = function EuiButtonEmpty(_ref) {
     href: href,
     isLoading: isLoading
   });
+  var _useEuiDisabledElemen = (0, _useEuiDisabledElement.useEuiDisabledElement)({
+      isDisabled: isDisabled,
+      hasAriaDisabled: hasAriaDisabled,
+      onKeyDown: rest.onKeyDown
+    }),
+    disabledRef = _useEuiDisabledElemen.ref,
+    disabledButtonProps = (0, _objectWithoutProperties2.default)(_useEuiDisabledElemen, _excluded2);
+  var setCombinedRef = (0, _services.useCombinedRefs)([disabledRef, buttonRef]);
   var buttonColorStyles = (0, _button.useEuiButtonColorCSS)({
     display: 'empty'
   });
@@ -100,7 +112,7 @@ var EuiButtonEmpty = exports.EuiButtonEmpty = function EuiButtonEmpty(_ref) {
       href: href,
       target: target,
       rel: secureRel,
-      ref: buttonRef
+      ref: setCombinedRef
     }, rest), innerNode);
   }
   return (0, _react2.jsx)("button", (0, _extends2.default)({
@@ -108,7 +120,7 @@ var EuiButtonEmpty = exports.EuiButtonEmpty = function EuiButtonEmpty(_ref) {
     className: classes,
     css: cssStyles,
     type: type,
-    ref: buttonRef,
+    ref: setCombinedRef,
     "aria-pressed": isSelected
-  }, rest), innerNode);
+  }, rest, disabledButtonProps), innerNode);
 };