Skip to content

Commit

Permalink
Merge pull request #1067 from wordpress-mobile/issue/207_quotes_desig…
Browse files Browse the repository at this point in the history
…n_review

Issue/207 quotes design review
  • Loading branch information
SergioEstevao authored Jun 5, 2019
2 parents 75bf025 + 0ee829e commit b9e9ce1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gutenberg
Submodule gutenberg updated 53 files
+34 −0 docs/designers-developers/developers/block-api/block-registration.md
+20 −1 docs/designers-developers/developers/data/data-core-block-editor.md
+22 −101 package-lock.json
+7 −3 package.json
+3 −3 packages/block-editor/README.md
+39 −1 packages/block-editor/src/components/block-actions/index.js
+4 −4 packages/block-editor/src/components/block-selection-clearer/index.js
+83 −0 packages/block-editor/src/components/colors/test/utils.js
+5 −4 packages/block-editor/src/components/colors/utils.js
+1 −1 packages/block-editor/src/components/rich-text/index.native.js
+26 −1 packages/block-editor/src/store/actions.js
+14 −1 packages/block-editor/src/store/reducer.js
+18 −0 packages/block-editor/src/store/test/actions.js
+1 −0 packages/block-editor/src/store/test/reducer.js
+40 −0 packages/block-library/src/group/index.js
+0 −1 packages/block-library/src/media-text/editor.scss
+29 −17 packages/block-library/src/table/edit.js
+12 −0 packages/block-library/src/table/editor.scss
+2 −0 packages/blocks/CHANGELOG.md
+1 −1 packages/blocks/README.md
+84 −20 packages/blocks/src/api/factory.js
+270 −1 packages/blocks/src/api/test/factory.js
+9 −0 packages/components/src/placeholder/README.md
+3 −3 packages/components/src/placeholder/index.js
+5 −0 packages/components/src/placeholder/style.scss
+11 −1 packages/components/src/primitives/block-quotation/index.native.js
+6 −1 packages/components/src/primitives/block-quotation/style.native.scss
+112 −26 packages/e2e-tests/fixtures/block-transforms.js
+99 −0 packages/e2e-tests/specs/__snapshots__/block-grouping.test.js.snap
+16 −0 packages/e2e-tests/specs/__snapshots__/block-transforms.test.js.snap
+51 −0 packages/e2e-tests/specs/a11y.test.js
+34 −5 packages/e2e-tests/specs/block-deletion.test.js
+176 −0 packages/e2e-tests/specs/block-grouping.test.js
+3 −0 packages/e2e-tests/specs/block-switcher.test.js
+6 −1 packages/e2e-tests/specs/block-transforms.test.js
+5 −3 packages/e2e-tests/specs/blocks/table.test.js
+3 −1 packages/edit-post/src/components/sidebar/settings-header/index.js
+1 −1 packages/edit-post/src/store/effects.js
+127 −0 packages/editor/src/components/convert-to-group-buttons/convert-button.js
+19 −0 packages/editor/src/components/convert-to-group-buttons/icons.js
+33 −0 packages/editor/src/components/convert-to-group-buttons/index.js
+2 −0 packages/editor/src/components/provider/index.js
+9 −0 packages/scripts/CHANGELOG.md
+28 −10 packages/scripts/README.md
+2 −0 packages/scripts/config/.eslintignore
+3 −0 packages/scripts/config/.npmpackagejsonlintignore
+3 −0 packages/scripts/config/.stylelintignore
+1 −0 packages/scripts/package.json
+14 −2 packages/scripts/scripts/lint-js.js
+14 −2 packages/scripts/scripts/lint-pkg-json.js
+15 −3 packages/scripts/scripts/lint-style.js
+4 −0 packages/scripts/utils/cli.js
+2 −2 packages/scripts/utils/index.js
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 b9e9ce1

Please sign in to comment.