Skip to content

Commit

Permalink
Merge branch 'develop' into issue/859-more-block-enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
etoledom committed Jun 5, 2019
2 parents 042903f + b9e9ce1 commit 4a6bd6a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions react-native-aztec/src/AztecView.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import ReactNative, {requireNativeComponent, ViewPropTypes, UIManager, ColorPropType, TouchableWithoutFeedback, Platform} from 'react-native';
import ReactNative, {requireNativeComponent, TextViewPropTypes, UIManager, ColorPropType, TouchableWithoutFeedback, Platform} from 'react-native';
import TextInputState from 'react-native/lib/TextInputState';

const AztecManager = UIManager.getViewManagerConfig('RCTAztecView');
Expand Down Expand Up @@ -30,7 +30,7 @@ class AztecView extends React.Component {
onHTMLContentWithCursor: PropTypes.func,
onCaretVerticalPositionChange: PropTypes.func,
blockType: PropTypes.object,
...ViewPropTypes, // include the default view properties
...TextViewPropTypes, // include the default view properties
}

dispatch(command, params) {
Expand Down

0 comments on commit 4a6bd6a

Please sign in to comment.