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

HTML Element Placeholders #641

Merged
merged 1 commit into from Dec 14, 2015

Conversation

Projects
None yet
2 participants
@alyssaBiasi
Contributor

alyssaBiasi commented Dec 1, 2015

In order to render custom icons as a part of the Select placeholder, we need to be able to provide styled HTML elements.

This PR:

  • Adds element to the expected placeholder prop types
  • Adds node to the expected placeholder prop type for Async
  • Adds a smiley face icon to the CustomComponents example in the docs

screen shot 2015-12-01 at 4 45 54 pm

I wasn't sure if it's better to add another prop (placeholderComponent or <insert better name>) in order to keep the placeholder prop a consistent type. Thoughts?

@JedWatson

This comment has been minimized.

Show comment
Hide comment
@JedWatson

JedWatson Dec 10, 2015

Owner

I should have known this was going to happen. Sorry @alyssaBiasi, there are conflicts now that #655 is in - would you mind updating your branch please and I'll merge this? Thanks!

Owner

JedWatson commented Dec 10, 2015

I should have known this was going to happen. Sorry @alyssaBiasi, there are conflicts now that #655 is in - would you mind updating your branch please and I'll merge this? Thanks!

@alyssaBiasi

This comment has been minimized.

Show comment
Hide comment
@alyssaBiasi

alyssaBiasi Dec 13, 2015

Contributor

Ha no worries @JedWatson. I've rebased the branch and amended the commit. Now this PR just adds the node prop type to the Async component and the smiley face example 😄

Contributor

alyssaBiasi commented Dec 13, 2015

Ha no worries @JedWatson. I've rebased the branch and amended the commit. Now this PR just adds the node prop type to the Async component and the smiley face example 😄

@JedWatson

This comment has been minimized.

Show comment
Hide comment
@JedWatson

JedWatson Dec 14, 2015

Owner

Neat, thanks @alyssaBiasi!

Owner

JedWatson commented Dec 14, 2015

Neat, thanks @alyssaBiasi!

JedWatson added a commit that referenced this pull request Dec 14, 2015

@JedWatson JedWatson merged commit 396c4a1 into JedWatson:master Dec 14, 2015

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 94.211%
Details

@alyssaBiasi alyssaBiasi deleted the alyssaBiasi:custom-placeholders branch Dec 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment