Merge pull request #6159 from matrix-org/gsouquet/fix-showtimestamps-notifpanel
Add prop to alwaysShowTimestamps on TimelinePanel
This commit is contained in:
@@ -50,6 +50,7 @@ export default class NotificationPanel extends React.PureComponent<IProps> {
|
||||
showUrlPreview={false}
|
||||
tileShape="notif"
|
||||
empty={emptyState}
|
||||
alwaysShowTimestamps={true}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
|
||||
@@ -120,6 +120,9 @@ class TimelinePanel extends React.Component {
|
||||
|
||||
// which layout to use
|
||||
layout: LayoutPropType,
|
||||
|
||||
// whether to always show timestamps for an event
|
||||
alwaysShowTimestamps: PropTypes.bool,
|
||||
}
|
||||
|
||||
// a map from room id to read marker event timestamp
|
||||
@@ -1440,7 +1443,7 @@ class TimelinePanel extends React.Component {
|
||||
onFillRequest={this.onMessageListFillRequest}
|
||||
onUnfillRequest={this.onMessageListUnfillRequest}
|
||||
isTwelveHour={this.state.isTwelveHour}
|
||||
alwaysShowTimestamps={this.state.alwaysShowTimestamps}
|
||||
alwaysShowTimestamps={this.props.alwaysShowTimestamps || this.state.alwaysShowTimestamps}
|
||||
className={this.props.className}
|
||||
tileShape={this.props.tileShape}
|
||||
resizeNotifier={this.props.resizeNotifier}
|
||||
|
||||
Reference in New Issue
Block a user