Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Modify GroupView UI #1475

Merged
merged 6 commits into from
Oct 16, 2017
Merged

Modify GroupView UI #1475

merged 6 commits into from
Oct 16, 2017

Conversation

lukebarnard1
Copy link
Contributor

  • Remove featured users/rooms
  • Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
  • Make the group view body scrollable

 - Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
@@ -935,7 +967,12 @@ export default React.createClass({
{ rightButtons }
</div>
</div>
{ roomBody }
<ScrollPanel className="mx_GroupView_body"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScrollPanel might be overkill here as it's designed for timeline style infinite pagination things - in UserSettings we just put a GeminiScrollbar in, for instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that would make sense

onChange={this._onLongDescChange}
tabIndex="3"
/>
{ this._getFeaturedRoomsNode() }
{ this._getFeaturedUsersNode() }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So featured rooms / users are unused now? Should we remove the functions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't really justify keeping them. Although, we're going to need them Eventually...

const topic = linkifyString(sanitizeHtml(room.topic || ''));

const guestRead = room.world_readable ? (
<div className="mx_RoomDirectory_perm">{ _t('World readable') }</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this should share code with the public room directory, at least in the long term

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, in the long term. It was too entrenched in RoomDirectory so I decided not to do that yet.


return <tr key={room.room_id} onClick={this.onClick}>
<td className="mx_RoomDirectory_roomAvatar">
<BaseAvatar width={24} height={24} resizeMethod='crop'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RoomAvatar?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

room isn't actually a Room object here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, of course

<div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
{ perms }
<div className="mx_RoomDirectory_topic"
onClick={function(e) { e.stopPropagation(); }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's this for? (It's also making a new function on each render so will break react's DOM diffing)

@dbkr dbkr assigned lukebarnard1 and unassigned dbkr Oct 13, 2017
@@ -148,6 +148,7 @@ module.exports = React.createClass({
onFillRequest: function(backwards) { return Promise.resolve(false); },
onUnfillRequest: function(backwards, scrollToken) {},
onScroll: function() {},
onResize: function() {},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still useful to add? Seems like it might be

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh. I had left it in unintentionally. I think it is useful; things might not need to do anything if the SP changes size.

@lukebarnard1 lukebarnard1 assigned dbkr and unassigned lukebarnard1 Oct 16, 2017
@dbkr dbkr merged commit e4a3309 into develop Oct 16, 2017
lukebarnard1 pushed a commit to element-hq/element-web that referenced this pull request Oct 16, 2017
lukebarnard1 added a commit to element-hq/element-web that referenced this pull request Oct 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants