Show votes in replied-to polls (pass in getRelationsForEvent) (#7345)
							parent
							
								
									43499b9244
								
							
						
					
					
						commit
						55eda7314b
					
				|  | @ -22,6 +22,7 @@ import escapeHtml from "escape-html"; | |||
| import sanitizeHtml from "sanitize-html"; | ||||
| import { Room } from 'matrix-js-sdk/src/models/room'; | ||||
| import { RelationType } from 'matrix-js-sdk/src/@types/event'; | ||||
| import { Relations } from 'matrix-js-sdk/src/models/relations'; | ||||
| 
 | ||||
| import { _t } from '../../../languageHandler'; | ||||
| import dis from '../../../dispatcher/dispatcher'; | ||||
|  | @ -56,6 +57,9 @@ interface IProps { | |||
|     forExport?: boolean; | ||||
|     isQuoteExpanded?: boolean; | ||||
|     setQuoteExpanded: (isExpanded: boolean) => void; | ||||
|     getRelationsForEvent?: ( | ||||
|         (eventId: string, relationType: string, eventType: string) => Relations | ||||
|     ); | ||||
| } | ||||
| 
 | ||||
| interface IState { | ||||
|  | @ -420,6 +424,7 @@ export default class ReplyChain extends React.Component<IProps, IState> { | |||
|                         onHeightChanged={this.props.onHeightChanged} | ||||
|                         permalinkCreator={this.props.permalinkCreator} | ||||
|                         toggleExpandedQuote={() => this.props.setQuoteExpanded(!this.props.isQuoteExpanded)} | ||||
|                         getRelationsForEvent={this.props.getRelationsForEvent} | ||||
|                     /> | ||||
|                 </blockquote> | ||||
|             ); | ||||
|  |  | |||
|  | @ -1260,6 +1260,7 @@ export default class EventTile extends React.Component<IProps, IState> { | |||
|                     alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.hover} | ||||
|                     isQuoteExpanded={isQuoteExpanded} | ||||
|                     setQuoteExpanded={this.setQuoteExpanded} | ||||
|                     getRelationsForEvent={this.props.getRelationsForEvent} | ||||
|                 />) : null; | ||||
| 
 | ||||
|         switch (this.props.tileShape) { | ||||
|  |  | |||
|  | @ -19,6 +19,7 @@ import classNames from 'classnames'; | |||
| import { MatrixEvent } from "matrix-js-sdk/src/models/event"; | ||||
| import { EventType, MsgType } from 'matrix-js-sdk/src/@types/event'; | ||||
| import { logger } from "matrix-js-sdk/src/logger"; | ||||
| import { Relations } from 'matrix-js-sdk/src/models/relations'; | ||||
| 
 | ||||
| import { _t } from '../../../languageHandler'; | ||||
| import dis from '../../../dispatcher/dispatcher'; | ||||
|  | @ -39,6 +40,9 @@ interface IProps { | |||
|     highlightLink?: string; | ||||
|     onHeightChanged?(): void; | ||||
|     toggleExpandedQuote?: () => void; | ||||
|     getRelationsForEvent?: ( | ||||
|         (eventId: string, relationType: string, eventType: string) => Relations | ||||
|     ); | ||||
| } | ||||
| 
 | ||||
| @replaceableComponent("views.rooms.ReplyTile") | ||||
|  | @ -169,7 +173,8 @@ export default class ReplyTile extends React.PureComponent<IProps> { | |||
|                         overrideBodyTypes={msgtypeOverrides} | ||||
|                         overrideEventTypes={evOverrides} | ||||
|                         replacingEventId={mxEvent.replacingEventId()} | ||||
|                         maxImageHeight={96} /> | ||||
|                         maxImageHeight={96} | ||||
|                         getRelationsForEvent={this.props.getRelationsForEvent} /> | ||||
|                 </a> | ||||
|             </div> | ||||
|         ); | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Andy Balaam
						Andy Balaam