PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #682 from matrix-org/luke/fix-typing-notif

Browse source 
Fix typing notif and status bar
This commit is contained in:
David Baker 2017-02-09 10:46:37 +00:00 committed by GitHub
commit 7ba9e27893
3 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/WhoIsTyping.js
View file

@ -48,10 +48,11 @@ module.exports = {
return whoIsTyping;
},
whoIsTypingString: function(room, limit) {
const whoIsTyping = this.usersTypingApartFromMe(room);
const othersCount = limit === undefined ?
0 : Math.max(whoIsTyping.length - limit, 0);
whoIsTypingString: function(whoIsTyping, limit) {
let othersCount = 0;
if (whoIsTyping.length > limit) {
othersCount = whoIsTyping.length - limit + 1;
}
if (whoIsTyping.length == 0) {
return '';
} else if (whoIsTyping.length == 1) {
@ -62,7 +63,7 @@ module.exports = {
});
if (othersCount) {
const other = ' other' + (othersCount > 1 ? 's' : '');
return names.slice(0, limit).join(', ') + ' and ' +
return names.slice(0, limit - 1).join(', ') + ' and ' +
othersCount + other + ' are typing';
} else {
const lastPerson = names.pop();

37
src/components/structures/RoomStatusBar.js
View file

@ -82,17 +82,14 @@ module.exports = React.createClass({
getDefaultProps: function() {
return {
whoIsTypingLimit: 2,
whoIsTypingLimit: 3,
};
},
getInitialState: function() {
return {
syncState: MatrixClientPeg.get().getSyncState(),
whoisTypingString: WhoIsTyping.whoIsTypingString(
this.props.room,
this.props.whoIsTypingLimit
),
usersTyping: WhoIsTyping.usersTypingApartFromMe(this.props.room),
};
},
@ -106,7 +103,7 @@ module.exports = React.createClass({
this.props.onResize();
}
const size = this._getSize(this.state, this.props);
const size = this._getSize(this.props, this.state);
if (size > 0) {
this.props.onVisible();
} else {
@ -141,19 +138,16 @@ module.exports = React.createClass({
onRoomMemberTyping: function(ev, member) {
this.setState({
whoisTypingString: WhoIsTyping.whoIsTypingString(
this.props.room,
this.props.whoIsTypingLimit
),
usersTyping: WhoIsTyping.usersTypingApartFromMe(this.props.room),
});
},
// We don't need the actual height - just whether it is likely to have
// changed - so we use '0' to indicate normal size, and other values to
// indicate other sizes.
_getSize: function(state, props) {
_getSize: function(props, state) {
if (state.syncState === "ERROR" ||
state.whoisTypingString ||
(state.usersTyping.length > 0) ||
props.numUnreadMessages ||
!props.atEndOfLiveTimeline ||
props.hasActiveCall) {
@ -169,7 +163,8 @@ module.exports = React.createClass({
// determine if we need to call onResize
_checkForResize: function(prevProps, prevState) {
// figure out the old height and the new height of the status bar.
return this._getSize(prevProps, prevState) !== this._getSize(this.props, this.state);
return this._getSize(prevProps, prevState)
!== this._getSize(this.props, this.state);
},
// return suitable content for the image on the left of the status bar.
@ -220,10 +215,13 @@ module.exports = React.createClass({
},
_renderTypingIndicatorAvatars: function(limit) {
let users = WhoIsTyping.usersTypingApartFromMe(this.props.room);
let users = this.state.usersTyping;
let othersCount = Math.max(users.length - limit, 0);
users = users.slice(0, limit);
let othersCount = 0;
if (users.length > limit) {
othersCount = users.length - limit + 1;
users = users.slice(0, limit - 1);
}
let avatars = users.map((u, index) => {
let showInitial = othersCount === 0 && index === users.length - 1;
@ -324,7 +322,10 @@ module.exports = React.createClass({
);
}
var typingString = this.state.whoisTypingString;
const typingString = WhoIsTyping.whoIsTypingString(
this.state.usersTyping,
this.props.whoIsTypingLimit
);
if (typingString) {
return (
<div className="mx_RoomStatusBar_typingBar">
@ -347,7 +348,7 @@ module.exports = React.createClass({
render: function() {
var content = this._getContent();
var indicator = this._getIndicator(this.state.whoisTypingString !== null);
var indicator = this._getIndicator(this.state.usersTyping.length > 0);
return (
<div className="mx_RoomStatusBar">

2
src/components/structures/RoomView.js
View file

@ -1537,7 +1537,7 @@ module.exports = React.createClass({
onResize={this.onChildResize}
onVisible={this.onStatusBarVisible}
onHidden={this.onStatusBarHidden}
whoIsTypingLimit={2}
whoIsTypingLimit={3}
/>;
}