PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

stub out more until it loads...

Browse source
This commit is contained in:
Matthew Hodgson 2018-05-06 00:18:11 +01:00
parent f4ed820b6f
commit 05eba3fa32
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/views/rooms/MessageComposerInput.js
View file

@ -237,6 +237,12 @@ export default class MessageComposerInput extends React.Component {
return EditorState.moveFocusToEnd(editorState); return EditorState.moveFocusToEnd(editorState);
*/ */
if (value) {
// create with this value
}
else {
value = Value.create();
}
return value; return value;
} }
@ -262,7 +268,7 @@ export default class MessageComposerInput extends React.Component {
onAction = (payload) => { onAction = (payload) => {
const editor = this.refs.editor; const editor = this.refs.editor;
let contentState = this.state.editorState.getCurrentContent(); let editorState = this.state.editorState;
switch (payload.action) { switch (payload.action) {
case 'reply_to_event': case 'reply_to_event':
@ -1030,6 +1036,7 @@ export default class MessageComposerInput extends React.Component {
* If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState. * If passed a non-null displayedCompletion, modifies state.originalEditorState to compute new state.editorState.
*/ */
setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => { setDisplayedCompletion = async (displayedCompletion: ?Completion): boolean => {
/*
const activeEditorState = this.state.originalEditorState || this.state.editorState; const activeEditorState = this.state.originalEditorState || this.state.editorState;
if (displayedCompletion == null) { if (displayedCompletion == null) {
@ -1084,6 +1091,7 @@ export default class MessageComposerInput extends React.Component {
// for some reason, doing this right away does not update the editor :( // for some reason, doing this right away does not update the editor :(
// setTimeout(() => this.refs.editor.focus(), 50); // setTimeout(() => this.refs.editor.focus(), 50);
*/
return true; return true;
}; };
@ -1102,7 +1110,7 @@ export default class MessageComposerInput extends React.Component {
/* returns inline style and block type of current SelectionState so MessageComposer can render formatting /* returns inline style and block type of current SelectionState so MessageComposer can render formatting
buttons. */ buttons. */
getSelectionInfo(editorState: EditorState) { getSelectionInfo(editorState: Value) {
return {}; return {};
/* /*
const styleName = { const styleName = {
@ -1136,7 +1144,7 @@ export default class MessageComposerInput extends React.Component {
} }
getAutocompleteQuery(contentState: ContentState) { getAutocompleteQuery(contentState: ContentState) {
return []; return '';
// Don't send markdown links to the autocompleter // Don't send markdown links to the autocompleter
// return this.removeMDLinks(contentState, ['@', '#']); // return this.removeMDLinks(contentState, ['@', '#']);
@ -1184,11 +1192,20 @@ export default class MessageComposerInput extends React.Component {
render() { render() {
const activeEditorState = this.state.originalEditorState || this.state.editorState; const activeEditorState = this.state.originalEditorState || this.state.editorState;
let hidePlaceholder = false;
// FIXME: in case we need to implement manual placeholdering
const className = classNames('mx_MessageComposer_input', { const className = classNames('mx_MessageComposer_input', {
mx_MessageComposer_input_empty: hidePlaceholder, mx_MessageComposer_input_empty: hidePlaceholder,
mx_MessageComposer_input_error: this.state.someCompletions === false, mx_MessageComposer_input_error: this.state.someCompletions === false,
}); });
const content = null;
const selection = {
start: 0,
end: 0,
};
// const content = activeEditorState.getCurrentContent(); // const content = activeEditorState.getCurrentContent();
// const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(), // const selection = RichText.selectionStateToTextOffsets(activeEditorState.getSelection(),
// activeEditorState.getCurrentContent().getBlocksAsArray()); // activeEditorState.getCurrentContent().getBlocksAsArray());
@ -1214,6 +1231,7 @@ export default class MessageComposerInput extends React.Component {
<Editor ref="editor" <Editor ref="editor"
dir="auto" dir="auto"
placeholder={this.props.placeholder} placeholder={this.props.placeholder}
value={this.state.editorState}
/* /*
editorState={this.state.editorState} editorState={this.state.editorState}
onChange={this.onEditorContentChanged} onChange={this.onEditorContentChanged}