diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 33c09e1b16..be40957673 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -20,17 +20,14 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
-import { _t } from '../../languageHandler';
import sdk from '../../index';
import dis from '../../dispatcher';
import { MatrixClient } from 'matrix-js-sdk';
import RateLimitedFunc from '../../ratelimitedfunc';
-import AccessibleButton from '../../components/views/elements/AccessibleButton';
import { showGroupInviteDialog, showGroupAddRoomDialog } from '../../GroupAddressPicker';
import GroupStore from '../../stores/GroupStore';
export default class RightPanel extends React.Component {
-
static get propTypes() {
return {
roomId: React.PropTypes.string, // if showing panels for a given room, this is set
@@ -141,6 +138,8 @@ export default class RightPanel extends React.Component {
if (payload.action === "view_right_panel_phase") {
this.setState({
phase: payload.phase,
+ groupRoomId: payload.groupRoomId,
+ groupId: payload.groupId,
member: payload.member,
});
}
@@ -157,13 +156,6 @@ export default class RightPanel extends React.Component {
const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
const GroupRoomInfo = sdk.getComponent('groups.GroupRoomInfo');
- const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
- const isPhaseGroup = [
- RightPanel.Phase.GroupMemberInfo,
- RightPanel.Phase.GroupMemberList,
- ].includes(this.state.phase);
-
let panel =
;
if (this.props.roomId && this.state.phase === RightPanel.Phase.RoomMemberList) {
@@ -190,26 +182,6 @@ export default class RightPanel extends React.Component {
panel =
;
}
- // TODO: either include this in the DOM again, or move it to other component
- if (this.props.groupId && this.state.isUserPrivilegedInGroup) {
- // inviteGroup =
- isPhaseGroup ? (
-
-
-
-
- { _t('Invite to this community') }
-
- ) : (
-
-
-
-
- { _t('Add rooms to this community') }
-
- );
- }
-
const classes = classNames("mx_RightPanel", "mx_fadable", {
"collapsed": this.props.collapsed,
"mx_fadable_faded": this.props.disabled,
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index e494c216de..a9d95e4a52 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -30,7 +30,7 @@ export default React.createClass({
action: PropTypes.string.isRequired,
mouseOverAction: PropTypes.string,
label: PropTypes.string.isRequired,
- iconPath: PropTypes.string.isRequired,
+ iconPath: PropTypes.string,
},
getDefaultProps: function() {
@@ -72,6 +72,10 @@ export default React.createClass({
tooltip =
;
}
+ const icon = this.props.iconPath ?
+ (
) :
+ undefined;
+
return (
-
+ { icon }
{ tooltip }
);
diff --git a/src/components/views/elements/GroupsButton.js b/src/components/views/elements/GroupsButton.js
index 75dfe4e9ad..854670cb3f 100644
--- a/src/components/views/elements/GroupsButton.js
+++ b/src/components/views/elements/GroupsButton.js
@@ -24,7 +24,6 @@ const GroupsButton = function(props) {
return (
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 38c679a5b5..46653f1599 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -17,8 +17,13 @@ limitations under the License.
import React from 'react';
import { _t } from '../../../languageHandler';
import sdk from '../../../index';
+import dis from '../../../dispatcher';
import GroupStore from '../../../stores/GroupStore';
import PropTypes from 'prop-types';
+import { showGroupInviteDialog } from '../../../GroupAddressPicker';
+import AccessibleButton from '../elements/AccessibleButton';
+import TintableSvg from '../elements/TintableSvg';
+import RightPanel from '../../structures/RightPanel';
const INITIAL_LOAD_NUM_MEMBERS = 30;
@@ -135,6 +140,16 @@ export default React.createClass({
;
},
+ onInviteToGroupButtonClick() {
+ showGroupInviteDialog(this.props.groupId).then(() => {
+ dis.dispatch({
+ action: 'view_right_panel_phase',
+ phase: RightPanel.Phase.GroupMemberList,
+ groupId: this.props.groupId,
+ });
+ });
+ },
+
render: function() {
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
if (this.state.fetching || this.state.fetchingInvitedMembers) {
@@ -145,11 +160,9 @@ export default React.createClass({
}
const inputBox = (
-
+
);
const joined = this.state.members ?
@@ -162,13 +175,28 @@ export default React.createClass({
{ this.makeGroupMemberTiles(this.state.searchQuery, this.state.invitedMembers) }
:
;
+ let inviteButton;
+ if (GroupStore.isUserPrivileged(this.props.groupId)) {
+ inviteButton = (
+
+
+
+
+ { _t('Invite to this community') }
+ );
+ }
+
return (
- { inputBox }
+ { inviteButton }
{ joined }
{ invited }
+ { inputBox }
);
},
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index cfd2b806d4..81fcfa8c8b 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -18,6 +18,9 @@ import { _t } from '../../../languageHandler';
import sdk from '../../../index';
import GroupStore from '../../../stores/GroupStore';
import PropTypes from 'prop-types';
+import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
+import AccessibleButton from '../elements/AccessibleButton';
+import TintableSvg from '../elements/TintableSvg';
const INITIAL_LOAD_NUM_ROOMS = 30;
@@ -90,6 +93,12 @@ export default React.createClass({
this.setState({ searchQuery: ev.target.value });
},
+ onAddRoomToGroupButtonClick() {
+ showGroupAddRoomDialog(this.props.groupId).then(() => {
+ this.forceUpdate();
+ });
+ },
+
makeGroupRoomTiles: function(query) {
const GroupRoomTile = sdk.getComponent("groups.GroupRoomTile");
query = (query || "").toLowerCase();
@@ -120,25 +129,38 @@ export default React.createClass({
return null;
}
+ let inviteButton;
+ if (GroupStore.isUserPrivileged(this.props.groupId)) {
+ inviteButton = (
+
+
+
+
+ { _t('Add rooms to this community') }
+
+ );
+ }
const inputBox = (
-
+
);
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
const TruncatedList = sdk.getComponent("elements.TruncatedList");
return (
- { inputBox }
+ { inviteButton }
{ this.makeGroupRoomTiles(this.state.searchQuery) }
+ { inputBox }
);
},
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index 3cb0727928..af54787b2c 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -25,7 +25,6 @@ import HeaderButtons from './HeaderButtons';
import RightPanel from '../../structures/RightPanel';
export default class GroupHeaderButtons extends HeaderButtons {
-
constructor(props) {
super(props, RightPanel.Phase.GroupMemberList);
}
@@ -45,7 +44,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
} else if (payload.action === "view_group") {
this.setPhase(RightPanel.Phase.GroupMemberList);
} else if (payload.action === "view_group_room") {
- this.setPhase(RightPanel.Phase.GroupRoomInfo, {groupRoomId: payload.groupRoomId});
+ this.setPhase(RightPanel.Phase.GroupRoomInfo, {groupRoomId: payload.groupRoomId, groupId: payload.groupId});
} else if (payload.action === "view_group_room_list") {
this.setPhase(RightPanel.Phase.GroupRoomList);
} else if (payload.action === "view_group_member_list") {
@@ -71,7 +70,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
clickPhase={RightPanel.Phase.GroupMemberList}
analytics={['Right Panel', 'Group Member List Button', 'click']}
/>,
-
{
- this.resizer.forHandleWithId(id).resize(size);
+ const handle = this.resizer.forHandleWithId(id);
+ if (handle) {
+ handle.resize(size);
+ }
});
this.resizer.attach();
diff --git a/src/resizer/room.js b/src/resizer/room.js
index 70f8be219a..def12d49eb 100644
--- a/src/resizer/room.js
+++ b/src/resizer/room.js
@@ -38,6 +38,9 @@ class RoomSizer extends Sizer {
class RoomDistributor extends FixedDistributor {
resize(itemSize) {
const scrollItem = this.item.querySelector(".mx_RoomSubList_scroll");
+ if (!scrollItem) {
+ return; //FIXME: happens when starting the page on a community url, taking the safe way out for now
+ }
const fixedHeight = this.item.offsetHeight - scrollItem.offsetHeight;
if (itemSize > (fixedHeight + scrollItem.scrollHeight)) {
super.resize("resized-all");