diff --git a/src-docs/src/views/icon/playground.js b/src-docs/src/views/icon/playground.js index 9ff0b40a685..84551d4e050 100644 --- a/src-docs/src/views/icon/playground.js +++ b/src-docs/src/views/icon/playground.js @@ -9,7 +9,8 @@ export default () => { const docgenInfo = Array.isArray(EuiIcon.__docgenInfo) ? EuiIcon.__docgenInfo[0] : EuiIcon.__docgenInfo; - const propsToUse = propUtilityForPlayground(docgenInfo.props); + + const propsToUse = propUtilityForPlayground(docgenInfo.props, true); propsToUse.type = iconValidator({ ...propsToUse.type }, 'grid'); diff --git a/src/components/badge/badge.tsx b/src/components/badge/badge.tsx index adc43f0d494..b4dd9725557 100644 --- a/src/components/badge/badge.tsx +++ b/src/components/badge/badge.tsx @@ -84,7 +84,7 @@ export type EuiBadgeProps = { /** * Props passed to the close button. */ - closeButtonProps?: Partial>; + closeButtonProps?: Partial>; } & CommonProps & ExclusiveUnion & ExclusiveUnion< diff --git a/src/components/form/form_control_layout/_form_control_layout.scss b/src/components/form/form_control_layout/_form_control_layout.scss index dc03011fdbf..7c0d89a0b33 100644 --- a/src/components/form/form_control_layout/_form_control_layout.scss +++ b/src/components/form/form_control_layout/_form_control_layout.scss @@ -1,10 +1,8 @@ -@import '../../icon/variables'; - .euiFormControlLayout { // Let the height expand as needed @include euiFormControlSize($includeAlternates: true); - $iconSize: map-get($euiIconSizes, 'medium'); + $iconSize: map-get($euiFormControlIconSizes, 'medium'); $iconPadding: $euiFormControlPadding; $marginBetweenIcons: $euiFormControlPadding / 2; @@ -16,7 +14,7 @@ padding-right: $iconPadding + ($iconSize + $marginBetweenIcons) * $i; &[class*='compressed'] { - $iconSizeCompressed: map-get($euiIconSizes, 'small'); + $iconSizeCompressed: map-get($euiFormControlIconSizes, 'small'); $iconPaddingCompressed: $euiFormControlCompressedPadding; padding-right: $iconPaddingCompressed + ($iconSizeCompressed + $marginBetweenIcons) * $i; diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap index 696386a4788..20db7f0a03e 100644 --- a/src/components/icon/__snapshots__/icon.test.tsx.snap +++ b/src/components/icon/__snapshots__/icon.test.tsx.snap @@ -3,8 +3,9 @@ exports[`EuiIcon is rendered 1`] = `