Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mobile: Resolves #2669: When attaching a file insert it at the current cursor position (#3189) 

* When attaching an image/resource insert it at the current cursor position

* Correct argument order

* Address code review comments

* Another code review comment

Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
pull/3244/head
Roman Musin 2020-05-20 17:46:01 +01:00 committed by GitHub
parent 58396ea5ce
commit 9f7eeb0510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ReactNativeClient/lib/components/screens/note.js
View File

@ -72,6 +72,8 @@ class NoteScreenComponent extends BaseScreenComponent {
HACK_webviewLoadingState: 0, HACK_webviewLoadingState: 0,
}; };
this.selection = null;
this.markdownEditorRef = React.createRef(); // For focusing the Markdown editor this.markdownEditorRef = React.createRef(); // For focusing the Markdown editor
this.doFocusUpdate_ = false; this.doFocusUpdate_ = false;
@ -291,6 +293,8 @@ class NoteScreenComponent extends BaseScreenComponent {
} }
async UNSAFE_componentWillMount() { async UNSAFE_componentWillMount() {
this.selection = null;
BackButtonService.addHandler(this.backHandler); BackButtonService.addHandler(this.backHandler);
NavService.addHandler(this.navHandler); NavService.addHandler(this.navHandler);
@ -556,7 +560,15 @@ class NoteScreenComponent extends BaseScreenComponent {
const resourceTag = Resource.markdownTag(resource); const resourceTag = Resource.markdownTag(resource);
const newNote = Object.assign({}, this.state.note); const newNote = Object.assign({}, this.state.note);
newNote.body += `\n${resourceTag}`;
if (this.state.mode == 'edit' && !Setting.value('editor.beta') && !!this.selection) {
const prefix = newNote.body.substring(0, this.selection.start);
const suffix = newNote.body.substring(this.selection.end);
newNote.body = `${prefix}\n${resourceTag}\n${suffix}`;
} else {
newNote.body += `\n${resourceTag}`;
}
this.setState({ note: newNote }); this.setState({ note: newNote });
this.refreshResource(resource, newNote.body); this.refreshResource(resource, newNote.body);
@ -979,7 +991,22 @@ class NoteScreenComponent extends BaseScreenComponent {
// a plain TextInput for now. // a plain TextInput for now.
// See https://github.com/laurent22/joplin/issues/3041 // See https://github.com/laurent22/joplin/issues/3041
( (
<TextInput autoCapitalize="sentences" style={this.styles().bodyTextInput} ref="noteBodyTextField" multiline={true} value={note.body} onChangeText={(text) => this.body_changeText(text)} blurOnSubmit={false} selectionColor={theme.textSelectionColor} keyboardAppearance={theme.keyboardAppearance} placeholder={_('Add body')} placeholderTextColor={theme.colorFaded} /> <TextInput
autoCapitalize="sentences"
style={this.styles().bodyTextInput}
ref="noteBodyTextField"
multiline={true}
value={note.body}
onChangeText={(text) => this.body_changeText(text)}
onSelectionChange={({ nativeEvent: { selection } }) => {
this.selection = selection;
}}
blurOnSubmit={false}
selectionColor={theme.textSelectionColor}
keyboardAppearance={theme.keyboardAppearance}
placeholder={_('Add body')}
placeholderTextColor={theme.colorFaded}
/>
); );
} }