Skip to content

Commit

Permalink
RNMobile - Insert a new Paragraph block when pressing Enter on end of…
Browse files Browse the repository at this point in the history
… captions (#22928)

* Insert block after pressing enter on caption.

* Implement breaking captions on videos.

* Add deleteEnter prop to caption

* Add break support on gallery caption.

* Fix lint error.

Co-authored-by: Matt Chowning <matt.chowning@automattic.com>
  • Loading branch information
SergioEstevao and mchowning authored Jun 8, 2020
1 parent 46b4161 commit 1497b52
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const BlockCaption = ( {
isSelected,
shouldDisplay,
text,
insertBlocksAfter,
} ) => (
<View style={ [ styles.container, shouldDisplay && styles.padding ] }>
<Caption
Expand All @@ -35,6 +36,7 @@ const BlockCaption = ( {
onFocus={ onFocus }
shouldDisplay={ shouldDisplay }
value={ text }
insertBlocksAfter={ insertBlocksAfter }
/>
</View>
);
Expand Down
6 changes: 6 additions & 0 deletions packages/block-editor/src/components/caption/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { View } from 'react-native';
/**
* WordPress dependencies
*/
import { createBlock } from '@wordpress/blocks';
import { RichText } from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';

Expand All @@ -22,6 +23,7 @@ const Caption = ( {
shouldDisplay = true,
style,
value,
insertBlocksAfter = () => {},
} ) => (
<View
accessibilityLabel={
Expand Down Expand Up @@ -49,6 +51,10 @@ const Caption = ( {
underlineColorAndroid="transparent"
unstableOnFocus={ onFocus }
value={ value }
__unstableOnSplitAtEnd={ () =>
insertBlocksAfter( createBlock( 'core/paragraph' ) )
}
deleteEnter={ true }
/>
</View>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/block-library/src/gallery/gallery.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const Gallery = ( props ) => {
isSelected,
isNarrow,
onFocus,
insertBlocksAfter,
} = props;

const {
Expand Down Expand Up @@ -143,6 +144,7 @@ export const Gallery = ( props ) => {
}
onFocus={ focusGalleryCaption }
onBlur={ onBlur } // always assign onBlur as props
insertBlocksAfter={ insertBlocksAfter }
/>
</View>
);
Expand Down
1 change: 1 addition & 0 deletions packages/block-library/src/image/edit.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,7 @@ export class ImageEdit extends React.Component {
}
onFocus={ this.onFocusCaption }
onBlur={ this.props.onBlur } // always assign onBlur as props
insertBlocksAfter={ this.props.insertBlocksAfter }
/>
</View>
</TouchableWithoutFeedback>
Expand Down
1 change: 1 addition & 0 deletions packages/block-library/src/video/edit.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@ class VideoEdit extends React.Component {
isSelected={ this.state.isCaptionSelected }
onFocus={ this.onFocusCaption }
onBlur={ this.props.onBlur } // always assign onBlur as props
insertBlocksAfter={ this.props.insertBlocksAfter }
/>
</View>
</TouchableWithoutFeedback>
Expand Down

0 comments on commit 1497b52

Please sign in to comment.