move typing notifications to WhoIsTypingTile, shown in ScrollPanel

res/css/_components.scss

@@ -108,6 +108,7 @@
 @import "./views/rooms/_SearchableEntityList.scss";
 @import "./views/rooms/_Stickers.scss";
 @import "./views/rooms/_TopUnreadMessagesBar.scss";
+@import "./views/rooms/_WhoIsTypingTile.scss";
 @import "./views/settings/_DevicesPanel.scss";
 @import "./views/settings/_IntegrationsManager.scss";
 @import "./views/settings/_Notifications.scss";

res/css/views/rooms/_WhoIsTypingTile.scss

@@ -0,0 +1,123 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_WhoIsTypingTile {
+    margin-left: 65px;
+    min-height: 50px;
+    font-size: 14px;
+}
+
+/* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
+.mx_WhoIsTypingTile_indicator {
+    padding-left: 17px;
+    padding-right: 12px;
+    margin-left: -73px;
+    margin-top: 15px;
+    float: left;
+    width: 24px;
+    text-align: center;
+}
+
+.mx_WhoIsTypingTile_placeholderIndicator span {
+    color: $primary-fg-color;
+    opacity: 0.5;
+    position: relative;
+    top: -4px;
+/*
+    animation-duration: 1s;
+    animation-name: bounce;
+    animation-direction: alternate;
+    animation-iteration-count: infinite;
+*/
+}
+
+.mx_WhoIsTypingTile_placeholderIndicator span:nth-child(1) {
+    animation-delay: 0.3s;
+}
+.mx_WhoIsTypingTile_placeholderIndicator span:nth-child(2) {
+    animation-delay: 0.6s;
+}
+.mx_WhoIsTypingTile_placeholderIndicator span:nth-child(3) {
+    animation-delay: 0.9s;
+}
+
+@keyframes bounce {
+    from {
+        opacity: 0.5;
+        top: 0;
+    }
+
+    to {
+        opacity: 0.2;
+        top: -3px;
+    }
+}
+
+.mx_WhoIsTypingTile_typingIndicatorAvatars {
+    width: 52px;
+    margin-top: -1px;
+}
+
+.mx_WhoIsTypingTile_typingIndicatorAvatars .mx_BaseAvatar_image {
+    margin-right: -12px;
+    border: 1px solid $primary-bg-color;
+}
+
+.mx_WhoIsTypingTile_typingIndicatorAvatars .mx_BaseAvatar_initial {
+    padding-left: 1px;
+    padding-top: 1px;
+}
+
+.mx_WhoIsTypingTile_typingIndicatorRemaining {
+    display: inline-block;
+    color: #acacac;
+    background-color: #ddd;
+    border: 1px solid $primary-bg-color;
+    border-radius: 40px;
+    width: 24px;
+    height: 24px;
+    line-height: 24px;
+    font-size: 0.8em;
+    vertical-align: top;
+    text-align: center;
+    position: absolute;
+}
+
+.mx_WhoIsTypingTile_typingBar {
+    height: 50px;
+    line-height: 50px;
+
+    color: $primary-fg-color;
+    opacity: 0.5;
+    overflow-y: hidden;
+    display: block;
+}
+
+
+.mx_MatrixChat_useCompactLayout {
+    .mx_WhoIsTypingTile {
+        min-height: 40px;
+    }
+
+    .mx_WhoIsTypingTile_indicator {
+        margin-top: 10px;
+    }
+
+    .mx_WhoIsTypingTile_typingBar {
+      height: 40px;
+      line-height: 40px;
+    }
+}

src/components/structures/MessagePanel.js

