Cleanup and CL

elastic · Jun 27, 2022 · ee7c0a7 · ee7c0a7
1 parent ad78752
commit ee7c0a7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/src/components/button/button.tsx b/src/components/button/button.tsx
@@ -205,7 +205,7 @@ export const EuiButtonDisplayDeprecated = forwardRef<
     },
     ref
   ) => {
-    const buttonIsDisabled = isLoading || isDisabled;
+    const buttonIsDisabled = isButtonDisabled({ isLoading, isDisabled });
 
     const classes = classNames(
       baseClassName,
@@ -215,9 +215,7 @@ export const EuiButtonDisplayDeprecated = forwardRef<
       size && sizeToClassNameMap[size]
         ? `${baseClassName}${sizeToClassNameMap[size]}`
         : null,
-      // fill && `${baseClassName}--fill`,
       fullWidth && `${baseClassName}--fullWidth`,
-      // buttonIsDisabled && `${baseClassName}-isDisabled`,
       className
     );
 

diff --git a/src/components/button/button_group/_button_group_button.scss b/src/components/button/button_group/_button_group_button.scss
@@ -89,21 +89,6 @@
     }
   }
 
-  // // Fix ghost/disabled look specifically
-  // .euiButtonGroupButton.euiButtonGroupButton-isDisabled.euiButtonGroupButton--ghost {
-  //   &,
-  //   &:hover,
-  //   &:focus,
-  //   &:focus-within {
-  //     color: $euiButtonColorGhostDisabled;
-  //   }
-
-  //   &.euiButtonGroupButton-isSelected {
-  //     background-color: $euiButtonColorGhostDisabled;
-  //     color: makeHighContrastColor($euiButtonColorGhostDisabled, $euiButtonColorGhostDisabled, 2);
-  //   }
-  // }
-
   .euiButtonGroupButton-isSelected {
     z-index: 0;
   }

diff --git a/upcoming_changelogs/5989.md b/upcoming_changelogs/5989.md
@@ -0,0 +1,16 @@
+- Updated button `ghost` colors to be `colorMode = 'dark'` themed `text` buttons
+- Renamed `ButtonColor` and `ButtonSize` types to prefixed versions `EuiButtonColor` and `EuiButtonSize`
+
+**Deprecations**
+
+- Deprecated `ghost` color for `EuiButton`, `EuiButtonIcon`, `EuiButtonEmpty`
+
+**Breaking changes**
+
+- Removed `EuiButtonIconColor` and `EuiButtonEmptyColor` types, use `EuiButtonIconProps['color']` and `EuiButtonEmptyProps['color']` instead
+- Removed support for `ghost` color from `EuiButtonGroup`
+
+**CSS-in-JS**
+
+- Converted `EuiButton` to Emotion
+- Converted color styles of `EuiButtonIcon`, `EuiButtonEmpty`, `EuiButtonGroup`