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

Jump to bottom

[RNMobile] Add content alignment options to paragraph block (updating release branch) #18433

Merged
merged 3 commits into from
Nov 14, 2019
Merged

[RNMobile] Add content alignment options to paragraph block (updating release branch) #18433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78b3eea
[RNMobile] Add content alignment options to paragraph block
mchowning Sep 4, 2019
d1b4888
Merge branch 'rnmobile/release-v1.17.0' into paragraph_alignment_to_r…
hypest Nov 14, 2019
823b08f
Merge branch 'rnmobile/release-v1.17.0' into paragraph_alignment_to_r…
hypest Nov 14, 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
5 changes: 0 additions & 5 deletions packages/block-editor/src/components/alignment-toolbar/index.native.js
View file
Open in desktop

This file was deleted.

15 changes: 13 additions & 2 deletions packages/block-library/src/paragraph/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { View } from 'react-native';
import { __ } from '@wordpress/i18n';
import { Component } from '@wordpress/element';
import { createBlock } from '@wordpress/blocks';
import { RichText } from '@wordpress/block-editor';
import { AlignmentToolbar, BlockControls, RichText } from '@wordpress/block-editor';

/**
* Internal dependencies
Expand Down Expand Up @@ -47,12 +47,22 @@ class ParagraphEdit extends Component {
} = this.props;

const {
placeholder,
align,
content,
placeholder,
} = attributes;

return (
<View>
<BlockControls>
<AlignmentToolbar
isCollapsed={ false }
value={ align }
onChange={ ( nextAlign ) => {
setAttributes( { align: nextAlign } );
} }
/>
</BlockControls>
<RichText
identifier="content"
tagName="p"
Expand All @@ -78,6 +88,7 @@ class ParagraphEdit extends Component {
onReplace={ onReplace }
onRemove={ onReplace ? () => onReplace( [] ) : undefined }
placeholder={ placeholder || __( 'Start writing…' ) }
textAlign={ align }
/>
</View>
);
Expand Down