Skip to content

Commit dcc15af

Browse files
dateString feat added.
1 parent 84aa39d commit dcc15af

2 files changed

Lines changed: 35 additions & 21 deletions

File tree

src/MeetingMessage/MeetingMessage.js

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export class MeetingMessage extends Component {
3131
render() {
3232
const {
3333
date,
34+
dateString,
3435
title,
3536
subject,
3637
onClick,
@@ -43,7 +44,7 @@ export class MeetingMessage extends Component {
4344

4445
const PARTICIPANT_LIMIT = this.props.participantsLimit;
4546

46-
const dateText = date && !isNaN(date) && (format(date));
47+
const dateText = dateString ? dateString : (date && !isNaN(date) && (format(date)));
4748

4849
return (
4950
<div className="rce-mbox-mtmg">
@@ -103,36 +104,47 @@ export class MeetingMessage extends Component {
103104
dataSource.map((x, i) => {
104105
return (
105106
<div key={i}>
106-
<div className="rce-mitem">
107-
<div className="rce-mitem-body">
108-
<div className="rce-mitem-body--top">
109-
<div
110-
className="rce-mitem-body--top-title"
111-
onClick={(e) => onMeetingTitleClick(x, i, e)}>
112-
{x.title}
113-
</div>
114-
<div className="rce-mitem-body--top-time">
115-
{
116-
x.date &&
117-
!isNaN(x.date) &&
118-
(format(x.date))
119-
}
107+
{
108+
!x.event &&
109+
<div className="rce-mitem">
110+
<div className="rce-mitem-body">
111+
<div className="rce-mitem-body--top">
112+
<div
113+
className="rce-mitem-body--top-title"
114+
onClick={(e) => onMeetingTitleClick(x, i, e)}>
115+
{x.title}
116+
</div>
117+
<div className="rce-mitem-body--top-time">
118+
{
119+
x.dateString ? x.dateString : (x.date &&
120+
!isNaN(x.date) &&
121+
(format(x.date)))
122+
}
123+
</div>
120124
</div>
121-
</div>
122-
<div className="rce-mitem-body--bottom">
123-
<div
124-
className="rce-mitem-body--bottom-title" >
125-
{x.message}
125+
<div className="rce-mitem-body--bottom">
126+
<div
127+
className="rce-mitem-body--bottom-title" >
128+
{x.message}
129+
</div>
126130
</div>
127131
</div>
128132
</div>
129-
</div>
133+
}
134+
130135
<div className="rce-mtmg-record">
131136
{
132137
x.event ?
133138
<div className="rce-mitem-bottom-body">
134139
<div className="rce-mitem-bottom-body-top">
135140
{x.event.title}
141+
<div className="rce-mitem-body--top-time">
142+
{
143+
x.dateString ? x.dateString : (x.date &&
144+
!isNaN(x.date) &&
145+
(format(x.date)))
146+
}
147+
</div>
136148
<div className="rce-mitem-avatar-content">
137149
{
138150
x.event.avatars &&
@@ -188,6 +200,7 @@ export class MeetingMessage extends Component {
188200

189201
MeetingMessage.defaultProps = {
190202
date: new Date(),
203+
dateString: '',
191204
title: '',
192205
subject: '',
193206
altTitle: '',

src/MessageBox/MessageBox.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ export class MessageBox extends Component {
193193
subject={this.props.meeting.subject}
194194
title={this.props.meeting.title}
195195
date={this.props.meeting.date}
196+
dateString={this.props.meeting.dateString}
196197
altTitle={this.props.meeting.altTitle}
197198
participants={this.props.meeting.participants}
198199
dataSource={this.props.meeting.dataSource}

0 commit comments

Comments
 (0)