Skip to content

Fix jumpy html text input on iOS #115

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

Merged
etoledom merged 2 commits into from
Sep 10, 2018
Merged

Fix jumpy html text input on iOS #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c38845
block-manager: remove state.html in favor of getting the text from th…
etoledom Aug 14, 2018
5e3c1d1
Merge branch 'master' into feature/html-input-view-ux-vol02
etoledom Sep 10, 2018
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
25 changes: 9 additions & 16 deletions src/block-management/block-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ type StateType = {
inspectBlocks: boolean,
blockTypePickerVisible: boolean,
selectedBlockType: string,
html: string,
};

export default class BlockManager extends React.Component<PropsType, StateType> {
_htmlTextInput: TextInput = null;

constructor( props: PropsType ) {
super( props );
this.state = {
Expand All @@ -50,7 +51,6 @@ export default class BlockManager extends React.Component<PropsType, StateType>
inspectBlocks: false,
blockTypePickerVisible: false,
selectedBlockType: 'core/paragraph', // just any valid type to start from
html: '',
};
}

Expand Down Expand Up @@ -152,9 +152,8 @@ export default class BlockManager extends React.Component<PropsType, StateType>
}, '' );
}

parseHTML() {
parseHTML( html: string ) {
const { parseBlocksAction } = this.props;
const { html } = this.state;
parseBlocksAction( html );
}

Expand Down Expand Up @@ -249,11 +248,9 @@ export default class BlockManager extends React.Component<PropsType, StateType>
}

handleSwitchEditor = ( showHtml: boolean ) => {
if ( showHtml ) {
const html = this.serializeToHtml();
this.handleHTMLUpdate( html );
} else {
this.parseHTML();
if ( ! showHtml ) {
const html = this._htmlTextInput._lastNativeText;
this.parseHTML( html );
}

this.setState( { showHtml } );
Expand All @@ -263,10 +260,6 @@ export default class BlockManager extends React.Component<PropsType, StateType>
this.setState( { inspectBlocks } );
}

handleHTMLUpdate = ( html: string ) => {
this.setState( { html } );
}

renderItem( value: { item: BlockType, clientId: string } ) {
const insertHere = (
<View style={ styles.containerStyleAddHere } >
Expand Down Expand Up @@ -295,16 +288,16 @@ export default class BlockManager extends React.Component<PropsType, StateType>

renderHTML() {
const behavior = Platform.OS === 'ios' ? 'padding' : null;
const htmlInputRef = ( el ) => this._htmlTextInput = el;
return (
<KeyboardAvoidingView style={ { flex: 1 } } behavior={ behavior }>
<TextInput
textAlignVertical="top"
multiline
ref={ htmlInputRef }
numberOfLines={ 0 }
style={ styles.htmlView }
value={ this.state.html }
onChangeText={ this.handleHTMLUpdate }>
</TextInput>
value={ this.serializeToHtml() } />
</KeyboardAvoidingView>
);
}
Expand Down