Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added direction, justifyContent, and alignItems props on EuiFlexItem #3069

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added direction, justifyContent, and alignItems props on `EuiFlexItem` ([#3069](https://github.com/elastic/eui/pull/3069))
- Updated `EuiFilterSelect` to retain the order of its filters ([#3063](https://github.com/elastic/eui/pull/3063))
- Added `href` prop to `EuiBadge` ([#3009](https://github.com/elastic/eui/pull/3009))
- Added props descriptions for `EuiComboBox` ([#3007](https://github.com/elastic/eui/pull/3007))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
grow={false}
>
<div
className="euiFlexItem euiFlexItem--flexGrowZero"
className="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
/>
</EuiFlexItem>
<EuiFlexItem
grow={false}
>
<div
className="euiFlexItem euiFlexItem--flexGrowZero"
className="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
/>
</EuiFlexItem>
</div>
Expand Down Expand Up @@ -322,7 +322,7 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
grow={false}
>
<div
className="euiFlexItem euiFlexItem--flexGrowZero"
className="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<EuiPopover
anchorPosition="upRight"
Expand Down Expand Up @@ -421,7 +421,7 @@ exports[`EuiInMemoryTable behavior pagination 1`] = `
grow={false}
>
<div
className="euiFlexItem euiFlexItem--flexGrowZero"
className="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<EuiPagination
activePage={1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ exports[`renders inline EuiColorPicker 1`] = `
role="listbox"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #54B399 as the color"
Expand All @@ -675,7 +675,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #6092C0 as the color"
Expand All @@ -686,7 +686,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #D36086 as the color"
Expand All @@ -697,7 +697,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #9170B8 as the color"
Expand All @@ -708,7 +708,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #CA8EAE as the color"
Expand All @@ -719,7 +719,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #D6BF57 as the color"
Expand All @@ -730,7 +730,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #B9A888 as the color"
Expand All @@ -741,7 +741,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #DA8B45 as the color"
Expand All @@ -752,7 +752,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #AA6556 as the color"
Expand All @@ -763,7 +763,7 @@ exports[`renders inline EuiColorPicker 1`] = `
/>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<button
aria-label="Select #E7664C as the color"
Expand Down
4 changes: 2 additions & 2 deletions src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<div
class="euiPopover euiPopover--anchorUpRight euiPopover--withTitle"
Expand Down Expand Up @@ -77,7 +77,7 @@ exports[`EuiDataGrid pagination renders 1`] = `
</div>
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<div
class="euiPagination"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ exports[`EuiEmptyPrompt props actions renders an array 1`] = `
class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
action1
</div>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
action2
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ exports[`EuiFilterSelectItem is rendered 1`] = `
class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
>
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
>
<div
data-euiicon-type="empty"
/>
</div>
<div
class="euiFlexItem euiFilterSelectItem__content"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFilterSelectItem__content"
/>
</span>
</button>
Expand Down
26 changes: 13 additions & 13 deletions src/components/flex/__snapshots__/flex_item.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,80 +2,80 @@

exports[`EuiFlexItem grow 1 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow1"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow1"
/>
`;

exports[`EuiFlexItem grow 2 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow2"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow2"
/>
`;

exports[`EuiFlexItem grow 3 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow3"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow3"
/>
`;

exports[`EuiFlexItem grow 4 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow4"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow4"
/>
`;

exports[`EuiFlexItem grow 5 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow5"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow5"
/>
`;

exports[`EuiFlexItem grow 6 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow6"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow6"
/>
`;

exports[`EuiFlexItem grow 7 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow7"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow7"
/>
`;

exports[`EuiFlexItem grow 8 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow8"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow8"
/>
`;

exports[`EuiFlexItem grow 9 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow9"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow9"
/>
`;

exports[`EuiFlexItem grow 10 is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrow10"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrow10"
/>
`;

exports[`EuiFlexItem grow false is rendered 1`] = `
<div
class="euiFlexItem euiFlexItem--flexGrowZero"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow euiFlexItem--flexGrowZero"
/>
`;

exports[`EuiFlexItem grow true is rendered 1`] = `
<div
class="euiFlexItem"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow"
/>
`;

exports[`EuiFlexItem is rendered 1`] = `
<div
aria-label="aria-label"
class="euiFlexItem testClass1 testClass2"
class="euiFlexItem euiFlexItem--alignItemsCenter euiFlexItem--justifyContentCenter euiFlexItem--directionRow testClass1 testClass2"
data-test-subj="test subject string"
/>
`;
56 changes: 55 additions & 1 deletion src/components/flex/_flex_item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
}

display: flex; /* 1 */
flex-direction: column; /* 1 */

/*
* 1. We need the extra specificity here to override the FlexGroup > FlexItem styles.
Expand All @@ -27,6 +26,61 @@
}
}

// Justify the item
.euiFlexItem--justifyContentSpaceEvenly {
justify-content: space-evenly;
}

.euiFlexItem--justifyContentSpaceBetween {
justify-content: space-between;
}

.euiFlexItem--justifyContentSpaceAround {
justify-content: space-around;
}

.euiFlexItem--justifyContentCenter {
justify-content: center;
}

.euiFlexItem--justifyContentFlexEnd {
justify-content: flex-end;
}

// Align Items
.euiFlexItem--alignItemsFlexStart {
align-items: flex-start;
}

.euiFlexItem--alignItemsCenter {
align-items: center;
}

.euiFlexItem--alignItemsFlexEnd {
align-items: flex-end;
}

.euiFlexItem--alignItemsBaseline {
align-items: baseline;
}

// Direction
.euiFlexItem--directionRow {
flex-direction: row;
}

.euiFlexItem--directionRowReverse {
flex-direction: row-reverse;
}

.euiFlexItem--directionColumn {
flex-direction: column;
}

.euiFlexItem--directionColumnReverse {
flex-direction: column-reverse;
}

// On mobile we force them to stack and act the same.
@include euiBreakpoint('xs', 's') {
.euiFlexGroup--responsive > .euiFlexItem,
Expand Down
Loading