Merge branch 'master' into refactor-ts

* master: fix(Carousel): ant-design#2369 chore: delete upgrade tip fix: Fix all failed test (ant-design#2337) fix: modal.alert content align=center (ant-design#2347) bugfix: fixed bug in image-picker, Uncaught TypeError: Cannot set property 'value' of null (ant-design#2302) # Conflicts: # components/_util/upgradeTip.tsx # components/image-picker/index.tsx
BANG88 · Mar 13, 2018 · 611df87 · 611df87
2 parents 916cf89 + 5b5ba8c
commit 611df87
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 115 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 2
 title: Change Log
 timeline: true
 toc: false

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 2
 title: 更新日志
 timeline: true
 toc: false

diff --git a/components/carousel/demo/basic.native.tsx b/components/carousel/demo/basic.native.tsx
@@ -13,7 +13,7 @@ export default class BasicCarouselExample extends React.Component<any, any> {
         <View style={{ paddingHorizontal: 15 }}>
           <Carousel
             style={styles.wrapper}
-            autoplayTimeout={2}
+            autoplayInterval={2}
             selectedIndex={2}
             autoplay
             infinite

diff --git a/components/image-picker/index.tsx b/components/image-picker/index.tsx
@@ -209,10 +209,7 @@ export default class ImagePicker extends React.Component<
             aria-label="Choose and add image"
           >
             <input
-              // tslint:disable-next-line:jsx-no-multiline-js
-              ref={input => {
-                this.fileSelectorInput = input;
-              }}
+              ref={(input) => { if (input) { this.fileSelectorInput = input; } }}
               type="file"
               accept={accept}
               // tslint:disable-next-line:jsx-no-multiline-js

diff --git a/components/modal/AlertContainer.native.tsx b/components/modal/AlertContainer.native.tsx
@@ -1,3 +1,4 @@
+/* tslint:disable:jsx-no-multiline-js */
 import React from 'react';
 import { ScrollView, StyleProp, Text, TextStyle } from 'react-native';
 import Modal from './Modal.native';
@@ -57,6 +58,10 @@ export default class AlertContainer extends React.Component<
         visible={this.state.visible}
         footer={footer}
         onAnimationEnd={onAnimationEnd}
+        bodyStyle={{
+          marginTop: 8,
+          alignItems: 'center',
+        }}
       >
         <ScrollView>
           <Text>{content}</Text>

diff --git a/docs/react/customize-theme.en-US.md b/docs/react/customize-theme.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 6
+order: 3
 title: Customize Theme
 ---
 

diff --git a/docs/react/customize-theme.zh-CN.md b/docs/react/customize-theme.zh-CN.md
@@ -1,5 +1,5 @@
 ---
-order: 6
+order: 3
 title: 定制主题
 ---
 

diff --git a/docs/react/upgrade-tip.en-US.md b/docs/react/upgrade-tip.en-US.md
diff --git a/docs/react/upgrade-tip.zh-CN.md b/docs/react/upgrade-tip.zh-CN.md
diff --git a/docs/react/use-with-create-react-app.en-US.md b/docs/react/use-with-create-react-app.en-US.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 1
 title: Use in create-react(-native)-app
 ---
 

diff --git a/docs/react/use-with-create-react-app.zh-CN.md b/docs/react/use-with-create-react-app.zh-CN.md
@@ -1,5 +1,5 @@
 ---
-order: 3
+order: 1
 title: 在 create-react(-native)-app 中使用
 ---
 

diff --git a/scripts/update-tip.js b/scripts/update-tip.js