From 9ca630c091d6e4fce50beadda106e9ab9a269b98 Mon Sep 17 00:00:00 2001 From: Brady Blair Date: Wed, 16 Jun 2021 01:00:59 -0400 Subject: [PATCH 01/24] add 'success' as an acceptable prop value for color --- src/components/badge/badge.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/badge/badge.tsx b/src/components/badge/badge.tsx index 7f7d50eb4f9..889653fbbbf 100644 --- a/src/components/badge/badge.tsx +++ b/src/components/badge/badge.tsx @@ -84,7 +84,8 @@ export type EuiBadgeProps = { iconSide?: IconSide; /** - * Accepts either our palette colors (primary, secondary ..etc) or a hex value `#FFFFFF`, `#000`. + * Accepts either our palette colors (primary, success ..etc) or a hex value `#FFFFFF`, `#000`. + * **`secondary` color is DEPRECATED, use `success` instead** */ color?: IconColor; /** @@ -116,6 +117,7 @@ const colorToHexMap: { [color in IconColor]: string } = { // TODO - replace with variable once https://github.com/elastic/eui/issues/2731 is closed default: '#d3dae6', primary: visColors[1], + success: visColors[0], secondary: visColors[0], accent: visColors[2], warning: visColors[5], From 84ad3867d4c92eb207f55d3652c75b56d01487c7 Mon Sep 17 00:00:00 2001 From: Brady Blair Date: Wed, 16 Jun 2021 01:02:09 -0400 Subject: [PATCH 02/24] add snapshot of 'success' badge --- .../badge/__snapshots__/badge.test.tsx.snap | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/components/badge/__snapshots__/badge.test.tsx.snap b/src/components/badge/__snapshots__/badge.test.tsx.snap index b4e2750db4d..c20dbdd169a 100644 --- a/src/components/badge/__snapshots__/badge.test.tsx.snap +++ b/src/components/badge/__snapshots__/badge.test.tsx.snap @@ -277,6 +277,23 @@ exports[`EuiBadge props color secondary is rendered 1`] = ` `; +exports[`EuiBadge props color success is rendered 1`] = ` + + + + Content + + + +`; + exports[`EuiBadge props color warning is rendered 1`] = ` `; +exports[`EuiBadge props style is rendered with success 1`] = ` + + + + Content + + + +`; + exports[`EuiBadge props style is rendered with warning 1`] = ` Date: Wed, 16 Jun 2021 01:03:32 -0400 Subject: [PATCH 03/24] update docs to use 'success' --- src-docs/src/views/badge/badge.js | 4 ++-- src-docs/src/views/badge/badge_button.js | 2 +- src-docs/src/views/badge/badge_example.js | 6 +++--- src-docs/src/views/badge/badge_health.js | 2 +- src-docs/src/views/badge/badge_href.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src-docs/src/views/badge/badge.js b/src-docs/src/views/badge/badge.js index 3071a4fc862..303cee75563 100644 --- a/src-docs/src/views/badge/badge.js +++ b/src-docs/src/views/badge/badge.js @@ -14,7 +14,7 @@ const badges = [ 'default', 'hollow', 'primary', - 'secondary', + 'success', 'accent', 'warning', 'danger', @@ -82,7 +82,7 @@ export default () => { - + {isDisabled ? 'Disabled badge' : 'Disable me!'} diff --git a/src-docs/src/views/badge/badge_button.js b/src-docs/src/views/badge/badge_button.js index 905cd93e15e..2e3616da8b5 100644 --- a/src-docs/src/views/badge/badge_button.js +++ b/src-docs/src/views/badge/badge_button.js @@ -30,7 +30,7 @@ export default () => ( {}} diff --git a/src-docs/src/views/badge/badge_example.js b/src-docs/src/views/badge/badge_example.js index 708b12563a8..1a03303840b 100644 --- a/src-docs/src/views/badge/badge_example.js +++ b/src-docs/src/views/badge/badge_example.js @@ -33,7 +33,7 @@ const badgeSnippet = [ `, `Custom `, - `Disabled + `Disabled `, ]; @@ -66,7 +66,7 @@ const badgeButtonSnippet = [ `Healthy + `Healthy `, `Warning `, diff --git a/src-docs/src/views/badge/badge_health.js b/src-docs/src/views/badge/badge_health.js index 4f60ede9955..7b6c5180dd6 100644 --- a/src-docs/src/views/badge/badge_health.js +++ b/src-docs/src/views/badge/badge_health.js @@ -9,7 +9,7 @@ import { export default () => ( - Healthy + Healthy Warning diff --git a/src-docs/src/views/badge/badge_href.js b/src-docs/src/views/badge/badge_href.js index 0a221b63afa..34e33a7100c 100644 --- a/src-docs/src/views/badge/badge_href.js +++ b/src-docs/src/views/badge/badge_href.js @@ -30,7 +30,7 @@ export default () => ( - + disabled anchor badge From b1843bb18cacb2f113bdccce028c2671052843ff Mon Sep 17 00:00:00 2001 From: Brady Blair Date: Wed, 16 Jun 2021 01:54:08 -0400 Subject: [PATCH 04/24] add 'success' to Expression and make it the default color --- src-docs/src/views/expression/colors.tsx | 2 +- .../__snapshots__/expression.test.tsx.snap | 36 ++++++++++++++----- src/components/expression/_variables.scss | 1 + src/components/expression/expression.tsx | 4 ++- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src-docs/src/views/expression/colors.tsx b/src-docs/src/views/expression/colors.tsx index b5ecddc0f80..18d022e19d6 100644 --- a/src-docs/src/views/expression/colors.tsx +++ b/src-docs/src/views/expression/colors.tsx @@ -5,7 +5,7 @@ import { EuiSpacer } from '../../../../src/components/spacer'; export default () => (
- + diff --git a/src/components/expression/__snapshots__/expression.test.tsx.snap b/src/components/expression/__snapshots__/expression.test.tsx.snap index 9a2b5381789..48d58650501 100644 --- a/src/components/expression/__snapshots__/expression.test.tsx.snap +++ b/src/components/expression/__snapshots__/expression.test.tsx.snap @@ -100,6 +100,26 @@ exports[`EuiExpression props color subdued is rendered 1`] = ` `; +exports[`EuiExpression props color success is rendered 1`] = ` + + + the answer is + + + + 42 + + +`; + exports[`EuiExpression props color warning is rendered 1`] = ` ; /** * Color of the `description` + * **`secondary` color is DEPRECATED, use `success` instead** */ color?: ExpressionColor; /** @@ -116,7 +118,7 @@ export const EuiExpression: FunctionComponent Date: Wed, 16 Jun 2021 03:08:22 -0400 Subject: [PATCH 05/24] add deprecation notice --- src/components/icon/icon.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 0f0d42c5965..8410f7612c3 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -516,6 +516,7 @@ export type EuiIconProps = CommonProps & /** * One of EUI's color palette or a valid CSS color value https://developer.mozilla.org/en-US/docs/Web/CSS/color_value. * Note that coloring only works if your SVG is removed of fill attributes. + * **`secondary` color is DEPRECATED, use `success` instead** */ color?: IconColor; /** From cfa524a2430742124e7d377d65a8bb128b287ffd Mon Sep 17 00:00:00 2001 From: Brady Blair Date: Wed, 16 Jun 2021 03:14:25 -0400 Subject: [PATCH 06/24] update to use the color prop 'success' over 'secondary' --- src-docs/src/views/progress/progress_chart.js | 2 +- src/components/progress/progress.tsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src-docs/src/views/progress/progress_chart.js b/src-docs/src/views/progress/progress_chart.js index 3606691d7fc..16ac692236d 100644 --- a/src-docs/src/views/progress/progress_chart.js +++ b/src-docs/src/views/progress/progress_chart.js @@ -21,7 +21,7 @@ export default () => ( diff --git a/src/components/progress/progress.tsx b/src/components/progress/progress.tsx index 11da93b2f0c..a46823fcb2a 100644 --- a/src/components/progress/progress.tsx +++ b/src/components/progress/progress.tsx @@ -125,6 +125,7 @@ export type EuiProgressProps = CommonProps & { size?: EuiProgressSize; /** * One of EUI's color palette, vis colors or a valid CSS color value https://developer.mozilla.org/en-US/docs/Web/CSS/color_value + * **`secondary` color is DEPRECATED, use `success` instead** */ color?: EuiProgressColor | CSSProperties['color']; position?: EuiProgressPosition; @@ -151,7 +152,7 @@ export const EuiProgress: FunctionComponent> = ({ className, - color = 'secondary', + color = 'success', size = 'm', position = 'static', max, From 2e3488d9c6a4c87a924f6915ca8a52b19d56f886 Mon Sep 17 00:00:00 2001 From: Brady Blair Date: Wed, 16 Jun 2021 03:16:08 -0400 Subject: [PATCH 07/24] update snapshots to use the euiProgress--success class --- .../__snapshots__/progress.test.tsx.snap | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/progress/__snapshots__/progress.test.tsx.snap b/src/components/progress/__snapshots__/progress.test.tsx.snap index 5eca6e824e1..c0726cf16b8 100644 --- a/src/components/progress/__snapshots__/progress.test.tsx.snap +++ b/src/components/progress/__snapshots__/progress.test.tsx.snap @@ -112,7 +112,7 @@ exports[`EuiProgress color warning is rendered 1`] = ` exports[`EuiProgress has labelProps 1`] = ` Array [
@@ -144,7 +144,7 @@ exports[`EuiProgress has max 1`] = ` exports[`EuiProgress has value 1`] = `
`; @@ -152,7 +152,7 @@ exports[`EuiProgress has value 1`] = ` exports[`EuiProgress has valueText and label 1`] = ` Array [