diff --git a/en/NativeBase.md b/en/NativeBase.md
index 3a5cde76ee51cc1132b4b7d5649fdeff450ef617..dc8b75530041d9e7c45cf2264bf9215774248ddb 100644
--- a/en/NativeBase.md
+++ b/en/NativeBase.md
@@ -556,7 +556,7 @@ The following component attributes are currently supported:
 | leastDestructiveRef | The ref of element that is least destructive child of the AlertDialog. | Object | No | No | No |
 | initialFocusRef | The ref of element to receive focus when the AlertDialog opens. | Object | No | All | Yes |
 | finalFocusRef | The ref of element to receive focus when the AlertDialog closes. | Object | No | All | Yes |
-| avoidKeyboard | If true and the keyboard is opened, the AlertDialog will move up equivalent to the keyboard height. | Boolean | No | iOS | No |
+| avoidKeyboard | If true and the keyboard is opened, the AlertDialog will move up equivalent to the keyboard height. | Boolean | No | iOS | Yes |
 | closeOnOverlayClick | If true, the AlertDialog will close when the overlay is clicked | Boolean | No | All | Yes |
 | isKeyboardDismissable | If true, the AlertDialog will close when Escape key is pressed | Boolean | No | No | No |
 | overlayVisible | If true, a backdrop element is visible | Boolean | No | All | Yes |
@@ -625,7 +625,7 @@ The following component attributes are currently supported:
 | size | The size of the modal. | String | No | All | Yes |
 | initialFocusRef | The ref of element to receive focus when the modal opens. | Any | No | All | Yes |
 | finalFocusRef | The ref of element to receive focus when the modal closes. | Any | No | All | Yes |
-| avoidKeyboard | If true and the keyboard is opened, the modal will move up equivalent to the keyboard height. | Boolean | No | iOS | No |
+| avoidKeyboard | If true and the keyboard is opened, the modal will move up equivalent to the keyboard height. | Boolean | No | iOS | Yes |
 | isKeyboardDismissable | If true, the modal will close when Escape key is pressed. | Boolean | No | All | Yes |
 | overlayVisible | If true, a backdrop element is visible. | Boolean | No | All | Yes |
 | backdropVisible | If true, a backdrop element is visible. | Boolean | No | All | Yes |
@@ -803,7 +803,7 @@ The following component attributes are currently supported:
 
 - [ ] FormControl 组件 isDisabled 属性无效: [issue#1](https://github.com/GeekyAnts/NativeBase/issues/5707)
 - [ ] Select 组件 placeholderTextColor 属性无效: [issue#16](https://github.com/react-native-oh-library/NativeBase/issues/16)
-- [ ] Modal,AlertDialog,组件 avoidKeyboard 属性无效: [issue#17](https://github.com/react-native-oh-library/NativeBase/issues/17)
+- [X] Modal,AlertDialog,组件avoidKeyboard属性无效: [issue#17](https://github.com/react-native-oh-library/NativeBase/issues/17)
 
 ## Others
 
diff --git a/zh-cn/NativeBase.md b/zh-cn/NativeBase.md
index 225a5d2137a618b0e5b360d029eadf9c6e58a7f4..62e59843a8ca4d446c1f6b86297159fd0fd72019 100644
--- a/zh-cn/NativeBase.md
+++ b/zh-cn/NativeBase.md
@@ -570,7 +570,7 @@ const styles = StyleSheet.create({
 |        leastDestructiveRef         |           最小元素节点    |       Object        |    No    |   No    |        No        |
 |        initialFocusRef         |           打开时焦点元素节点    |       Object        |    No    |   All    |        Yes        |
 |        finalFocusRef         |           关闭时焦点元素节点    |       Object        |    No    |   All    |        Yes        |
-|        avoidKeyboard         |           键盘打开，则 AlertDialog 将向上移动相当于键盘高度     |       Boolean        |    No    |   iOS    |        No        |
+|        avoidKeyboard         |           键盘打开，则 AlertDialog 将向上移动相当于键盘高度     |       Boolean        |    No    |   iOS    |        Yes        |
 |        closeOnOverlayClick         |           点击关闭    |       Boolean        |    No    |   All    |        Yes        |
 |        isKeyboardDismissable         |           Esc关闭    |       Boolean        |    No    |   No    |        No        |
 |        overlayVisible         |           背景元素是否可见    |       Boolean        |    No    |   All    |        Yes        |
@@ -639,7 +639,7 @@ const styles = StyleSheet.create({
 |        size         |            尺寸   |        String        |    No    |   All    |        Yes        |
 |        initialFocusRef         |            模态框打开时最初获得焦点的元素节点    |        Any       |    No    |   All    |        Yes        |
 |        finalFocusRef         |            模态框关闭时最终获得焦点的元素节点    |        Any       |    No    |   All    |        Yes        |
-|        avoidKeyboard         |            键盘打开，则 Modal 将向上移动相当于键盘高度      |        Boolean       |    No    |   iOS    |        No        |
+|        avoidKeyboard         |            键盘打开，则 Modal 将向上移动相当于键盘高度      |        Boolean       |    No    |   iOS    |        Yes        |
 |        isKeyboardDismissable         |            控制是否可以通过触摸屏幕外部或按下系统返回键来关闭键盘和模态框    |        Boolean       |    No    |   All    |        Yes        |
 |        overlayVisible         |            控制模态框的背景覆盖层（overlay）是否可见    |        Boolean       |    No    |   All    |        Yes        |
 |        backdropVisible         |            控制模态框的背景遮罩是否可见    |        Boolean       |    No    |   All    |        Yes        |
@@ -817,7 +817,7 @@ const styles = StyleSheet.create({
 ## 遗留问题
 - [ ] FormControl组件isDisabled属性无效: [issue#1](https://github.com/GeekyAnts/NativeBase/issues/5707)
 - [ ] Select组件placeholderTextColor属性无效: [issue#16](https://github.com/react-native-oh-library/NativeBase/issues/16)
-- [ ] Modal,AlertDialog,组件avoidKeyboard属性无效: [issue#17](https://github.com/react-native-oh-library/NativeBase/issues/17)
+- [X] Modal,AlertDialog,组件 avoidKeyboard 属性无效: [issue#17](https://github.com/react-native-oh-library/NativeBase/issues/17)
 
 ## 其他