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

[EuiBadge] Fix the inline styles being wiped by consumer passed styles #3284

Merged
merged 4 commits into from
Apr 10, 2020
Merged

[EuiBadge] Fix the inline styles being wiped by consumer passed styles #3284

merged 4 commits into from
Apr 10, 2020

Conversation

tiaanduplessis
Copy link
Contributor

@tiaanduplessis tiaanduplessis commented Apr 8, 2020

Summary

Closes #3282 where the inline styles for EuiBadge are being wiped by consumer passed inline styles.

Checklist

  • Check against all themes for compatibility in both light and dark modes
  • [ ] Checked in mobile
  • Checked in IE11 and Firefox
  • [ ] Props have proper autodocs
  • [ ] Added documentation examples
  • Added or updated jest tests
  • [ ] Checked for breaking changes and labeled appropriately
  • [ ] Checked for accessibility including keyboard-only and screenreader modes
  • A changelog entry exists and is marked appropriately

@kibanamachine
Copy link

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@cla-checker-service
Copy link

cla-checker-service bot commented Apr 8, 2020

💚 CLA has been signed

@elizabetdev
Copy link
Contributor

jenkis test this

@kibanamachine
Copy link

Preview documentation changes for this PR: https://eui.elastic.co/pr_3284/

@thompsongl
Copy link
Contributor

jenkins test this

@cchaos
Copy link
Contributor

cchaos commented Apr 9, 2020

Welcome @tiaanduplessis !! Thanks for taking on this issue.

I'm running it locally to test and added a custom border style via the style prop on the first example. It looks like most of them are working properly except for the hollow color. I think it has to do with the if/then logic that only applies the style if optionalCustomStyles exists.

You'll need to add to make sure that the style prop get passed to the element in the case that optionalCustomStyles is null.

Screen Shot 2020-04-09 at 11 27 19 AM


I have also update the checklist in the PR summary of items that should still be checked/added, even though it's such a small change. Since this is a bug fix we need to ensure we don't re-create the bug again.

@kibanamachine
Copy link

Preview documentation changes for this PR: https://eui.elastic.co/pr_3284/

@tiaanduplessis
Copy link
Contributor Author

Hi @cchaos 👋

I've made updates for the case that optionalCustomStyles is null. I'll take a look at the other checklist items as soon as possible.

Screenshot 2020-04-09 at 17 49 55

Screenshot 2020-04-09 at 17 49 48

Screenshot 2020-04-09 at 17 49 40

Screenshot 2020-04-09 at 17 49 27

@tiaanduplessis
Copy link
Contributor Author

Tested on Firefox 75.0

Screenshot 2020-04-10 at 06 39 33

Screenshot 2020-04-10 at 06 39 07

Screenshot 2020-04-10 at 06 36 56

Screenshot 2020-04-10 at 06 36 38

@cchaos cchaos changed the title (#3282) Fix the inline styles being wiped by consumer passed styles [EuiBadge] Fix the inline styles being wiped by consumer passed styles Apr 10, 2020
@cchaos
Copy link
Contributor

cchaos commented Apr 10, 2020

retest

@kibanamachine
Copy link

Preview documentation changes for this PR: https://eui.elastic.co/pr_3284/

Copy link
Contributor

@cchaos cchaos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great! Thanks @tiaanduplessis! I'll commit the Changelog suggestion for you and get this merged. 🥇

@cchaos
Copy link
Contributor

cchaos commented Apr 10, 2020

retest

@kibanamachine
Copy link

Preview documentation changes for this PR: https://eui.elastic.co/pr_3284/

@cchaos cchaos merged commit 6f44f92 into elastic:master Apr 10, 2020
@tiaanduplessis
Copy link
Contributor Author

Awesome! Thanks @cchaos

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[EuiBadge] Can have it's inline styles wiped by consumer passed inline styles
5 participants