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

Add display, descriptionWidth, textWrap and isInvalid props to EuiExpression #3467

Merged
merged 33 commits into from
Jun 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c4d93cd
added truncate example, pending prop
andreadelrio May 12, 2020
faaa6ad
added prop
andreadelrio May 12, 2020
23dad35
added test and updated example
andreadelrio May 13, 2020
f03e8fe
add cl
andreadelrio May 13, 2020
0f13450
remove unneeded line
andreadelrio May 13, 2020
1bf1d04
added description to tooltip
andreadelrio May 13, 2020
60fa604
fix conflict
andreadelrio May 13, 2020
efe0e00
renamed prop, turned into enum
andreadelrio May 13, 2020
eb52280
example is function component
andreadelrio May 13, 2020
72b2918
Merge remote-tracking branch 'upstream/master' into expression-truncate
andreadelrio May 13, 2020
dfc860a
update snippet
andreadelrio May 13, 2020
89d3992
make the example more like alerting
andreadelrio May 18, 2020
d256cc7
new styles
andreadelrio May 27, 2020
cb0d1aa
fix conflict
andreadelrio May 27, 2020
cb9ebd1
basic combobox working
andreadelrio May 28, 2020
c4e396b
more progress on example
andreadelrio May 28, 2020
1caac1a
added align right
andreadelrio May 28, 2020
a392e3e
removed truncate
andreadelrio May 28, 2020
6e7585b
will rename column prop
andreadelrio May 28, 2020
1c1b811
renamed column prop
andreadelrio May 28, 2020
36bb3ec
cleanup
andreadelrio May 29, 2020
b1e01dc
updated tests and added handling of color
andreadelrio May 29, 2020
fc1ddf7
remove unneeded line
andreadelrio May 29, 2020
4128407
Review updates
May 29, 2020
b606ecc
Merge pull request #10 from cchaos/andreadelrio/expression-truncate
andreadelrio May 29, 2020
5cc964a
added invalid example
andreadelrio Jun 1, 2020
4e583f8
update test
andreadelrio Jun 1, 2020
f6d39f2
re-added textWrap prop =D
andreadelrio Jun 1, 2020
d15a4b4
update cl
andreadelrio Jun 1, 2020
52dec78
PR feedback
andreadelrio Jun 1, 2020
3e21df3
tiny styling fix
andreadelrio Jun 2, 2020
e0209b0
update CL
andreadelrio Jun 2, 2020
85b20b6
nits
andreadelrio Jun 2, 2020
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
Prev Previous commit
Next Next commit
fix conflict
andreadelrio committed May 27, 2020

Unverified

This user has not yet uploaded their public signing key.
commit cb0d1aa36f24521237b5fb53ebecdfee4c5cf69e
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
- Added `displayName` to components using `React.forwardRef` ([#3451](https://github.com/elastic/eui/pull/3451))
- Added event target checker for `EuiOverlayMask`'s `onClick` prop ([#3462](https://github.com/elastic/eui/pull/3462))
- Added `left-start` popover placement to `EuiDatePicker` ([#3511](https://github.com/elastic/eui/pull/3511))
- Added `textWrap` prop to `EuiExpression` ([#3467](https://github.com/elastic/eui/pull/3467))

**Bug Fixes**

@@ -31,7 +32,7 @@
- Updated `EuiImage`'s `caption` prop type from `string` to `ReactNode` ([#3387](https://github.com/elastic/eui/pull/3387))
- Improved contrast for `EuiCollapsibleNav` close button ([#3465](https://github.com/elastic/eui/pull/3465))
- Fixed `EuiCodeEditor` console error when using the editor without import the default theme ([#3454](https://github.com/elastic/eui/pull/3454))
andreadelrio marked this conversation as resolved.
Show resolved Hide resolved
- Added `textWrap` prop to `EuiExpression` ([#3467](https://github.com/elastic/eui/pull/3467))
- Added exports for `EuiSteps` and related components types ([#3471](https://github.com/elastic/eui/pull/3471))

**Bug Fixes**

2 changes: 1 addition & 1 deletion src-docs/src/views/expression/truncate.tsx
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import {
} from '../../../../src/components';

// Rise the popovers above GuidePageSideNav
const POPOVER_STYLE = { zIndex: '200' };
const POPOVER_STYLE = { zIndex: '300' };

export default () => {
const [example1, setExample1] = useState({
8 changes: 8 additions & 0 deletions src/components/expression/_expression.scss
Original file line number Diff line number Diff line change
@@ -61,6 +61,14 @@
.euiExpression__value {
@include euiTextBreakWord;
}

.euiExpression__description {
flex-shrink: 1;
}

.euiExpression__value {
flex-shrink: 2;
}
}
}

You are viewing a condensed version of this merge commit. You can view the full changes here.