diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png index 67f60a30e04..6498a30ff4f 100644 Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png differ diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Playground.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Playground.png index 0e38514b19a..d1cdeef2dfe 100644 Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Playground.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiColorPicker_EuiColorPicker_Playground.png differ diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Column_Layout.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Column_Layout.png index a0cbb25741b..e6c5a8dba4e 100644 Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Column_Layout.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Column_Layout.png differ diff --git a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Inline_Layout.png b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Inline_Layout.png index dedd36eba49..760f51c7ae0 100644 Binary files a/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Inline_Layout.png and b/packages/eui/.loki/reference/chrome_desktop_Forms_EuiForm_EuiFormRow_Inline_Layout.png differ diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png index 263d4deeae5..7b02cd1dae9 100644 Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Inline_With_All_Elements.png differ diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Playground.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Playground.png index 0af6227b948..f77406d7d8d 100644 Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Playground.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiColorPicker_EuiColorPicker_Playground.png differ diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Column_Layout.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Column_Layout.png index 8eaa518dee4..888bfe42431 100644 Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Column_Layout.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Column_Layout.png differ diff --git a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Inline_Layout.png b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Inline_Layout.png index aae8c03aecd..283ce732600 100644 Binary files a/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Inline_Layout.png and b/packages/eui/.loki/reference/chrome_mobile_Forms_EuiForm_EuiFormRow_Inline_Layout.png differ diff --git a/packages/eui/changelogs/upcoming/8113.md b/packages/eui/changelogs/upcoming/8113.md new file mode 100644 index 00000000000..95898430006 --- /dev/null +++ b/packages/eui/changelogs/upcoming/8113.md @@ -0,0 +1,3 @@ +**Breaking changes** + +- Removed `EuiFormRow`'s deprecated `columnCompressedSwitch` display prop. Use `columnCompressed` instead diff --git a/packages/eui/src-docs/src/views/form_compressed/form_compressed_example.js b/packages/eui/src-docs/src/views/form_compressed/form_compressed_example.js index 0573db2f943..b1f0341991e 100644 --- a/packages/eui/src-docs/src/views/form_compressed/form_compressed_example.js +++ b/packages/eui/src-docs/src/views/form_compressed/form_compressed_example.js @@ -93,20 +93,12 @@ export const FormCompressedExample = { EuiFormRow, }, demo: , - snippet: [ - ` `, - ` - -`, - ], }, { title: 'Contextual help', diff --git a/packages/eui/src/components/color_picker/color_picker.tsx b/packages/eui/src/components/color_picker/color_picker.tsx index 362c1bd6d3b..931ac3055ef 100644 --- a/packages/eui/src/components/color_picker/color_picker.tsx +++ b/packages/eui/src/components/color_picker/color_picker.tsx @@ -456,7 +456,6 @@ export const EuiColorPicker: FunctionComponent = ({ mode === 'secondaryInput' || secondaryInputDisplay !== 'none'; const inlineInput = showSecondaryInput && ( diff --git a/packages/eui/src/components/form/form_row/__snapshots__/form_row.test.tsx.snap b/packages/eui/src/components/form/form_row/__snapshots__/form_row.test.tsx.snap index 2bca5e5dcd4..f6a962b5275 100644 --- a/packages/eui/src/components/form/form_row/__snapshots__/form_row.test.tsx.snap +++ b/packages/eui/src/components/form/form_row/__snapshots__/form_row.test.tsx.snap @@ -78,21 +78,6 @@ exports[`EuiFormRow props display type columnCompressed is rendered 1`] = ` `; -exports[`EuiFormRow props display type columnCompressedSwitch is rendered 1`] = ` -
-
- -
-
-`; - exports[`EuiFormRow props display type row is rendered 1`] = `
{ ${logicalCSS('margin-top', euiTheme.size.base)} } `, - // No difference from the uncompressed row for this current theme AFAICT - // TODO: Deprecate prop + // No difference from the uncompressed row for the current EUI theme get rowCompressed() { return this.row; }, @@ -94,11 +93,6 @@ export const euiFormRowStyles = (euiThemeContext: UseEuiTheme) => { } } `, - // Handled by :has CSS now rather than a separate modifier/prop - // TODO: Deprecate prop - get columnCompressedSwitch() { - return this.columnCompressed; - }, // Center display is primarily for inline form rows, which may have have // field content that is shorter than form controls (e.g. switches, text), diff --git a/packages/eui/src/components/form/form_row/form_row.tsx b/packages/eui/src/components/form/form_row/form_row.tsx index 934d7fae4a1..15539dff23d 100644 --- a/packages/eui/src/components/form/form_row/form_row.tsx +++ b/packages/eui/src/components/form/form_row/form_row.tsx @@ -35,11 +35,8 @@ export const DISPLAYS = [ 'center', 'centerCompressed', /** - * @deprecated - */ - 'columnCompressedSwitch', - /** - * @deprecated + * This currently does not affect styles/appearances + * in EUI's present primary theme, but may in the future. */ 'rowCompressed', ] as const; @@ -49,7 +46,6 @@ export type EuiFormRowDisplayKeys = (typeof DISPLAYS)[number]; type EuiFormRowCommonProps = CommonProps & { /** * - `columnCompressed` creates a compressed and horizontal layout - * - `columnCompressedSwitch` - **deprecated**, use `columnCompressed` instead * - `center`/`centerCompressed` helps align non-input content better with inline form layouts * - `rowCompressed` - **deprecated**, does not currently affect styling */