Merge pull request #130 from wordpress-mobile/issue/update_aztec_rn

Update Aztec RN version
WordPress · Aug 24, 2018 · 7803228 · 7803228
2 parents 2f48b90 + aaf5f34
commit 7803228
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,13 +3,13 @@ buildscript {
  gradlePluginVersion = '3.0.1'
  kotlinVersion = '1.2.31'
  supportLibVersion = '27.1.1'
- tagSoupVersion = '1.2.1'
+ tagSoupVersion = '1.2.2'
  glideVersion = '3.7.0'
  picassoVersion = '2.5.2'
  robolectricVersion = '3.5.1'
  jUnitVersion = '4.12'
  jSoupVersion = '1.10.3'
- wordpressUtilsVersion = '1.20.2'
+ wordpressUtilsVersion = '1.22'
  espressoVersion = '3.0.1'
  }
 

diff --git a/gutenberg b/gutenberg
diff --git a/react-native-aztec b/react-native-aztec
diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js
@@ -172,8 +172,9 @@ export default class BlockManager extends React.Component<PropsType, StateType>
  this.props.onChange( clientId, attributes );
  }
 
- render() {
+ renderList() {
  let list;
+ const behavior = Platform.OS === 'ios' ? 'padding' : null;
  if ( Platform.OS === 'android' ) {
  list = (
  <RecyclerViewList
@@ -199,7 +200,15 @@ export default class BlockManager extends React.Component<PropsType, StateType>
  />
  );
  }
+ return (
+ <KeyboardAvoidingView style={ { flex: 1 } } behavior={ behavior }>
+ { list }
+ </KeyboardAvoidingView>
+ );
+ }
 
+ render() {
+ const list = this.renderList();
  const blockTypePicker = (
  <BlockPicker
  visible={ this.state.blockTypePickerVisible }