Skip to content

icon prop - fix type to be both number and object. #1086

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Dec 30, 2020
Merged

icon prop - fix type to be both number and object. #1086

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02b80e9
icon prop - fix type to be both number and object.
Inbal-Tish Dec 17, 2020
e884d46
Merge branch 'master' of github.com:wix/react-native-ui-lib into fix/…
Inbal-Tish Dec 28, 2020
bbad301
update generatedTypes
Inbal-Tish Dec 28, 2020
ff86ccb
removing js file
Inbal-Tish Dec 28, 2020
3a38178
Merge branch 'master' of github.com:wix/react-native-ui-lib into fix/…
Inbal-Tish Dec 29, 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
2 changes: 1 addition & 1 deletion src/components/tabController/TabBarItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default class TabBarItem extends PureComponent {
/**
* icon of the tab
*/
icon: PropTypes.number,
icon: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
/**
Copy link
Collaborator

@ethanshar ethanshar Dec 17, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Miki's currently working on migrating TabController to TS.
So let's remove this one so it won't create him conflicts..

Copy link
Contributor

Choose a reason for hiding this comment

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

When could we expect this PR's changes to be merged?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I believe next version (in two weeks or so..)

* icon tint color
*/
Expand Down
2 changes: 1 addition & 1 deletion src/components/toast/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class Toast extends PureBaseComponent {
/**
* a left icon
*/
icon: PropTypes.number,
icon: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
/**
* a single action for the user
*/
Expand Down
2 changes: 1 addition & 1 deletion src/incubator/TabController/TabBarItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default class TabBarItem extends PureComponent {
/**
* icon of the tab
*/
icon: PropTypes.number,
icon: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
/**
* icon tint color
*/
Expand Down