Skip to content

HTML Element Placeholders#641

Merged
JedWatson merged 1 commit intoJedWatson:masterfrom
alyssaBiasi:custom-placeholders
Dec 14, 2015
Merged

HTML Element Placeholders#641
JedWatson merged 1 commit intoJedWatson:masterfrom
alyssaBiasi:custom-placeholders

Conversation

@alyssaBiasi
Copy link
Contributor

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
Copy link
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!

@alyssaBiasi
Copy link
Contributor Author

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
Copy link
Owner

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
@alyssaBiasi alyssaBiasi deleted the custom-placeholders branch December 14, 2015 20:39
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.

2 participants