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

Allow stickers to be sent in a Thread (#7267)

Browse source
This commit is contained in:
Germain 2021-12-03 08:22:13 +00:00 • committed by GitHub
parent 141950d9e6
commit f2fee53a0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -656,9 +656,15 @@ export default class MessageComposer extends React.Component<IProps, IState> {
yOffset={-50}
/>;
}
const threadId = this.props.relation?.rel_type === RelationType.Thread
? this.props.relation.event_id
: null;
controls.push(
<Stickerpicker
room={this.props.room}
threadId={threadId}
showStickers={this.state.showStickers}
setShowStickers={this.showStickers}
menuPosition={menuPosition}

6
src/components/views/rooms/Stickerpicker.tsx
View file

@ -46,6 +46,7 @@ const PERSISTED_ELEMENT_KEY = "stickerPicker";
interface IProps {
room: Room;
threadId?: string | null;
showStickers: boolean;
menuPosition?: any;
setShowStickers: (showStickers: boolean) => void;
@ -62,6 +63,10 @@ interface IState {
@replaceableComponent("views.rooms.Stickerpicker")
export default class Stickerpicker extends React.PureComponent<IProps, IState> {
static defaultProps = {
threadId: null,
};
static currentWidget;
private dispatcherRef: string;
@ -287,6 +292,7 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
<AppTile
app={stickerApp}
room={this.props.room}
threadId={this.props.threadId}
fullWidth={true}
userId={MatrixClientPeg.get().credentials.userId}
creatorUserId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}