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.

Sign up for GitHub

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

More block enhancements #1079

Merged
merged 9 commits into from
Jun 6, 2019
Merged

More block enhancements #1079

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a14c89c
Update gutenberg ref
etoledom Jun 5, 2019
9172deb
Update gutenberg ref
etoledom Jun 5, 2019
042903f
Update gutenberg ref
etoledom Jun 5, 2019
4a6bd6a
Merge branch 'develop' into issue/859-more-block-enhancements
etoledom Jun 5, 2019
733a7ba
Update gutenberg ref
etoledom Jun 5, 2019
e33c545
Update gutenberg ref
etoledom Jun 6, 2019
086e8b3
Merge branch 'develop' into issue/859-more-block-enhancements
etoledom Jun 6, 2019
d59c36f
Update gutenberg ref
etoledom Jun 6, 2019
b6d6eae
Update gutenberg ref
etoledom Jun 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into issue/859-more-block-enhancements
  • Loading branch information
@etoledom
etoledom committed Jun 5, 2019
commit 4a6bd6ab560d1f6ef1c45b07d41c8de37be9d774
4 changes: 2 additions & 2 deletions react-native-aztec/src/AztecView.js
View file
Open in desktop
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
You are viewing a condensed version of this merge commit. You can view the full changes here.