imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make attachments uploadable to a thread (#7064)

Browse source
This commit is contained in:
Germain 2021-11-03 08:43:24 +00:00 • committed by GitHub
parent 4b66d4a891
commit 801eb068d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/MessageComposer.tsx
View file

@ -128,6 +128,7 @@ const EmojiButton: React.FC<IEmojiButtonProps> = ({ addEmoji, menuPosition, narr
interface IUploadButtonProps {
roomId: string;
relation?: IEventRelation | null;
}
class UploadButton extends React.Component<IUploadButtonProps> {
@ -169,7 +170,7 @@ class UploadButton extends React.Component<IUploadButtonProps> {
}
ContentMessages.sharedInstance().sendContentListToRoom(
tfiles, this.props.roomId, MatrixClientPeg.get(),
tfiles, this.props.roomId, this.props.relation, MatrixClientPeg.get(),
);
// This is the onChange handler for a file form control, but we're
@ -479,7 +480,11 @@ export default class MessageComposer extends React.Component<IProps, IState> {
);
}
buttons.push(
<UploadButton key="controls_upload" roomId={this.props.room.roomId} />,
<UploadButton
key="controls_upload"
roomId={this.props.room.roomId}
relation={this.props.relation}
/>,
);
buttons.push(
<EmojiButton key="emoji_button" addEmoji={this.addEmoji} menuPosition={menuPosition} narrowMode={this.state.narrowMode} />,