Skip to content
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

Merged
merged 2 commits into from
Jun 27, 2018
Merged

feat: add tabBarPosition on TabBar #2564

merged 2 commits into from
Jun 27, 2018

Conversation

doxiaodong
Copy link
Contributor

@doxiaodong doxiaodong commented May 22, 2018

fix #2526


This change is Reviewable

@ghost ghost assigned doxiaodong May 22, 2018
@ghost ghost added the In Progress label May 22, 2018
@doxiaodong doxiaodong requested a review from warmhug May 22, 2018 10:16
@doxiaodong doxiaodong force-pushed the feat-tabbar-position branch from b2eceeb to b1a088d Compare May 22, 2018 11:16
@codecov
Copy link

codecov bot commented May 22, 2018

Codecov Report

Merging #2564 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@           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
Flag Coverage Δ
#web 59.24% <0%> (ø) ⬆️
Impacted Files Coverage Δ
components/tab-bar/index.tsx 93.1% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c2ae660...393a70f. Read the comment docs.

@doxiaodong doxiaodong force-pushed the feat-tabbar-position branch from b1a088d to 76bc6f5 Compare May 22, 2018 11:41
@doxiaodong doxiaodong mentioned this pull request May 23, 2018
1 task
@warmhug
Copy link
Contributor

warmhug commented Jun 5, 2018

RN 代码已经拆分出去,更新到了 master 方便开发,需要解决此处冲突。

@doxiaodong doxiaodong force-pushed the feat-tabbar-position branch from 76bc6f5 to 757aa2c Compare June 6, 2018 11:26
@@ -99,7 +100,11 @@ class AntTabBar extends React.Component<AntTabbarProps, any> {
animated,
swipeable,
noRenderContent,
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

???

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

尴尬,我的错。 不过这样看来我们把 check 放到 prepush 比 precommit 更合理啊

@doxiaodong doxiaodong force-pushed the feat-tabbar-position branch from 757aa2c to e8179f4 Compare June 7, 2018 08:31
@warmhug
Copy link
Contributor

warmhug commented Jun 7, 2018

之前试过功能应该没问题,我觉得再测一下 Android iOS 多个机型 展示上的兼容性,OK了就合了吧。

@ziluo
Copy link
Contributor

ziluo commented Jun 25, 2018

像这种改动增加一下测试用例吧 @doxiaodong

@doxiaodong doxiaodong force-pushed the feat-tabbar-position branch from e8179f4 to 393a70f Compare June 27, 2018 02:32
@doxiaodong
Copy link
Contributor Author

@ziluo

@ziluo ziluo merged commit 150efcb into master Jun 27, 2018
@ziluo ziluo deleted the feat-tabbar-position branch June 27, 2018 07:34
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.

Make TabBar position adjustable
4 participants