@@ -637,6 +637,7 @@ module.exports = React.createClass({
 
     render: function() {
         const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
+        const WhoIsTypingTile = sdk.getComponent("rooms.WhoIsTypingTile");
         const Spinner = sdk.getComponent("elements.Spinner");
         let topSpinner;
         let bottomSpinner;
@@ -666,6 +667,7 @@ module.exports = React.createClass({
                     stickyBottom={this.props.stickyBottom}>
                 { topSpinner }
                 { this._getEventTiles() }
+                <WhoIsTypingTile room={this.props.room} />
                 { bottomSpinner }
             </ScrollPanel>
         );

src/components/structures/TimelinePanel.js

@@ -1154,6 +1154,7 @@ var TimelinePanel = React.createClass({
         );
         return (
             <MessagePanel ref="messagePanel"
+                          room={this.props.timelineSet.room}
                           hidden={this.props.hidden}
                           backPaginating={this.state.backPaginating}
                           forwardPaginating={forwardPaginating}

src/components/views/rooms/WhoIsTypingTile.js

@@ -0,0 +1,134 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017, 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { _t, _td } from '../../../languageHandler';
+import sdk from '../../../index';
+import WhoIsTyping from '../../../WhoIsTyping';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import MemberAvatar from '../avatars/MemberAvatar';
+
+module.exports = React.createClass({
+    displayName: 'WhoIsTypingTile',
+
+    propTypes: {
+        // the room this statusbar is representing.
+        room: PropTypes.object.isRequired,
+
+        // Number of names to display in typing indication. E.g. set to 3, will
+        // result in "X, Y, Z and 100 others are typing."
+        whoIsTypingLimit: PropTypes.number,
+    },
+
+    getDefaultProps: function() {
+        return {
+            whoIsTypingLimit: 3,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            usersTyping: WhoIsTyping.usersTypingApartFromMe(this.props.room),
+        };
+    },
+
+    componentWillMount: function() {
+        // MatrixClientPeg.get().on("RoomMember.typing", this.onRoomMemberTyping);
+    },
+
+    componentWillUnmount: function() {
+        // we may have entirely lost our client as we're logging out before clicking login on the guest bar...
+        const client = MatrixClientPeg.get();
+        if (client) {
+            // client.removeListener("RoomMember.typing", this.onRoomMemberTyping);
+        }
+    },
+
+    onRoomMemberTyping: function(ev, member) {
+        this.setState({
+            usersTyping: WhoIsTyping.usersTypingApartFromMeAndIgnored(this.props.room),
+        });
+    },
+
+    _renderTypingIndicatorAvatars: function(limit) {
+        let users = this.state.usersTyping;
+
+        let othersCount = 0;
+        if (users.length > limit) {
+            othersCount = users.length - limit + 1;
+            users = users.slice(0, limit - 1);
+        }
+
+        const avatars = users.map((u) => {
+            return (
+                <MemberAvatar
+                    key={u.userId}
+                    member={u}
+                    width={24}
+                    height={24}
+                    resizeMethod="crop"
+                />
+            );
+        });
+
+        if (othersCount > 0) {
+            avatars.push(
+                <span className="mx_WhoIsTypingTile_typingIndicatorRemaining" key="others">
+                    +{ othersCount }
+                </span>,
+            );
+        }
+
+        return avatars;
+    },
+
+    // return suitable content for the main (text) part of the status bar.
+    _getContent: function() {
+        const EmojiText = sdk.getComponent('elements.EmojiText');
+
+        const typingString = WhoIsTyping.whoIsTypingString(
+            this.state.usersTyping,
+            this.props.whoIsTypingLimit,
+        );
+        if (typingString) {
+            return (
+                <div className="mx_WhoIsTypingTile_typingBar">
+                    <EmojiText>{ typingString }</EmojiText>
+                </div>
+            );
+        }
+    },
+
+    render: function() {
+        // if (this.state.usersTyping.length === 0) {
+        //     return;
+        // }
+        return (
+            <div className="mx_WhoIsTypingTile">
+                <div className="mx_WhoIsTypingTile_indicator">
+                    <div className="mx_WhoIsTypingTile_typingIndicatorAvatars">
+                        { this._renderTypingIndicatorAvatars(this.props.whoIsTypingLimit) }
+                    </div>
+                </div>
+                <div role="alert">
+                    { this._getContent() }
+                </div>
+            </div>
+        );
+    },
+});