From d7426fe3c94c7b3c665bd347b49668f8352cf77b Mon Sep 17 00:00:00 2001 From: Samuel Valdes Gutierrez Date: Fri, 27 Oct 2023 13:52:47 +0100 Subject: [PATCH 01/24] adding shrink and basis props for OuiFlexItem Signed-off-by: Samuel Valdes Gutierrez --- src/components/flex/_flex_item.scss | 28 +++++++++++-- src/components/flex/flex_item.tsx | 63 ++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/src/components/flex/_flex_item.scss b/src/components/flex/_flex_item.scss index 49cd501345..d9e0a1c4a6 100644 --- a/src/components/flex/_flex_item.scss +++ b/src/components/flex/_flex_item.scss @@ -24,18 +24,38 @@ /* * 1. We need the extra specificity here to override the FlexGroup > FlexItem styles. - * 2. FlexItem can be manually set to not grow if needed. + * 2. FlexItem can be manually set to not grow if needed (default). + * 3. FlexItem also can be given values for grow, shrink and basis: + * - grow: 1..10 + * - shrink: 1..10 + * - basis: auto, 0%, 25%, 50%, 75% or 100% */ + &.ouiFlexItem--flexGrowZero { /* 1 */ flex-grow: 0; /* 2 */ flex-basis: auto; /* 2 */ } - @for $i from 1 through 10 { - &.ouiFlexItem--flexGrow#{$i} { - flex-grow: $i; + @for $i from 1 through 10 { /* 3 */ + &.ouiFlexItem--flexGrow#{$i} { /* 3 */ + flex-grow: $i; /* 3 */ } } + + @for $i from 1 through 10 { /* 3 */ + &.ouiFlexItem--flexShrink#{$i} { /* 3 */ + flex-shrink: $i; /* 3 */ + } + } + + $flexBasisOptions: 'auto', '0%', '25%', '50%', '75%', '100%'; /* 3 */ + + @each $basis in $flexBasisOptions { /* 3 */ + .ouiFlexItem--flexBasis#{$basis} { /* 3 */ + flex-basis: $basis; /* 3 */ + } + } + } // On mobile we force them to stack and act the same. diff --git a/src/components/flex/flex_item.tsx b/src/components/flex/flex_item.tsx index 9d558c01a0..f77a4d2d6a 100644 --- a/src/components/flex/flex_item.tsx +++ b/src/components/flex/flex_item.tsx @@ -46,13 +46,43 @@ export type FlexItemGrowSize = | true | false | null; +export type FlexItemShrinkSize = + | 1 + | 2 + | 3 + | 4 + | 5 + | 6 + | 7 + | 8 + | 9 + | 10 + | true + | false + | null; +export type FlexItemBasisValue = string | true | false | null; export interface OuiFlexItemProps { grow?: FlexItemGrowSize; + shrink?: FlexItemShrinkSize; + basis?: FlexItemBasisValue; component?: keyof JSX.IntrinsicElements; } export const GROW_SIZES: FlexItemGrowSize[] = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; +export const SHRINK_SIZES: FlexItemShrinkSize[] = [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, +]; +export const BASIS_VALUES:FlexItemBasisValue[] = ['auto','0%','25%','50%','75%','100%'] export const OuiFlexItem: FunctionComponent< CommonProps & @@ -61,11 +91,15 @@ export const OuiFlexItem: FunctionComponent< > = ({ children, className, - grow = true, + grow = true, // default true -> keep grow 1 coming from flex_grid + shrink = 1, // default 1 for shrink + basis = 'auto', // default 'auto' basis component: Component = 'div', ...rest }) => { validateGrowValue(grow); + validateShrinkValue(shrink); + validateBasisValue(basis); const classes = classNames( 'ouiFlexItem', @@ -73,6 +107,10 @@ export const OuiFlexItem: FunctionComponent< 'ouiFlexItem--flexGrowZero': !grow, [`ouiFlexItem--flexGrow${grow}`]: typeof grow === 'number' ? GROW_SIZES.indexOf(grow) >= 0 : undefined, + [`ouiFlexItem--flexShrink${shrink}`]: + typeof shrink === 'number' ? SHRINK_SIZES.indexOf(shrink) >= 0 : undefined, + [`ouiFlexItem--flexBasis${basis}`]: + typeof shrink === 'string' ? BASIS_VALUES.indexOf(shrink) >= 0 : undefined, }, className ); @@ -94,3 +132,26 @@ function validateGrowValue(value: OuiFlexItemProps['grow']) { ); } } + +function validateShrinkValue(value: OuiFlexItemProps['shrink']) { + // New function + const validValues = [null, undefined, true, false, ...SHRINK_SIZES]; + + if (validValues.indexOf(value) === -1) { + throw new Error( + `Prop \`shrink\` passed to \`OuiFlexItem\` must be a boolean or an integer between 1 and 10, received \`${value}\`` + ); + } +} + +function validateBasisValue(value: OuiFlexItemProps['basis']) { + // Define the valid values for 'flex-basis'. These can be 'auto' or specific percentages. + const validValues = [null, undefined, true, false, ...BASIS_VALUES]; + + // Check if the passed value is one of the valid values. + if (!validValues.includes(value)) { + throw new Error( + `Prop \`basis\` passed to \`OuiFlexItem\` must be one of ['auto', '0%', '25%', '50%', '75%', '100%'], received \`${value}\`` + ); + } +} From 0cf7375d4e4a298db145dd5141f96d08761af064 Mon Sep 17 00:00:00 2001 From: Samuel Valdes Gutierrez Date: Fri, 27 Oct 2023 14:02:03 +0100 Subject: [PATCH 02/24] adding tests for shrink and basis props added in OuiFlexItem Signed-off-by: Samuel Valdes Gutierrez --- .../__snapshots__/flex_item.test.tsx.snap | 72 +++++++++++++++++++ src/components/flex/flex_item.test.tsx | 22 +++++- src/components/flex/flex_item.tsx | 17 ++++- 3 files changed, 107 insertions(+), 4 deletions(-) diff --git a/src/components/flex/__snapshots__/flex_item.test.tsx.snap b/src/components/flex/__snapshots__/flex_item.test.tsx.snap index e516a31ce9..05e9fecac0 100644 --- a/src/components/flex/__snapshots__/flex_item.test.tsx.snap +++ b/src/components/flex/__snapshots__/flex_item.test.tsx.snap @@ -79,3 +79,75 @@ exports[`OuiFlexItem is rendered 1`] = ` data-test-subj="test subject string" /> `; + +exports[`OuiFlexItem shrink 1 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 2 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 3 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 4 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 5 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 6 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 7 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 8 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 9 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink 10 is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink false is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem shrink true is rendered 1`] = ` +
+`; diff --git a/src/components/flex/flex_item.test.tsx b/src/components/flex/flex_item.test.tsx index d6b5781c80..ee5a11f69a 100644 --- a/src/components/flex/flex_item.test.tsx +++ b/src/components/flex/flex_item.test.tsx @@ -36,7 +36,7 @@ import { stopThrowingReactWarnings, } from '../../test'; -import { OuiFlexItem, GROW_SIZES } from './flex_item'; +import { OuiFlexItem, GROW_SIZES, SHRINK_SIZES, BASIS_VALUES } from './flex_item'; beforeAll(startThrowingReactWarnings); afterAll(stopThrowingReactWarnings); @@ -57,4 +57,24 @@ describe('OuiFlexItem', () => { }); }); }); + + describe('shrink', () => { + SHRINK_SIZES.forEach((value) => { + test(`${value} is rendered`, () => { + const component = render(); + + expect(component).toMatchSnapshot(); + }); + }); + }); + + describe('basis', () => { + BASIS_VALUES.forEach((value) => { + test(`${value} is rendered`, () => { + const component = render(); + + expect(component).toMatchSnapshot(); + }); + }); + }); }); diff --git a/src/components/flex/flex_item.tsx b/src/components/flex/flex_item.tsx index f77a4d2d6a..665fa530a1 100644 --- a/src/components/flex/flex_item.tsx +++ b/src/components/flex/flex_item.tsx @@ -82,7 +82,14 @@ export const SHRINK_SIZES: FlexItemShrinkSize[] = [ 9, 10, ]; -export const BASIS_VALUES:FlexItemBasisValue[] = ['auto','0%','25%','50%','75%','100%'] +export const BASIS_VALUES: FlexItemBasisValue[] = [ + 'auto', + '0%', + '25%', + '50%', + '75%', + '100%', +]; export const OuiFlexItem: FunctionComponent< CommonProps & @@ -108,9 +115,13 @@ export const OuiFlexItem: FunctionComponent< [`ouiFlexItem--flexGrow${grow}`]: typeof grow === 'number' ? GROW_SIZES.indexOf(grow) >= 0 : undefined, [`ouiFlexItem--flexShrink${shrink}`]: - typeof shrink === 'number' ? SHRINK_SIZES.indexOf(shrink) >= 0 : undefined, + typeof shrink === 'number' + ? SHRINK_SIZES.indexOf(shrink) >= 0 + : undefined, [`ouiFlexItem--flexBasis${basis}`]: - typeof shrink === 'string' ? BASIS_VALUES.indexOf(shrink) >= 0 : undefined, + typeof shrink === 'string' + ? BASIS_VALUES.indexOf(shrink) >= 0 + : undefined, }, className ); From fe285565c94fa688ffae751310958f22633f7acf Mon Sep 17 00:00:00 2001 From: Samuel Valdes Gutierrez Date: Sat, 28 Oct 2023 13:30:33 +0100 Subject: [PATCH 03/24] changing API for values accepted for basis prop and updating snapshoots tests for testing Signed-off-by: Samuel Valdes Gutierrez --- .../__snapshots__/flex_item.test.tsx.snap | 62 +++++++++++-------- src/components/flex/_flex_item.scss | 11 +++- src/components/flex/flex_item.test.tsx | 7 ++- src/components/flex/flex_item.tsx | 9 ++- 4 files changed, 55 insertions(+), 34 deletions(-) diff --git a/src/components/flex/__snapshots__/flex_item.test.tsx.snap b/src/components/flex/__snapshots__/flex_item.test.tsx.snap index 05e9fecac0..12443cdc61 100644 --- a/src/components/flex/__snapshots__/flex_item.test.tsx.snap +++ b/src/components/flex/__snapshots__/flex_item.test.tsx.snap @@ -1,81 +1,105 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`OuiFlexItem basis auto is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem basis fit-content is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem basis max-content is rendered 1`] = ` +
+`; + +exports[`OuiFlexItem basis min-content is rendered 1`] = ` +
+`; + exports[`OuiFlexItem grow 1 is rendered 1`] = `
`; exports[`OuiFlexItem grow 2 is rendered 1`] = `
`; exports[`OuiFlexItem grow 3 is rendered 1`] = `
`; exports[`OuiFlexItem grow 4 is rendered 1`] = `
`; exports[`OuiFlexItem grow 5 is rendered 1`] = `
`; exports[`OuiFlexItem grow 6 is rendered 1`] = `
`; exports[`OuiFlexItem grow 7 is rendered 1`] = `
`; exports[`OuiFlexItem grow 8 is rendered 1`] = `
`; exports[`OuiFlexItem grow 9 is rendered 1`] = `
`; exports[`OuiFlexItem grow 10 is rendered 1`] = `
`; exports[`OuiFlexItem grow false is rendered 1`] = `
`; exports[`OuiFlexItem grow true is rendered 1`] = `
`; exports[`OuiFlexItem is rendered 1`] = `
`; @@ -139,15 +163,3 @@ exports[`OuiFlexItem shrink 10 is rendered 1`] = ` class="ouiFlexItem ouiFlexItem--flexShrink10" /> `; - -exports[`OuiFlexItem shrink false is rendered 1`] = ` -
-`; - -exports[`OuiFlexItem shrink true is rendered 1`] = ` -
-`; diff --git a/src/components/flex/_flex_item.scss b/src/components/flex/_flex_item.scss index d9e0a1c4a6..9d5ef5a75e 100644 --- a/src/components/flex/_flex_item.scss +++ b/src/components/flex/_flex_item.scss @@ -24,11 +24,11 @@ /* * 1. We need the extra specificity here to override the FlexGroup > FlexItem styles. - * 2. FlexItem can be manually set to not grow if needed (default). + * 2. FlexItem can be manually set to not grow or shrink if needed (default). * 3. FlexItem also can be given values for grow, shrink and basis: * - grow: 1..10 * - shrink: 1..10 - * - basis: auto, 0%, 25%, 50%, 75% or 100% + * - basis: auto, max-content, min-content, fit-content */ &.ouiFlexItem--flexGrowZero { /* 1 */ @@ -36,6 +36,11 @@ flex-basis: auto; /* 2 */ } + &.ouiFlexItem--flexShrinkZero { /* 1 */ + flex-grow: 0; /* 2 */ + flex-basis: auto; /* 2 */ + } + @for $i from 1 through 10 { /* 3 */ &.ouiFlexItem--flexGrow#{$i} { /* 3 */ flex-grow: $i; /* 3 */ @@ -48,7 +53,7 @@ } } - $flexBasisOptions: 'auto', '0%', '25%', '50%', '75%', '100%'; /* 3 */ + $flexBasisOptions: 'auto', 'max-content', 'min-content', 'fit-content'; /* 3 */ @each $basis in $flexBasisOptions { /* 3 */ .ouiFlexItem--flexBasis#{$basis} { /* 3 */ diff --git a/src/components/flex/flex_item.test.tsx b/src/components/flex/flex_item.test.tsx index ee5a11f69a..279edf938e 100644 --- a/src/components/flex/flex_item.test.tsx +++ b/src/components/flex/flex_item.test.tsx @@ -36,7 +36,12 @@ import { stopThrowingReactWarnings, } from '../../test'; -import { OuiFlexItem, GROW_SIZES, SHRINK_SIZES, BASIS_VALUES } from './flex_item'; +import { + OuiFlexItem, + GROW_SIZES, + SHRINK_SIZES, + BASIS_VALUES, +} from './flex_item'; beforeAll(startThrowingReactWarnings); afterAll(stopThrowingReactWarnings); diff --git a/src/components/flex/flex_item.tsx b/src/components/flex/flex_item.tsx index 665fa530a1..2cb47d7047 100644 --- a/src/components/flex/flex_item.tsx +++ b/src/components/flex/flex_item.tsx @@ -84,11 +84,9 @@ export const SHRINK_SIZES: FlexItemShrinkSize[] = [ ]; export const BASIS_VALUES: FlexItemBasisValue[] = [ 'auto', - '0%', - '25%', - '50%', - '75%', - '100%', + 'max-content', + 'min-content', + 'fit-content', ]; export const OuiFlexItem: FunctionComponent< @@ -112,6 +110,7 @@ export const OuiFlexItem: FunctionComponent< 'ouiFlexItem', { 'ouiFlexItem--flexGrowZero': !grow, + 'ouiFlexItem--flexShrinkZero': !shrink, [`ouiFlexItem--flexGrow${grow}`]: typeof grow === 'number' ? GROW_SIZES.indexOf(grow) >= 0 : undefined, [`ouiFlexItem--flexShrink${shrink}`]: From d5dd9227883db6e95a13943f2657d80e34069796 Mon Sep 17 00:00:00 2001 From: Samuel Valdes Gutierrez Date: Mon, 30 Oct 2023 13:39:55 +0000 Subject: [PATCH 04/24] updating CHANGELOG.md and testing snapshoots Signed-off-by: Samuel Valdes Gutierrez --- CHANGELOG.md | 1 + .../__snapshots__/basic_table.test.tsx.snap | 4 +- .../in_memory_table.test.tsx.snap | 12 +-- .../collapsible_nav_group.test.tsx.snap | 20 ++--- .../__snapshots__/color_picker.test.tsx.snap | 20 ++--- .../__snapshots__/combo_box.test.tsx.snap | 18 ++--- .../__snapshots__/data_grid.test.tsx.snap | 4 +- .../__snapshots__/empty_prompt.test.tsx.snap | 4 +- .../filter_select_item.test.tsx.snap | 4 +- .../described_form_group.test.tsx.snap | 28 +++---- .../__snapshots__/header_alert.test.tsx.snap | 8 +- .../health/__snapshots__/health.test.tsx.snap | 68 ++++++++--------- .../__snapshots__/page_header.test.tsx.snap | 40 +++++----- .../page_header_content.test.tsx.snap | 74 +++++++++---------- .../table_pagination.test.tsx.snap | 8 +- 15 files changed, 157 insertions(+), 156 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ac144d839..13931a9b6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - Adjust background color of OuiToolTip in `next` theme ([#1004](https://github.com/opensearch-project/oui/pull/1004)) - Add new `middle-out` order prop option to `OuiPaletteColorBlind` ([#856](https://github.com/opensearch-project/oui/pull/856)) - Add new icons for OpenSearch Dashboards v2.10.0 ([#1014](https://github.com/opensearch-project/oui/pull/1014)) +- Add `shrink` and `basis` props to OuiFlexItem ([#1126](https://github.com/opensearch-project/oui/pull/1126)) ### 🐛 Bug Fixes diff --git a/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap b/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap index 85cecb14b7..521e1f2f69 100644 --- a/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap +++ b/src/components/basic_table/__snapshots__/basic_table.test.tsx.snap @@ -1464,7 +1464,7 @@ exports[`OuiBasicTable with initial selection 1`] = ` grow={false} >
diff --git a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap index ac72079baf..8901d96306 100644 --- a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap +++ b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap @@ -111,14 +111,14 @@ exports[`OuiInMemoryTable behavior pagination 1`] = ` grow={false} >
@@ -355,7 +355,7 @@ exports[`OuiInMemoryTable behavior pagination 1`] = ` grow={false} >
diff --git a/src/components/collapsible_nav/collapsible_nav_group/__snapshots__/collapsible_nav_group.test.tsx.snap b/src/components/collapsible_nav/collapsible_nav_group/__snapshots__/collapsible_nav_group.test.tsx.snap index 339d8f2cac..260db66d1e 100644 --- a/src/components/collapsible_nav/collapsible_nav_group/__snapshots__/collapsible_nav_group.test.tsx.snap +++ b/src/components/collapsible_nav/collapsible_nav_group/__snapshots__/collapsible_nav_group.test.tsx.snap @@ -42,7 +42,7 @@ exports[`OuiCollapsibleNavGroup props iconProps renders data-test-subj 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterMedium ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >

diff --git a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap index a14d8b6f6e..bc1ddef3fd 100644 --- a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap +++ b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap @@ -26,7 +26,7 @@ exports[`OuiDescribedFormGroup is rendered 1`] = ` >
@@ -31,7 +31,7 @@ exports[`OuiHealth props color #000000 is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -53,7 +53,7 @@ exports[`OuiHealth props color accent is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -75,7 +75,7 @@ exports[`OuiHealth props color danger is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -97,7 +97,7 @@ exports[`OuiHealth props color default is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -119,7 +119,7 @@ exports[`OuiHealth props color ghost is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -141,7 +141,7 @@ exports[`OuiHealth props color inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -163,7 +163,7 @@ exports[`OuiHealth props color primary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -185,7 +185,7 @@ exports[`OuiHealth props color secondary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -207,7 +207,7 @@ exports[`OuiHealth props color subdued is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -229,7 +229,7 @@ exports[`OuiHealth props color success is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -251,7 +251,7 @@ exports[`OuiHealth props color text is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -273,7 +273,7 @@ exports[`OuiHealth props color warning is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -295,7 +295,7 @@ exports[`OuiHealth props textSize inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -317,7 +317,7 @@ exports[`OuiHealth props textSize m is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -339,7 +339,7 @@ exports[`OuiHealth props textSize s is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -361,7 +361,7 @@ exports[`OuiHealth props textSize xs is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
diff --git a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap index 85c186b3a0..e90e873630 100644 --- a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap +++ b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap @@ -21,7 +21,7 @@ exports[`OuiPageHeader props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >

@@ -24,7 +24,7 @@ exports[`OuiPageHeaderContent props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >

diff --git a/src/components/flex/__snapshots__/flex_item.test.tsx.snap b/src/components/flex/__snapshots__/flex_item.test.tsx.snap index 12443cdc61..0b875a5078 100644 --- a/src/components/flex/__snapshots__/flex_item.test.tsx.snap +++ b/src/components/flex/__snapshots__/flex_item.test.tsx.snap @@ -2,164 +2,164 @@ exports[`OuiFlexItem basis auto is rendered 1`] = `
`; exports[`OuiFlexItem basis fit-content is rendered 1`] = `
`; exports[`OuiFlexItem basis max-content is rendered 1`] = `
`; exports[`OuiFlexItem basis min-content is rendered 1`] = `
`; exports[`OuiFlexItem grow 1 is rendered 1`] = `
`; exports[`OuiFlexItem grow 2 is rendered 1`] = `
`; exports[`OuiFlexItem grow 3 is rendered 1`] = `
`; exports[`OuiFlexItem grow 4 is rendered 1`] = `
`; exports[`OuiFlexItem grow 5 is rendered 1`] = `
`; exports[`OuiFlexItem grow 6 is rendered 1`] = `
`; exports[`OuiFlexItem grow 7 is rendered 1`] = `
`; exports[`OuiFlexItem grow 8 is rendered 1`] = `
`; exports[`OuiFlexItem grow 9 is rendered 1`] = `
`; exports[`OuiFlexItem grow 10 is rendered 1`] = `
`; exports[`OuiFlexItem grow false is rendered 1`] = `
`; exports[`OuiFlexItem grow true is rendered 1`] = `
`; exports[`OuiFlexItem is rendered 1`] = `
`; exports[`OuiFlexItem shrink 1 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 2 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 3 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 4 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 5 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 6 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 7 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 8 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 9 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 10 is rendered 1`] = `
`; diff --git a/src/components/flex/_flex_item.scss b/src/components/flex/_flex_item.scss index 497fd1f33a..c98cd355c1 100644 --- a/src/components/flex/_flex_item.scss +++ b/src/components/flex/_flex_item.scss @@ -56,7 +56,7 @@ $flexBasisOptions: auto, max-content, min-content, fit-content; /* 3 */ @each $basis in $flexBasisOptions { /* 3 */ - .ouiFlexItem--flexBasis#{$basis} { /* 3 */ + &.ouiFlexItem--flexBasis-#{$basis} { /* 3 */ flex-basis: $basis; /* 3 */ } } diff --git a/src/components/flex/flex_item.tsx b/src/components/flex/flex_item.tsx index 49c6d5afd8..2b8f90740f 100644 --- a/src/components/flex/flex_item.tsx +++ b/src/components/flex/flex_item.tsx @@ -117,7 +117,7 @@ export const OuiFlexItem: FunctionComponent< typeof shrink === 'number' ? SHRINK_SIZES.indexOf(shrink) >= 0 : undefined, - [`ouiFlexItem--flexBasis${basis}`]: + [`ouiFlexItem--flexBasis-${basis}`]: typeof basis === 'string' ? BASIS_VALUES.indexOf(basis) >= 0 : undefined, diff --git a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap index bc1ddef3fd..0b3a156ed5 100644 --- a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap +++ b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap @@ -26,7 +26,7 @@ exports[`OuiDescribedFormGroup is rendered 1`] = ` >
@@ -31,7 +31,7 @@ exports[`OuiHealth props color #000000 is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -53,7 +53,7 @@ exports[`OuiHealth props color accent is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -75,7 +75,7 @@ exports[`OuiHealth props color danger is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -97,7 +97,7 @@ exports[`OuiHealth props color default is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -119,7 +119,7 @@ exports[`OuiHealth props color ghost is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -141,7 +141,7 @@ exports[`OuiHealth props color inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -163,7 +163,7 @@ exports[`OuiHealth props color primary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -185,7 +185,7 @@ exports[`OuiHealth props color secondary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -207,7 +207,7 @@ exports[`OuiHealth props color subdued is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -229,7 +229,7 @@ exports[`OuiHealth props color success is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -251,7 +251,7 @@ exports[`OuiHealth props color text is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -273,7 +273,7 @@ exports[`OuiHealth props color warning is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -295,7 +295,7 @@ exports[`OuiHealth props textSize inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -317,7 +317,7 @@ exports[`OuiHealth props textSize m is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -339,7 +339,7 @@ exports[`OuiHealth props textSize s is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -361,7 +361,7 @@ exports[`OuiHealth props textSize xs is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
diff --git a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap index e90e873630..48d7f3c7d9 100644 --- a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap +++ b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap @@ -21,7 +21,7 @@ exports[`OuiPageHeader props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >

@@ -24,7 +24,7 @@ exports[`OuiPageHeaderContent props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >

diff --git a/src/components/flex/__snapshots__/flex_item.test.tsx.snap b/src/components/flex/__snapshots__/flex_item.test.tsx.snap index 0b875a5078..7a692589c0 100644 --- a/src/components/flex/__snapshots__/flex_item.test.tsx.snap +++ b/src/components/flex/__snapshots__/flex_item.test.tsx.snap @@ -2,164 +2,164 @@ exports[`OuiFlexItem basis auto is rendered 1`] = `
`; exports[`OuiFlexItem basis fit-content is rendered 1`] = `
`; exports[`OuiFlexItem basis max-content is rendered 1`] = `
`; exports[`OuiFlexItem basis min-content is rendered 1`] = `
`; exports[`OuiFlexItem grow 1 is rendered 1`] = `
`; exports[`OuiFlexItem grow 2 is rendered 1`] = `
`; exports[`OuiFlexItem grow 3 is rendered 1`] = `
`; exports[`OuiFlexItem grow 4 is rendered 1`] = `
`; exports[`OuiFlexItem grow 5 is rendered 1`] = `
`; exports[`OuiFlexItem grow 6 is rendered 1`] = `
`; exports[`OuiFlexItem grow 7 is rendered 1`] = `
`; exports[`OuiFlexItem grow 8 is rendered 1`] = `
`; exports[`OuiFlexItem grow 9 is rendered 1`] = `
`; exports[`OuiFlexItem grow 10 is rendered 1`] = `
`; exports[`OuiFlexItem grow false is rendered 1`] = `
`; exports[`OuiFlexItem grow true is rendered 1`] = `
`; exports[`OuiFlexItem is rendered 1`] = `
`; exports[`OuiFlexItem shrink 1 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 2 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 3 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 4 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 5 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 6 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 7 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 8 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 9 is rendered 1`] = `
`; exports[`OuiFlexItem shrink 10 is rendered 1`] = `
`; diff --git a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap index 0b3a156ed5..a14d8b6f6e 100644 --- a/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap +++ b/src/components/form/described_form_group/__snapshots__/described_form_group.test.tsx.snap @@ -26,7 +26,7 @@ exports[`OuiDescribedFormGroup is rendered 1`] = ` >
@@ -31,7 +31,7 @@ exports[`OuiHealth props color #000000 is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -53,7 +53,7 @@ exports[`OuiHealth props color accent is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -75,7 +75,7 @@ exports[`OuiHealth props color danger is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -97,7 +97,7 @@ exports[`OuiHealth props color default is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -119,7 +119,7 @@ exports[`OuiHealth props color ghost is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -141,7 +141,7 @@ exports[`OuiHealth props color inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -163,7 +163,7 @@ exports[`OuiHealth props color primary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -185,7 +185,7 @@ exports[`OuiHealth props color secondary is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -207,7 +207,7 @@ exports[`OuiHealth props color subdued is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -229,7 +229,7 @@ exports[`OuiHealth props color success is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -251,7 +251,7 @@ exports[`OuiHealth props color text is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -273,7 +273,7 @@ exports[`OuiHealth props color warning is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -295,7 +295,7 @@ exports[`OuiHealth props textSize inherit is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -317,7 +317,7 @@ exports[`OuiHealth props textSize m is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -339,7 +339,7 @@ exports[`OuiHealth props textSize s is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
@@ -361,7 +361,7 @@ exports[`OuiHealth props textSize xs is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterExtraSmall ouiFlexGroup--alignItemsCenter ouiFlexGroup--directionRow" >
diff --git a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap index 48d7f3c7d9..85c186b3a0 100644 --- a/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap +++ b/src/components/page/page_header/__snapshots__/page_header.test.tsx.snap @@ -21,7 +21,7 @@ exports[`OuiPageHeader props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >

@@ -24,7 +24,7 @@ exports[`OuiPageHeaderContent props alignItems bottom is rendered 1`] = ` class="ouiFlexGroup ouiFlexGroup--gutterLarge ouiFlexGroup--alignItemsFlexEnd ouiFlexGroup--directionRow ouiFlexGroup--responsive ouiPageHeaderContent__top" >