-
Notifications
You must be signed in to change notification settings - Fork 842
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
Add Suggest Item #2090
Merged
Merged
Add Suggest Item #2090
Changes from 28 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
64b2e95
basic version works
andreadelrio 1e5d2c9
props descriptions
andreadelrio 6f9bad3
added expandLongLabel
andreadelrio fe5f173
removed some quotes
andreadelrio 3185d9b
added layout to replace expandLongLabel
andreadelrio e23f429
tests passing
thompsongl 147487e
Merge pull request #1 from thompsongl/suggest-item
andreadelrio 4a2860f
placed suggestItem import and export in correct order
andreadelrio 0ab76c6
some css fixes
andreadelrio 091a19f
considering vis colors
andreadelrio 3e87f51
changes based on feedback
andreadelrio 08197bd
updated colors and added minor css changes
andreadelrio eb8e5e8
basic version works
andreadelrio 7ccf026
props descriptions
andreadelrio c21843b
added expandLongLabel
andreadelrio b68f805
removed some quotes
andreadelrio b582011
tests passing
thompsongl 418cba6
added layout to replace expandLongLabel
andreadelrio ac69d10
Merge pull request #1 from thompsongl/suggest-item
andreadelrio 7a0555b
placed suggestItem import and export in correct order
andreadelrio d850644
some css fixes
andreadelrio c0b57c7
considering vis colors
andreadelrio e6cabe4
changes based on feedback
andreadelrio 93f1e9b
updated colors and added minor css changes
andreadelrio 56e3751
Merge branch 'master' into suggest-item
andreadelrio 0a6f7c9
Merge branch 'suggest-item' of https://github.com/andreadelrio/eui in…
andreadelrio 0a42759
docs updates and small improvements
andreadelrio a776760
Merge remote-tracking branch 'upstream/master' into suggest-item
andreadelrio 49234df
removed duplicate class
andreadelrio 354f747
Merge remote-tracking branch 'upstream/master' into suggest-item
andreadelrio 2daba39
Merge remote-tracking branch 'upstream/master' into suggest-item
andreadelrio dd6c8e7
added cl and commented out component from routes
andreadelrio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import React from 'react'; | ||
|
||
export default () => <div />; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
import React from 'react'; | ||
|
||
import { renderToHtml } from '../../services'; | ||
|
||
import { GuideSectionTypes } from '../../components'; | ||
|
||
import { EuiCode, EuiSuggestItem } from '../../../../src/components'; | ||
|
||
import Suggest from './suggest'; | ||
const suggestSource = require('!!raw-loader!./suggest'); | ||
const suggestHtml = renderToHtml(Suggest); | ||
|
||
import SuggestItem from './suggest_item'; | ||
const suggestItemSource = require('!!raw-loader!./suggest_item'); | ||
const suggestItemHtml = renderToHtml(SuggestItem); | ||
const suggestItemSnippet = [ | ||
`<EuiSuggestItem | ||
type={sampleItem.type} | ||
label={sampleItem.label} | ||
description={sampleItem.description} | ||
/> | ||
`, | ||
`<EuiSuggestItem | ||
type={sampleItem.type} | ||
label={sampleItem.label} | ||
description={sampleItem.description} | ||
labelDisplay="expand" | ||
/>`, | ||
]; | ||
|
||
export const SuggestExample = { | ||
title: 'Suggest', | ||
sections: [ | ||
{ | ||
source: [ | ||
{ | ||
type: GuideSectionTypes.JS, | ||
code: suggestSource, | ||
}, | ||
{ | ||
type: GuideSectionTypes.HTML, | ||
code: suggestHtml, | ||
}, | ||
], | ||
text: ( | ||
<div> | ||
<p> | ||
<EuiCode>EuiSuggest</EuiCode> description goes here. | ||
</p> | ||
</div> | ||
), | ||
}, | ||
{ | ||
title: 'Suggest Item', | ||
source: [ | ||
{ | ||
type: GuideSectionTypes.JS, | ||
code: suggestItemSource, | ||
}, | ||
{ | ||
type: GuideSectionTypes.HTML, | ||
code: suggestItemHtml, | ||
}, | ||
], | ||
text: ( | ||
<div> | ||
<p> | ||
<EuiCode>EuiSuggestItem</EuiCode> is a list item component to | ||
display suggestions when typing queries in{' '} | ||
<EuiCode>EuiSuggestInput</EuiCode>. Use{' '} | ||
<EuiCode>labelDisplay</EuiCode> to set whether the{' '} | ||
<EuiCode>label</EuiCode> has a fixed width or not. | ||
</p> | ||
</div> | ||
), | ||
props: { EuiSuggestItem }, | ||
snippet: suggestItemSnippet, | ||
demo: <SuggestItem />, | ||
}, | ||
], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
import React from 'react'; | ||
|
||
import { EuiSuggestItem, EuiSpacer } from '../../../../src/components'; | ||
|
||
const shortDescription = 'This is the description'; | ||
|
||
const sampleItems = [ | ||
{ | ||
type: { iconType: 'kqlField', color: 'tint4' }, | ||
label: 'Field sample', | ||
description: shortDescription, | ||
}, | ||
{ | ||
type: { iconType: 'kqlValue', color: 'tint0' }, | ||
label: 'Value sample', | ||
description: shortDescription, | ||
}, | ||
{ | ||
type: { iconType: 'kqlSelector', color: 'tint3' }, | ||
label: 'Conjunction sample', | ||
description: shortDescription, | ||
}, | ||
{ | ||
type: { iconType: 'kqlOperand', color: 'tint1' }, | ||
label: 'Operator sample', | ||
description: shortDescription, | ||
}, | ||
{ | ||
type: { iconType: 'search', color: 'tint8' }, | ||
cchaos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
label: 'Recent search', | ||
}, | ||
{ | ||
type: { iconType: 'save', color: 'tint5' }, | ||
label: 'Saved query', | ||
}, | ||
]; | ||
|
||
const typeObj = { iconType: 'kqlValue', color: 'tint0' }; | ||
|
||
const longLabel = | ||
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam ut quam eget augue pulvinar.'; | ||
|
||
export default () => ( | ||
<div> | ||
{sampleItems.map((item, index) => ( | ||
<EuiSuggestItem | ||
type={item.type} | ||
key={index} | ||
label={item.label} | ||
description={item.description} | ||
/> | ||
))} | ||
<EuiSpacer size="m" /> | ||
<EuiSuggestItem | ||
type={typeObj} | ||
label={longLabel} | ||
description="This item has a fixed width label" | ||
/> | ||
<EuiSuggestItem | ||
type={typeObj} | ||
labelDisplay="expand" | ||
label={longLabel} | ||
description="This item will expand its label if needed" | ||
/> | ||
<EuiSpacer size="m" /> | ||
<EuiSuggestItem | ||
type={{ iconType: 'search', color: 'tint8' }} | ||
label="Items with no description will expand their label" | ||
/> | ||
</div> | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
src/components/suggest_item/__snapshots__/suggest_item.test.js.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
// Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
||
exports[`EuiSuggestItem is rendered 1`] = ` | ||
<div | ||
aria-label="aria-label" | ||
class="euiSuggestItem testClass1 testClass2" | ||
data-test-subj="test subject string" | ||
> | ||
<span | ||
class="euiSuggestItem__type euiSuggestItem__type--tint1" | ||
> | ||
<svg | ||
class="euiIcon euiIcon--medium euiIcon-isLoading" | ||
focusable="false" | ||
height="16" | ||
viewBox="0 0 16 16" | ||
width="16" | ||
xmlns="http://www.w3.org/2000/svg" | ||
/> | ||
</span> | ||
<span | ||
class="euiSuggestItem__label euiSuggestItem__label euiSuggestItem__labelDisplay--fixed euiSuggestItem__labelDisplay--expand" | ||
> | ||
Test label | ||
</span> | ||
<span | ||
class="euiSuggestItem__description" | ||
/> | ||
</div> | ||
`; | ||
|
||
exports[`props item with no description has expanded label is rendered 1`] = ` | ||
<div | ||
class="euiSuggestItem" | ||
> | ||
<span | ||
class="euiSuggestItem__type euiSuggestItem__type--tint2" | ||
> | ||
<svg | ||
class="euiIcon euiIcon--medium euiIcon-isLoading" | ||
focusable="false" | ||
height="16" | ||
viewBox="0 0 16 16" | ||
width="16" | ||
xmlns="http://www.w3.org/2000/svg" | ||
/> | ||
</span> | ||
<span | ||
class="euiSuggestItem__label euiSuggestItem__label euiSuggestItem__labelDisplay--fixed euiSuggestItem__labelDisplay--expand" | ||
> | ||
This is the description | ||
</span> | ||
<span | ||
class="euiSuggestItem__description" | ||
/> | ||
</div> | ||
`; | ||
|
||
exports[`props labelDisplay as expand is rendered 1`] = ` | ||
<div | ||
class="euiSuggestItem" | ||
> | ||
<span | ||
class="euiSuggestItem__type euiSuggestItem__type--tint2" | ||
> | ||
<svg | ||
class="euiIcon euiIcon--medium euiIcon-isLoading" | ||
focusable="false" | ||
height="16" | ||
viewBox="0 0 16 16" | ||
width="16" | ||
xmlns="http://www.w3.org/2000/svg" | ||
/> | ||
</span> | ||
<span | ||
class="euiSuggestItem__label euiSuggestItem__label euiSuggestItem__labelDisplay--expand" | ||
> | ||
This is the description | ||
</span> | ||
<span | ||
class="euiSuggestItem__description" | ||
> | ||
This is the description | ||
</span> | ||
</div> | ||
`; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
@import 'variables'; | ||
|
||
@import 'suggest_item'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
.euiSuggestItem { | ||
display: flex; | ||
flex-grow: 1; | ||
align-items: center; | ||
font-size: $euiFontSizeXS; | ||
white-space: nowrap; | ||
|
||
@each $name, $color in $itemColors { | ||
.euiSuggestItem__type--#{$name} { | ||
$backgroundColor: tintOrShade($color, 90%, 50%); | ||
background-color: $backgroundColor; | ||
color: makeHighContrastColor($color, $backgroundColor); | ||
} | ||
} | ||
|
||
.euiSuggestItem__label, | ||
.euiSuggestItem__type, | ||
.euiSuggestItem__description { | ||
flex-grow: 0; | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
.euiSuggestItem__type { | ||
position: relative; | ||
flex-shrink: 0; | ||
flex-basis: auto; | ||
width: $euiSizeXL; | ||
height: $euiSizeXL; | ||
text-align: center; | ||
overflow: hidden; | ||
padding: $euiSizeXS; | ||
justify-content: center; | ||
align-items: center; | ||
} | ||
|
||
.euiSuggestItem__label { | ||
flex-basis: 50%; | ||
min-width: 50%; | ||
font-family: $euiCodeFontFamily; | ||
overflow: hidden; | ||
text-overflow: ellipsis; | ||
padding: $euiSizeXS $euiSizeS; | ||
color: $euiTextColor; | ||
|
||
&.euiSuggestItem__labelDisplay--expand { | ||
flex-basis: auto; | ||
flex-shrink: 1; | ||
} | ||
} | ||
|
||
.euiSuggestItem__description, | ||
.euiSuggestItem__label { | ||
@include euiTextTruncate; | ||
display: block; | ||
cchaos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
.euiSuggestItem__description { | ||
color: $euiColorDarkShade; | ||
flex-basis: auto; | ||
padding-top: $euiSizeXS * .5; | ||
|
||
&:empty { | ||
flex-grow: 0; | ||
margin-left: 0; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
$itemColors: ( | ||
tint0: $euiColorVis0, | ||
tint1: $euiColorVis1, | ||
tint2: $euiColorVis2, | ||
tint3: $euiColorVis3, | ||
tint4: $euiColorVis5, | ||
tint5: $euiColorVis7, | ||
tint6: $euiColorVis8, | ||
tint7: $euiColorVis9, | ||
tint8: $euiColorDarkShade, | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { EuiSuggestItem } from './suggest_item'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this is merging into
master
, can we comment out this first section or update it with a coming soon message?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the idea is just to comment it out from the routes file for now instead.