icon prop - fix type to be both number and object. #1086
Merged
Conversation
This file contains hidden or 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
ethanshar
requested changes
Dec 17, 2020
Comment on lines
49
to
51
| */ | ||
| icon: PropTypes.number, | ||
| icon: PropTypes.oneOfType([PropTypes.object, PropTypes.number]), | ||
| /** |
There was a problem hiding this comment.
Miki's currently working on migrating TabController to TS.
So let's remove this one so it won't create him conflicts..
There was a problem hiding this comment.
When could we expect this PR's changes to be merged?
There was a problem hiding this comment.
I believe next version (in two weeks or so..)
…icon_type # Conflicts: # src/components/tabController/TabBarItem.js
ethanshar
approved these changes
Dec 30, 2020
M-i-k-e-l
added a commit
that referenced
this pull request
Jan 3, 2021
…-logic * master: Fix lint error cleanup eslintrc file Infra/useDidUpdate (#1112) Support UI presets for Incubator.TextField and set a 'default' preset (#1111) Fix lint issues fix radioButton lint errors and generate types Fix/imageSource deprecation (#1115) Typescript/tab controller move to function component (#1098) Feat/radio button customize styling (#1092) bug fixes for TabBar refactor (#1106) Update ios target to 11 prettify file Fix icon size in badges example screen (#1104) icon prop - fix type to be both number and object. (#1086) enable eslint on both ts and js files (#1101) fix eslint (#1107) # Conflicts: # demo/src/screens/componentScreens/FaderScreen.tsx # src/components/fader/index.tsx # src/components/tabController/FadedScrollView.tsx # src/components/tabController/TabBar.tsx
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
icon prop - fix type to be both number and object.
Changelog
icon prop - fix type to be both number and object.