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

Avoid to reset html to empty string if block is heading and platform is android #14301

Merged
merged 3 commits into from
Mar 8, 2019
Merged

Avoid to reset html to empty string if block is heading and platform is android #14301

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a04ccea
Avoid to reset html to empty string if block is heading on android pl…
marecar3 Mar 7, 2019
67f50e7
Send empty tag flag from heading block to RichText
marecar3 Mar 7, 2019
d41a8c4
Merge branch 'rnmobile/develop' into rnmobile/627_heading_block_shows…
marecar3 Mar 7, 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
24 changes: 21 additions & 3 deletions packages/editor/src/components/rich-text/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
import RCTAztecView from 'react-native-aztec';
import { View, Platform } from 'react-native';
import { indexOf } from 'lodash';

/**
* WordPress dependencies
Expand Down Expand Up @@ -69,6 +70,10 @@ const gutenbergFormatNamesToAztec = {
'core/strikethrough': 'strikethrough',
};

const headingTags = [
'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
hypest marked this conversation as resolved.
Show resolved Hide resolved
];

export class RichText extends Component {
constructor() {
super( ...arguments );
Expand Down Expand Up @@ -98,11 +103,11 @@ export class RichText extends Component {
getRecord() {
const { formatPlaceholder, start, end } = this.state;

var value = this.props.value === undefined ? null : this.props.value;
let value = this.props.value === undefined ? null : this.props.value;

// Since we get the text selection from Aztec we need to be in sync with the HTML `value`
// Removing leading white spaces using `trim()` should make sure this is the case.
if (typeof value === 'string' || value instanceof String) {
if ( typeof value === 'string' || value instanceof String ) {
value = value.trimLeft();
}

Expand Down Expand Up @@ -503,8 +508,21 @@ export class RichText extends Component {
const value = this.valueToFormat( record );
let html = `<${ tagName }>${ value }</${ tagName }>`;
// We need to check if the value is undefined or empty, and then assign it properly otherwise the placeholder is not visible

if ( value === undefined || value === '' ) {
html = '';
// PR for placeholder fix https://github.com/WordPress/gutenberg/pull/13699/
// has introduced heading issue on Android https://github.com/wordpress-mobile/gutenberg-mobile/issues/627
// ( If a new heading block is created on Android device
// it will be without default formatting ( <h2> currently ) ) .
// Fix for heading issue is to skip reset of html variable if tag is heading and platform is Android.
// This fix will intentionally introduce original issue with placeholder (on Android)
// which has lower priority then heading issue .
// New issue is raised : https://github.com/wordpress-mobile/gutenberg-mobile/issues/707
const index = indexOf( headingTags, tagName );
if ( this.isIOS || index === -1 ) {
html = '';
}

this.lastEventCount = undefined; // force a refresh on the native side
}
let minHeight = 0;
Expand Down