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(Modal): support placeholder & add theme #1603

Merged
merged 5 commits into from
Jul 26, 2017
Merged

feat(Modal): support placeholder & add theme #1603

merged 5 commits into from
Jul 26, 2017

Conversation

paranoidjk
Copy link
Contributor

@paranoidjk paranoidjk commented Jul 25, 2017

ref gitlab 469

First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

  • Make sure that you follow antd's code convention.
  • Run npm run lint and fix those errors before submitting in order to keep consistent code style.
  • Rebase before creating a PR to keep commit history clear.
  • Add some descriptions and refer relative issues for you PR.

Extra checklist:

if isBugFix :

  • Make sure that you add at least one unit test for the bug which you had fixed.

elif isNewFeature :

  • Update API docs for the component.
  • Update/Add demo to demonstrate new feature.
  • Update TypeScript definition for the component.
  • Add unit tests for the feature.

This change is Reviewable

@mention-bot
Copy link

@paranoidjk, thanks for your PR! By analyzing the history of the files in this pull request, we identified @silentcloud, @cncolder and @yiminghe to be potential reviewers.

@paranoidjk
Copy link
Contributor Author

@silentcloud rn 忘记改了... 需要同步更新吗?

@silentcloud
Copy link
Contributor

@paranoidjk 加一下吧,保持一致

@@ -57,7 +57,7 @@ export default class Modal extends ModalComponent<ModalProps, any> {
buttonStyle = button.style;
if (typeof buttonStyle === 'string') {
const styleMap = {
cancel: { fontWeight: 'bold' },
Copy link
Contributor

Choose a reason for hiding this comment

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

这里是视觉让去掉的么?cancel 这种 style 类型是和 rn 样式保持一致的 http://facebook.github.io/react-native/docs/alert.html

Copy link
Contributor Author

Choose a reason for hiding this comment

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

是的,看的写的 gitlab # 469

@codecov
Copy link

codecov bot commented Jul 25, 2017

Codecov Report

Merging #1603 into master will decrease coverage by 0.67%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1603      +/-   ##
==========================================
- Coverage   66.05%   65.37%   -0.68%     
==========================================
  Files         228      106     -122     
  Lines        4431     2175    -2256     
  Branches     1165      609     -556     
==========================================
- Hits         2927     1422    -1505     
+ Misses       1503      753     -750     
+ Partials        1        0       -1
Flag Coverage Δ
#rn 65.37% <ø> (ø) ⬆️
#web ?
Impacted Files Coverage Δ
components/menu/style/index.web.tsx
components/nav-bar/index.web.tsx
components/search-bar/style/index.web.tsx
components/wing-blank/index.web.tsx
components/picker-view/style/index.web.tsx
components/toast/index.web.tsx
components/locale-provider/index.web.tsx
components/card/style/index.web.tsx
components/textarea-item/index.web.tsx
components/action-sheet/index.web.tsx
... and 109 more

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 ba809a8...d1bce08. Read the comment docs.

@codecov
Copy link

codecov bot commented Jul 25, 2017

Codecov Report

Merging #1603 into master will increase coverage by 0.14%.
The diff coverage is 16.66%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #1603      +/-   ##
=========================================
+ Coverage   66.05%   66.2%   +0.14%     
=========================================
  Files         228     228              
  Lines        4431    4421      -10     
  Branches     1165    1157       -8     
=========================================
  Hits         2927    2927              
+ Misses       1503    1493      -10     
  Partials        1       1
Flag Coverage Δ
#rn 65.59% <40%> (+0.21%) ⬆️
#web 66.79% <5%> (+0.08%) ⬆️
Impacted Files Coverage Δ
components/modal/alert.web.tsx 11.11% <ø> (ø) ⬆️
components/modal/style/prompt.tsx 100% <ø> (ø) ⬆️
components/style/themes/default.tsx 100% <ø> (ø) ⬆️
components/modal/prompt.tsx 30% <0%> (+8.57%) ⬆️
components/modal/alert.tsx 42.85% <0%> (+12.85%) ⬆️
components/modal/PromptContainer.tsx 16.12% <0%> (ø) ⬆️
components/modal/prompt.web.tsx 4.47% <0%> (+0.19%) ⬆️
components/modal/Modal.web.tsx 59.01% <100%> (ø) ⬆️
components/modal/index.tsx 100% <100%> (ø) ⬆️
components/modal/Modal.tsx 75% <66.66%> (ø) ⬆️
... and 6 more

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 57b7c3a...22e2780. Read the comment docs.

@@ -56,7 +63,7 @@ export default class AlertContainer extends React.Component<AlertContainerProps,
onAnimationEnd={onAnimationEnd}
>
<ScrollView>
<Text>{content}</Text>
<Text style={styles.content}>{content}</Text>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@silentcloud 改 rn 的时候给这里加 style 就显示不出来了,也没有报错,inspector 也没有这一块,去掉 style 就好了。 啥原因?

@paranoidjk paranoidjk changed the title feat(Modal): support placeholder & add theme WIP: feat(Modal): support placeholder & add theme Jul 25, 2017
@paranoidjk paranoidjk changed the title WIP: feat(Modal): support placeholder & add theme feat(Modal): support placeholder & add theme Jul 26, 2017
@paranoidjk paranoidjk merged commit fd7f11e into master Jul 26, 2017
@paranoidjk paranoidjk deleted the gitlab-469 branch July 26, 2017 04:15
lixiaoyang1992 pushed a commit to lixiaoyang1992/ant-design-mobile that referenced this pull request Apr 26, 2018
* feat(Modal): support placeholder & add theme

ref gitlab 469

* feat(Modal): rn style

* fix: rn style

* fix: interface

* fix: lint
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.

3 participants