OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6159 from matrix-org/gsouquet/fix-showtimestamps-notifpanel 

Add prop to alwaysShowTimestamps on TimelinePanel
pull/21833/head
Germain 2021-06-07 17:21:19 +01:00 committed by GitHub
parent 9419dd9840 187a367111
commit c6de1c3fc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/structures/NotificationPanel.tsx
View File

@ -50,6 +50,7 @@ export default class NotificationPanel extends React.PureComponent<IProps> {
showUrlPreview={false} showUrlPreview={false}
tileShape="notif" tileShape="notif"
empty={emptyState} empty={emptyState}
alwaysShowTimestamps={true}
/> />
); );
} else { } else {

5
src/components/structures/TimelinePanel.js
View File

@ -120,6 +120,9 @@ class TimelinePanel extends React.Component {
// which layout to use // which layout to use
layout: LayoutPropType, layout: LayoutPropType,
// whether to always show timestamps for an event
alwaysShowTimestamps: PropTypes.bool,
} }
// a map from room id to read marker event timestamp // a map from room id to read marker event timestamp
@ -1440,7 +1443,7 @@ class TimelinePanel extends React.Component {
onFillRequest={this.onMessageListFillRequest} onFillRequest={this.onMessageListFillRequest}
onUnfillRequest={this.onMessageListUnfillRequest} onUnfillRequest={this.onMessageListUnfillRequest}
isTwelveHour={this.state.isTwelveHour} isTwelveHour={this.state.isTwelveHour}
alwaysShowTimestamps={this.state.alwaysShowTimestamps} alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.alwaysShowTimestamps}
className={this.props.className} className={this.props.className}
tileShape={this.props.tileShape} tileShape={this.props.tileShape}
resizeNotifier={this.props.resizeNotifier} resizeNotifier={this.props.resizeNotifier}