This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initial implementation of FTUE user lists design
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR. Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be. Closes element-hq/element-web#11197
- Loading branch information
Showing
11 changed files
with
342 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| Copyright 2019, 2020 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_DMInviteDialog_addressBar { | ||
| display: flex; | ||
| flex-direction: row; | ||
|
|
||
| .mx_DMInviteDialog_editor { | ||
| flex: 1; | ||
| width: 100%; // Needed to make the Field inside grow | ||
| } | ||
|
|
||
| .mx_Field { | ||
| margin: 0; | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_goButton { | ||
| width: 48px; | ||
| margin-left: 10px; | ||
| } | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_section { | ||
| padding-bottom: 10px; | ||
|
|
||
| h3 { | ||
| font-size: 12px; | ||
| color: $muted-fg-color; | ||
| font-weight: bold; | ||
| text-transform: uppercase; | ||
| } | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_roomTile { | ||
| cursor: pointer; | ||
| padding: 5px 10px; | ||
|
|
||
| &:hover { | ||
| background-color: $user-tile-hover-bg-color; | ||
| border-radius: 4px; | ||
| } | ||
|
|
||
| * { | ||
| vertical-align: middle; | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_roomTile_name { | ||
| font-weight: 600; | ||
| font-size: 14px; | ||
| color: $primary-fg-color; | ||
| margin-left: 7px; | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_roomTile_userId { | ||
| font-size: 12px; | ||
| color: $muted-fg-color; | ||
| margin-left: 7px; | ||
| } | ||
|
|
||
| .mx_DMInviteDialog_roomTile_time { | ||
| text-align: right; | ||
| font-size: 12px; | ||
| color: $muted-fg-color; | ||
| float: right; | ||
| line-height: 36px; // Height of the avatar to keep the time vertically aligned | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,212 @@ | ||
| /* | ||
| Copyright 2019, 2020 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. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import {_t} from "../../../languageHandler"; | ||
| import sdk from "../../../index"; | ||
| import MatrixClientPeg from "../../../MatrixClientPeg"; | ||
| import {makeUserPermalink} from "../../../utils/permalinks/Permalinks"; | ||
| import DMRoomMap from "../../../utils/DMRoomMap"; | ||
| import {RoomMember} from "matrix-js-sdk/lib/matrix"; | ||
| import * as humanize from "humanize"; | ||
|
|
||
| // TODO: [TravisR] Make this generic for all kinds of invites | ||
|
|
||
| const INITIAL_ROOMS_SHOWN = 3; // Number of rooms to show at first | ||
| const INCREMENT_ROOMS_SHOWN = 5; // Number of rooms to add when 'show more' is clicked | ||
|
|
||
| class DMRoomTile extends React.Component { | ||
| static propTypes = { | ||
| member: PropTypes.object.isRequired, | ||
| lastActiveTs: PropTypes.number, | ||
| onToggle: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| constructor() { | ||
| super(); | ||
| } | ||
|
|
||
| _onClick = (e) => { | ||
| // Stop the browser from highlighting text | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
|
|
||
| this.props.onToggle(this.props.member.userId); | ||
| }; | ||
|
|
||
| render() { | ||
| const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar"); | ||
|
|
||
| let timestamp = null; | ||
| if (this.props.lastActiveTs) { | ||
| // TODO: [TravisR] Figure out how to i18n this | ||
| // `humanize` wants seconds for a timestamp, so divide by 1000 | ||
| const humanTs = humanize.relativeTime(this.props.lastActiveTs / 1000); | ||
| timestamp = <span className='mx_DMInviteDialog_roomTile_time'>{humanTs}</span>; | ||
| } | ||
|
|
||
| return ( | ||
| <div className='mx_DMInviteDialog_roomTile' onClick={this._onClick}> | ||
| <MemberAvatar member={this.props.member} width={36} height={36} /> | ||
| <span className='mx_DMInviteDialog_roomTile_name'>{this.props.member.name}</span> | ||
| <span className='mx_DMInviteDialog_roomTile_userId'>{this.props.member.userId}</span> | ||
| {timestamp} | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default class DMInviteDialog extends React.Component { | ||
| static propTypes = { | ||
| // Takes an array of user IDs/emails to invite. | ||
| onFinished: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| constructor() { | ||
| super(); | ||
|
|
||
| this.state = { | ||
| targets: [], // string[] of mxids/email addresses | ||
| filterText: "", | ||
| recents: this._buildRecents(), | ||
| numRecentsShown: INITIAL_ROOMS_SHOWN, | ||
| }; | ||
| } | ||
|
|
||
| _buildRecents(): {userId: string, user: RoomMember, lastActive: number} { | ||
| const rooms = DMRoomMap.shared().getUniqueRoomsWithIndividuals(); | ||
| const recents = []; | ||
| for (const userId in rooms) { | ||
| const room = rooms[userId]; | ||
| const member = room.getMember(userId); | ||
| if (!member) continue; // just skip people who don't have memberships for some reason | ||
|
|
||
| const lastEventTs = room.timeline && room.timeline.length ? room.timeline[room.timeline.length - 1].getTs() : 0; | ||
| if (!lastEventTs) continue; // something weird is going on with this room | ||
|
|
||
| recents.push({userId, user: member, lastActive: lastEventTs}); | ||
| } | ||
|
|
||
| // Sort the recents by last active to save us time later | ||
| recents.sort((a, b) => b.lastActive - a.lastActive); | ||
|
|
||
| return recents; | ||
| } | ||
|
|
||
| _startDm = () => { | ||
| this.props.onFinished(this.state.targets); | ||
| }; | ||
|
|
||
| _cancel = () => { | ||
| this.props.onFinished([]); | ||
| }; | ||
|
|
||
| _updateFilter = (e) => { | ||
| this.setState({filterText: e.target.value}); | ||
| }; | ||
|
|
||
| _showMoreRecents = () => { | ||
| this.setState({numRecentsShown: this.state.numRecentsShown + INCREMENT_ROOMS_SHOWN}); | ||
| }; | ||
|
|
||
| _toggleMember = (userId) => { | ||
| const targets = this.state.targets.map(t => t); // cheap clone for mutation | ||
| const idx = targets.indexOf(userId); | ||
| if (idx >= 0) targets.splice(idx, 1); | ||
| else targets.push(userId); | ||
| this.setState({targets}); | ||
| }; | ||
|
|
||
| _renderRecents() { | ||
| if (!this.state.recents || this.state.recents.length === 0) return null; | ||
|
|
||
| // .slice() will return an incomplete array but won't error on us if we go too far | ||
| const toRender = this.state.recents.slice(0, this.state.numRecentsShown); | ||
| const hasMore = toRender.length < this.state.recents.length; | ||
|
|
||
| const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); | ||
| let showMore = null; | ||
| if (hasMore) { | ||
| showMore = ( | ||
| <AccessibleButton onClick={this._showMoreRecents} kind="link"> | ||
| {_t("Show more")} | ||
| </AccessibleButton> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <div className='mx_DMInviteDialog_section'> | ||
| <h3>{_t("Recent Conversations")}</h3> | ||
| {toRender.map(r => <DMRoomTile member={r.user} lastActiveTs={r.lastActive} key={r.userId} onToggle={this._toggleMember} />)} | ||
| {showMore} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| render() { | ||
| const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); | ||
| const Field = sdk.getComponent("elements.Field"); | ||
| const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); | ||
|
|
||
| // Dev note: The use of Field is temporary/incomplete pending https://github.com/vector-im/riot-web/issues/11197 | ||
| // For now, we just list who the targets are. | ||
| const editor = ( | ||
| <div className='mx_DMInviteDialog_editor'> | ||
| <Field | ||
| id="inviteTargets" | ||
| value={this.state.filterText} | ||
| onChange={this._updateFilter} | ||
| placeholder="TODO: Implement filtering/searching (https://github.com/vector-im/riot-web/issues/11199)" | ||
| /> | ||
| </div> | ||
| ); | ||
| const targets = this.state.targets.map(t => <div key={t}>{t}</div>); | ||
|
|
||
| const userId = MatrixClientPeg.get().getUserId(); | ||
| return ( | ||
| <BaseDialog | ||
| className='mx_DMInviteDialog' | ||
| hasCancel={true} | ||
| onFinished={this._cancel} | ||
| title={_t("Direct Messages")} | ||
| > | ||
| <div className='mx_DMInviteDialog_content'> | ||
| <p> | ||
| {_t( | ||
| "If you can't find someone, ask them for their username, or share your " + | ||
| "username (%(userId)s) or <a>profile link</a>.", | ||
| {userId}, | ||
| {a: (sub) => <a href={makeUserPermalink(userId)} rel="noopener" target="_blank">{sub}</a>}, | ||
| )} | ||
| </p> | ||
| {targets} | ||
| <div className='mx_DMInviteDialog_addressBar'> | ||
| {editor} | ||
| <AccessibleButton | ||
| kind="primary" | ||
| onClick={this._startDm} | ||
| className='mx_DMInviteDialog_goButton' | ||
| > | ||
| {_t("Go")} | ||
| </AccessibleButton> | ||
| </div> | ||
| {this._renderRecents()} | ||
| </div> | ||
| </BaseDialog> | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.