diff --git a/res/css/_components.scss b/res/css/_components.scss index 233c781d7f..03c2663af8 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -174,6 +174,7 @@ @import "./views/rooms/_SendMessageComposer.scss"; @import "./views/rooms/_Stickers.scss"; @import "./views/rooms/_TopUnreadMessagesBar.scss"; +@import "./views/rooms/_UserOnlineDot.scss"; @import "./views/rooms/_WhoIsTypingTile.scss"; @import "./views/settings/_AvatarSetting.scss"; @import "./views/settings/_CrossSigningPanel.scss"; diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index 2b181f366e..e5c7948216 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -62,14 +62,6 @@ limitations under the License. min-width: 0; } -.mx_RoomTile_online_dot { - border-radius: 50%; - background-color: $accent-color; - height: 5px; - width: 5px; - display: inline-block; -} - .mx_RoomTile_subtext { display: inline-block; font-size: 11px; diff --git a/res/css/views/rooms/_UserOnlineDot.scss b/res/css/views/rooms/_UserOnlineDot.scss new file mode 100644 index 0000000000..339e5cc48a --- /dev/null +++ b/res/css/views/rooms/_UserOnlineDot.scss @@ -0,0 +1,23 @@ +/* +Copyright 2019 The Matrix.org Foundation C.I.C. + +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_UserOnlineDot { + border-radius: 50%; + background-color: $accent-color; + height: 5px; + width: 5px; + display: inline-block; +} diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index cd5af61862..3f45b5b342 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -380,8 +380,8 @@ module.exports = createReactClass({ />; if (this.props.room.getMember(dmUserId).membership === "join") { - const RoomTileOnlineDot = sdk.getComponent('rooms.RoomTileOnlineDot'); - dmOnline = ; + const UserOnlineDot = sdk.getComponent('rooms.UserOnlineDot'); + dmOnline = ; } } diff --git a/src/components/views/rooms/RoomTileOnlineDot.js b/src/components/views/rooms/UserOnlineDot.js similarity index 89% rename from src/components/views/rooms/RoomTileOnlineDot.js rename to src/components/views/rooms/UserOnlineDot.js index a882aec613..426dd1bf64 100644 --- a/src/components/views/rooms/RoomTileOnlineDot.js +++ b/src/components/views/rooms/UserOnlineDot.js @@ -20,7 +20,7 @@ import PropTypes from "prop-types"; import {useEventEmitter} from "../../../hooks/useEventEmitter"; import MatrixClientContext from "../../../contexts/MatrixClientContext"; -const RoomTileOnlineDot = ({userId}) => { +const UserOnlineDot = ({userId}) => { const cli = useContext(MatrixClientContext); const user = useMemo(() => cli.getUser(userId), [cli, userId]); @@ -38,11 +38,11 @@ const RoomTileOnlineDot = ({userId}) => { useEventEmitter(user, "User.currentlyActive", currentlyActiveHandler); useEventEmitter(user, "User.presence", currentlyActiveHandler); - return isOnline ? : null; + return isOnline ? : null; }; -RoomTileOnlineDot.propTypes = { +UserOnlineDot.propTypes = { userId: PropTypes.string.isRequired, }; -export default RoomTileOnlineDot; +export default UserOnlineDot;