@elastic/eui 102.2.0 → 102.3.0

package/optimize/es/global_styling/mixins/_button.js

@@ -13,14 +13,34 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  */
 
 import { css, keyframes } from '@emotion/react';
-import { getTokenName, euiCanAnimate } from '@elastic/eui-theme-common';
-import { makeHighContrastColor, useEuiMemoizedStyles } from '../../services';
+import { getTokenName, euiCanAnimate, mathWithUnits } from '@elastic/eui-theme-common';
+import { makeHighContrastColor, useEuiMemoizedStyles, isEuiThemeRefreshVariant } from '../../services';
+import { highContrastModeStyles, logicalCSS } from '../functions';
 
 /** Tentative usage; these exist only to be used as button directly when used within other components */
 export var SEVERITY_COLORS = ['neutral', 'risk'];
 export var BUTTON_COLORS = ['text', 'accent', 'accentSecondary', 'primary', 'success', 'warning', 'danger'];
 export var EXTENDED_BUTTON_COLORS = [].concat(BUTTON_COLORS, SEVERITY_COLORS);
 export var BUTTON_DISPLAYS = ['base', 'fill', 'empty'];
+var getButtonVariantTokenValues = function getButtonVariantTokenValues(_ref, color, variant) {
+  var euiTheme = _ref.euiTheme,
+    highContrastMode = _ref.highContrastMode;
+  var backgroundTokenBase = variant === 'base' ? 'background' : "background".concat(variant.charAt(0).toUpperCase() + variant.slice(1));
+  var textTokenBase = variant === 'filled' ? 'textColorFilled' : 'textColor';
+  var backgroundTokenName = getTokenName(backgroundTokenBase, color);
+  var textTokenName = getTokenName(textTokenBase, color);
+  var backgroundHoverTokenName = getTokenName(backgroundTokenBase, color, 'hover');
+  var backgroundActiveTokenName = getTokenName(backgroundTokenBase, color, 'active');
+  var highContrastForeground = ['warning', 'neutral', 'risk'].includes(color) ? euiTheme.colors.ink : color === 'disabled' ? euiTheme.components.buttons[textTokenName] : euiTheme.colors.textInverse;
+  var foreground = variant === 'filled' ? highContrastMode ? highContrastForeground : euiTheme.components.buttons[textTokenName] : euiTheme.components.buttons[textTokenName];
+  return {
+    color: foreground,
+    background: euiTheme.components.buttons[backgroundTokenName],
+    backgroundHover: euiTheme.components.buttons[backgroundHoverTokenName],
+    backgroundActive: euiTheme.components.buttons[backgroundActiveTokenName]
+  };
+};
+
 /**
  * Creates the `base` version of button styles with proper text contrast.
  * @param euiThemeContext
@@ -28,11 +48,9 @@ export var BUTTON_DISPLAYS = ['base', 'fill', 'empty'];
  * @returns Style object `{ backgroundColor, color }`
  */
 export var euiButtonColor = function euiButtonColor(euiThemeContext, color) {
-  var euiTheme = euiThemeContext.euiTheme;
-  var backgroundTokenName = getTokenName('background', color);
-  var textTokenName = getTokenName('textColor', color);
-  var foreground = euiTheme.components.buttons[textTokenName];
-  var background = euiTheme.components.buttons[backgroundTokenName];
+  var buttonColors = getButtonVariantTokenValues(euiThemeContext, color, 'base');
+  var foreground = buttonColors.color;
+  var background = buttonColors.background;
   return _objectSpread({
     color: background === 'transparent' || color === 'disabled' ? foreground : makeHighContrastColor(foreground)(background),
     backgroundColor: background
@@ -46,13 +64,9 @@ export var euiButtonColor = function euiButtonColor(euiThemeContext, color) {
  * @returns Style object `{ backgroundColor, color }`
  */
 export var euiButtonFillColor = function euiButtonFillColor(euiThemeContext, color) {
-  var euiTheme = euiThemeContext.euiTheme,
-    highContrastMode = euiThemeContext.highContrastMode;
-  var backgroundTokenName = getTokenName('backgroundFilled', color);
-  var textColorTokenName = getTokenName('textColorFilled', color);
-  var highContrastForeground = ['warning', 'neutral', 'risk'].includes(color) ? euiTheme.colors.ink : color === 'disabled' ? euiTheme.components.buttons[textColorTokenName] : euiTheme.colors.textInverse;
-  var foreground = highContrastMode ? highContrastForeground : euiTheme.components.buttons[textColorTokenName];
-  var background = euiTheme.components.buttons[backgroundTokenName];
+  var buttonColors = getButtonVariantTokenValues(euiThemeContext, color, 'filled');
+  var foreground = buttonColors.color;
+  var background = buttonColors.background;
   return _objectSpread({
     color: foreground,
     backgroundColor: background
@@ -76,9 +90,9 @@ export var euiButtonEmptyColor = function euiButtonEmptyColor(euiThemeContext, c
       break;
     default:
       {
-        var backgroundToken = getTokenName('backgroundEmpty', color, 'hover');
+        var buttonColors = getButtonVariantTokenValues(euiThemeContext, color, 'empty');
         foreground = euiButtonColor(euiThemeContext, color).color;
-        background = euiThemeContext.euiTheme.components.buttons[backgroundToken];
+        background = buttonColors.backgroundHover;
         break;
       }
   }
@@ -101,6 +115,8 @@ export var useEuiButtonColorCSS = function useEuiButtonColorCSS() {
   return colorsDisplaysMap[display];
 };
 var euiButtonDisplaysColors = function euiButtonDisplaysColors(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = isEuiThemeRefreshVariant(euiThemeContext, 'buttonVariant');
   var COLORS = [].concat(_toConsumableArray(EXTENDED_BUTTON_COLORS), ['disabled']);
   var displaysColorsMap = {};
   BUTTON_DISPLAYS.forEach(function (display) {
@@ -108,14 +124,28 @@ var euiButtonDisplaysColors = function euiButtonDisplaysColors(euiThemeContext)
     COLORS.forEach(function (color) {
       switch (display) {
         case 'base':
-          displaysColorsMap[display][color] = /*#__PURE__*/css(euiButtonColor(euiThemeContext, color), ";;label:displaysColorsMap-display-color;");
-          break;
+          {
+            var buttonColors = getButtonVariantTokenValues(euiThemeContext, color, 'base');
+            var borderStyle = color === 'text' && "\n              border: ".concat(euiTheme.border.width.thin, " solid ").concat(euiTheme.colors.borderBasePlain, ";\n            ");
+            var refreshVariantStyles = isRefreshVariant && "\n            ".concat(_interactionStyles(euiThemeContext, buttonColors, 'overlay'), "\n            ").concat(borderStyle, "\n          ");
+            displaysColorsMap[display][color] = /*#__PURE__*/css(euiButtonColor(euiThemeContext, color), " ", refreshVariantStyles, ";;label:displaysColorsMap-display-color;");
+            break;
+          }
         case 'fill':
-          displaysColorsMap[display][color] = /*#__PURE__*/css(euiButtonFillColor(euiThemeContext, color), "outline-color:", euiThemeContext.colorMode === 'DARK' && color === 'text' ? 'currentColor' : euiThemeContext.euiTheme.colors.fullShade, ";;label:displaysColorsMap-display-color;");
-          break;
+          {
+            var _buttonColors = getButtonVariantTokenValues(euiThemeContext, color, 'filled');
+            var _refreshVariantStyles = isRefreshVariant && _interactionStyles(euiThemeContext, _buttonColors);
+            displaysColorsMap[display][color] = /*#__PURE__*/css(euiButtonFillColor(euiThemeContext, color), "outline-color:", euiThemeContext.colorMode === 'DARK' && color === 'text' ? 'currentColor' : euiThemeContext.euiTheme.colors.fullShade, ";", _refreshVariantStyles, ";;label:displaysColorsMap-display-color;");
+            break;
+          }
         case 'empty':
-          displaysColorsMap[display][color] = /*#__PURE__*/css("color:", euiButtonEmptyColor(euiThemeContext, color).color, ";&:focus,&:active{background-color:", euiButtonEmptyColor(euiThemeContext, color).backgroundColor, ";};label:displaysColorsMap-display-color;");
-          break;
+          {
+            var _buttonColors2 = getButtonVariantTokenValues(euiThemeContext, color, 'empty');
+            var classicVariantStyles = !isRefreshVariant && "\n              &:focus,\n              &:active {\n                background-color: ".concat(euiButtonEmptyColor(euiThemeContext, color).backgroundColor, ";\n              }\n            ");
+            var _refreshVariantStyles2 = isRefreshVariant && _interactionStyles(euiThemeContext, _buttonColors2, 'overlay');
+            displaysColorsMap[display][color] = /*#__PURE__*/css("color:", euiButtonEmptyColor(euiThemeContext, color).color, ";", classicVariantStyles, " ", _refreshVariantStyles2, ";;label:displaysColorsMap-display-color;");
+            break;
+          }
       }
 
       // Tweak auto-generated Emotion label/className output
@@ -134,9 +164,10 @@ export var useEuiButtonFocusCSS = function useEuiButtonFocusCSS() {
   return useEuiMemoizedStyles(euiButtonFocusCSS);
 };
 var euiButtonFocusAnimation = keyframes(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  50% {\n    transform: translateY(1px);\n  }\n"])));
-var euiButtonFocusCSS = function euiButtonFocusCSS(_ref) {
-  var euiTheme = _ref.euiTheme;
-  var focusCSS = /*#__PURE__*/css(euiCanAnimate, "{transition:transform ", euiTheme.animation.normal, " ease-in-out,background-color ", euiTheme.animation.normal, " ease-in-out;&:hover:not(:disabled){transform:translateY(-1px);}&:focus{animation:", euiButtonFocusAnimation, " ", euiTheme.animation.normal, " ", euiTheme.animation.bounce, ";}&:active:not(:disabled){transform:translateY(1px);}};label:focusCSS;");
+var euiButtonFocusCSS = function euiButtonFocusCSS(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = isEuiThemeRefreshVariant(euiThemeContext, 'buttonVariant');
+  var focusCSS = isRefreshVariant ? /*#__PURE__*/css(";label:focusCSS;") : /*#__PURE__*/css(euiCanAnimate, "{transition:transform ", euiTheme.animation.normal, " ease-in-out,background-color ", euiTheme.animation.normal, " ease-in-out;&:hover:not(:disabled){transform:translateY(-1px);}&:focus{animation:", euiButtonFocusAnimation, " ", euiTheme.animation.normal, " ", euiTheme.animation.bounce, ";}&:active:not(:disabled){transform:translateY(1px);}};label:focusCSS;");
   // Remove the auto-generated label.
   // We could typically avoid a label by using a plain string `` instead of css``,
   // but we need css`` for keyframes`` to work for the focus animation
@@ -148,27 +179,63 @@ var euiButtonFocusCSS = function euiButtonFocusCSS(_ref) {
  * Map of `size` props to various sizings/scales
  * that should remain consistent across all buttons
  */
-export var euiButtonSizeMap = function euiButtonSizeMap(_ref2) {
-  var euiTheme = _ref2.euiTheme;
+export var euiButtonSizeMap = function euiButtonSizeMap(euiThemeContext) {
+  var euiTheme = euiThemeContext.euiTheme;
+  var isRefreshVariant = isEuiThemeRefreshVariant(euiThemeContext, 'buttonVariant');
   return {
     xs: {
+      minWidth: euiTheme.base * (isRefreshVariant ? 6 : 7),
       height: euiTheme.size.l,
       radius: euiTheme.border.radius.small,
       fontScale: 'xs'
     },
     s: {
+      minWidth: euiTheme.base * (isRefreshVariant ? 6 : 7),
       height: euiTheme.size.xl,
       radius: euiTheme.border.radius.small,
       fontScale: 's'
     },
     m: {
+      minWidth: euiTheme.base * 7,
       height: euiTheme.size.xxl,
-      radius: euiTheme.border.radius.medium,
+      radius: isRefreshVariant ? euiTheme.border.radius.small : euiTheme.border.radius.medium,
       fontScale: 's'
     }
   };
 };
 
+/**
+ * internal styles util for applying button background color on hover
+ */
+var _interactionStyles = function _interactionStyles(euiThemeContext, buttonColors) {
+  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'fill';
+  var isRefreshVariant = isEuiThemeRefreshVariant(euiThemeContext, 'buttonVariant');
+  if (!isRefreshVariant) return "";
+  var baseStyles = function baseStyles() {
+    // button hover is applied as pseudo element with a transparent background-color
+    if (type === 'overlay') {
+      return "\n        position: relative;\n        overflow: hidden;\n\n        &:hover:not(:disabled) {\n          &::before {\n            content: '';\n            position: absolute;\n            /* should stay under the content */\n            z-index: 0;\n            inset: 0;\n            background-color: ".concat(buttonColors.backgroundHover, ";\n            pointer-events: none;\n          }\n        }\n\n        &:active:not(:disabled) {\n          &::before {\n            ").concat(logicalCSS('width', '100%'), "\n            ").concat(logicalCSS('height', '100%'), "\n\n            content: '';\n            position: absolute;\n            inset: 0;\n            background-color: ").concat(buttonColors.backgroundActive, ";\n          }\n        }\n      ");
+    }
+
+    // button hover is applied as opaque color
+    return "\n      &:hover:not(:disabled) {\n        background-color: ".concat(buttonColors.backgroundHover, ";\n      }\n\n      &:active:not(:disabled) {\n        background-color: ").concat(buttonColors.backgroundActive, ";\n      }\n    ");
+  };
+  return "    \n    ".concat(highContrastModeStyles(euiThemeContext, {
+    none: baseStyles(),
+    forced: "\n        position: relative;\n        overflow: hidden;\n\n        ".concat(highContrastHoverIndicatorStyles(euiThemeContext), "\n      ")
+  }), "\n  ");
+};
+
+/**
+ * creates a bottom border on hover/focus to ensure a visible change as forced mode removed background colors
+ */
+export var highContrastHoverIndicatorStyles = function highContrastHoverIndicatorStyles(_ref2) {
+  var euiTheme = _ref2.euiTheme;
+  return "\n  &:hover:not(:disabled) {\n    transition: none;\n\n    /* using pseudo border to be able to control the color */\n    &::after {\n      content: '';\n      position: absolute;\n      inset: ".concat(euiTheme.border.width.thin, ";\n      border: ").concat(euiTheme.border.width.thick, " solid var(--highContrastHoverIndicatorColor, ").concat(euiTheme.border.color, ");\n      border-radius: ").concat(mathWithUnits(euiTheme.border.radius.small, function (x) {
+    return x / 2;
+  }), ";\n      background-color: transparent;\n      pointer-events: none;\n    }\n  }\n");
+};
+
 /**
  * Internal util for high contrast button borders
  */

package/optimize/es/services/theme/index.js

@@ -12,4 +12,5 @@ export { EuiThemeProvider } from './provider';
 export { useEuiMemoizedStyles, withEuiStylesMemoizer, RenderWithEuiStylesMemoizer } from './style_memoization';
 export { getEuiDevProviderWarning, setEuiDevProviderWarning } from './warning';
 export { buildTheme, computed, isInverseColorMode, getColorMode, getComputed, getOn, mergeDeep, setOn, Computed } from './utils';
-export { COLOR_MODES_STANDARD } from './types';
+export { COLOR_MODES_STANDARD } from './types';
+export * from './theme_variant';

package/optimize/es/services/theme/provider.js

@@ -134,9 +134,35 @@ export var EuiThemeProvider = function EuiThemeProvider(_ref) {
   }, [highContrastMode]);
   useEffect(function () {
     if (!isParentTheme.current) {
-      setTheme(getComputed(system, buildTheme(modificationsWithHighContrast, "_".concat(system.key)), colorMode, highContrastMode));
+      /* Enables recomputation of component colors when flags are overridden on the provider 
+      by adding the respective key to modifications to trigger a recomputation. */
+      // TODO: remove once visual refresh is completed and flags are obsolete
+      var flagsToRecompute = [{
+        flag: 'buttonVariant',
+        componentKey: 'buttons'
+      }];
+      var keys = {};
+      var forceRecomputeComponents = flagsToRecompute.some(function (item) {
+        var _modifications$flags, _modifications$compon;
+        if (Object.keys((_modifications$flags = modifications.flags) !== null && _modifications$flags !== void 0 ? _modifications$flags : {}).includes(item.flag) && !Object.keys((_modifications$compon = modifications.components) !== null && _modifications$compon !== void 0 ? _modifications$compon : {}).includes(item.componentKey)) {
+          keys[item.componentKey] = {
+            LIGHT: {},
+            DARK: {}
+          };
+          return true;
+        }
+        return false;
+      });
+      var componentModifications = forceRecomputeComponents ? {
+        components: keys
+      } : {};
+
+      // force recomputing of color & component tokens based on flag changes
+      var enhancedModifications = _objectSpread(_objectSpread({}, modificationsWithHighContrast), componentModifications);
+      var rebuiltTheme = getComputed(system, buildTheme(enhancedModifications, "_".concat(system.key)), colorMode, highContrastMode);
+      setTheme(rebuiltTheme);
     }
-  }, [colorMode, highContrastMode, system, modificationsWithHighContrast]);
+  }, [colorMode, highContrastMode, system, modificationsWithHighContrast, modifications]);
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
     themeCSSVariables = _useState10[0],

package/optimize/es/services/theme/theme_variant.js

@@ -0,0 +1,22 @@
+/*
+ * 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 { useEuiTheme } from './hooks';
+export var isEuiThemeRefreshVariant = function isEuiThemeRefreshVariant(_ref, flag) {
+  var euiTheme = _ref.euiTheme;
+  return euiTheme.flags[flag] === 'refresh';
+};
+
+/**
+ * Util to retrieve visual variant for UI elements
+ * Note: Temporary only - will be removed once the visual refresh is completed.
+ */
+export var useEuiThemeRefreshVariant = function useEuiThemeRefreshVariant(flag) {
+  var euiThemeContext = useEuiTheme();
+  return isEuiThemeRefreshVariant(euiThemeContext, flag);
+};