Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

New composer: support pasting files #3358

Merged
bwindels merged 1 commit into from
Aug 29, 2019
Merged

New composer: support pasting files #3358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/components/views/rooms/BasicMessageComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ export default class BasicMessageEditor extends React.Component {
}
}

getEditableRootNode() {
return this._editorRef;
}

isModified() {
return this._modifiedFlag;
}
Expand Down
19 changes: 19 additions & 0 deletions src/components/views/rooms/SendMessageComposer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {processCommandInput} from '../../../SlashCommands';
import sdk from '../../../index';
import Modal from '../../../Modal';
import { _t } from '../../../languageHandler';
import ContentMessages from '../../../ContentMessages';

function addReplyToMessageContent(content, repliedToEvent, permalinkCreator) {
const replyContent = ReplyThread.makeReplyMixIn(repliedToEvent);
Expand Down Expand Up @@ -226,8 +227,13 @@ export default class SendMessageComposer extends React.Component {
this._clearStoredEditorState();
}

componentDidMount() {
this._editorRef.getEditableRootNode().addEventListener("paste", this._onPaste, true);
}

componentWillUnmount() {
dis.unregister(this.dispatcherRef);
this._editorRef.getEditableRootNode().removeEventListener("paste", this._onPaste, true);
}

componentWillMount() {
Expand Down Expand Up @@ -310,6 +316,19 @@ export default class SendMessageComposer extends React.Component {
this._editorRef && this._editorRef.focus();
}

_onPaste = (event) => {
const {clipboardData} = event;
if (clipboardData.files.length) {
Copy link
Copy Markdown
Contributor Author

@bwindels bwindels Aug 29, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is mostly copied over from MessageComposerInput::onPaste ftr

// This actually not so much for 'files' as such (at time of writing
// neither chrome nor firefox let you paste a plain file copied
// from Finder) but more images copied from a different website
// / word processor etc.
ContentMessages.sharedInstance().sendContentListToRoom(
Array.from(clipboardData.files), this.props.room.roomId, this.context.matrixClient,
);
}
}

render() {
return (
<div className="mx_SendMessageComposer" onClick={this.focusComposer} onKeyDown={this._onKeyDown}>
Expand Down