-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
feat: add tabBarPosition on TabBar #2564
Conversation
b2eceeb
to
b1a088d
Compare
Codecov Report
@@ Coverage Diff @@
## master #2564 +/- ##
=======================================
Coverage 59.24% 59.24%
=======================================
Files 92 92
Lines 2201 2201
Branches 626 626
=======================================
Hits 1304 1304
Misses 891 891
Partials 6 6
Continue to review full report at Codecov.
|
b1a088d
to
76bc6f5
Compare
RN 代码已经拆分出去,更新到了 master 方便开发,需要解决此处冲突。 |
76bc6f5
to
757aa2c
Compare
components/tab-bar/index.tsx
Outdated
@@ -99,7 +100,11 @@ class AntTabBar extends React.Component<AntTabbarProps, any> { | |||
animated, | |||
swipeable, | |||
noRenderContent, | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
???
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
尴尬,我的错。 不过这样看来我们把 check 放到 prepush 比 precommit 更合理啊
757aa2c
to
e8179f4
Compare
之前试过功能应该没问题,我觉得再测一下 Android iOS 多个机型 展示上的兼容性,OK了就合了吧。 |
像这种改动增加一下测试用例吧 @doxiaodong |
Add new props tabBarPosition: 'top' | 'bottom'
e8179f4
to
393a70f
Compare
fix #2526
This change is