{ FormattingUtils.formatCount(subListNotifCount) }
;
- } else if (this.props.isInvite) {
+ } else if (this.props.isInvite && this.props.list.length) {
// no notifications but highlight anyway because this is an invite badge
- badge = !
;
+ badge = {this.props.list.length}
;
}
}
@@ -287,8 +287,8 @@ const RoomSubList = React.createClass({
if (len) {
const chevronClasses = classNames({
'mx_RoomSubList_chevron': true,
- 'mx_RoomSubList_chevronRight': this.state.hidden,
- 'mx_RoomSubList_chevronDown': !this.state.hidden,
+ 'mx_RoomSubList_chevronRight': isCollapsed,
+ 'mx_RoomSubList_chevronDown': !isCollapsed,
});
chevron = ();
}
@@ -321,21 +321,23 @@ const RoomSubList = React.createClass({
render: function() {
const len = this.props.list.length + this.props.extraTiles.length;
+ const isCollapsed = this.state.hidden && !this.props.forceExpand;
if (len) {
const subListClasses = classNames({
"mx_RoomSubList": true,
- "mx_RoomSubList_hidden": this.state.hidden,
- "mx_RoomSubList_nonEmpty": len && !this.state.hidden,
+ "mx_RoomSubList_hidden": isCollapsed,
+ "mx_RoomSubList_nonEmpty": len && !isCollapsed,
});
- if (this.state.hidden) {
+
+ if (isCollapsed) {
return
- {this._getHeaderJsx()}
+ {this._getHeaderJsx(isCollapsed)}
;
} else {
const tiles = this.makeRoomTiles();
tiles.push(...this.props.extraTiles);
return
- {this._getHeaderJsx()}
+ {this._getHeaderJsx(isCollapsed)}
{ tiles }
@@ -344,13 +346,13 @@ const RoomSubList = React.createClass({
} else {
const Loader = sdk.getComponent("elements.Spinner");
let content;
- if (this.props.showSpinner && !this.state.hidden) {
+ if (this.props.showSpinner && !isCollapsed) {
content =
- { this._getHeaderJsx() }
+ { this._getHeaderJsx(isCollapsed) }
{ content }
);
diff --git a/src/components/structures/TopLeftMenuButton.js b/src/components/structures/TopLeftMenuButton.js
index 592b64634f..601fb2e654 100644
--- a/src/components/structures/TopLeftMenuButton.js
+++ b/src/components/structures/TopLeftMenuButton.js
@@ -22,6 +22,7 @@ import AccessibleButton from '../views/elements/AccessibleButton';
import BaseAvatar from '../views/avatars/BaseAvatar';
import MatrixClientPeg from '../../MatrixClientPeg';
import Avatar from '../../Avatar';
+import { _t } from '../../languageHandler';
const AVATAR_SIZE = 28;
@@ -70,7 +71,14 @@ export default class TopLeftMenuButton extends React.Component {
render() {
const fallbackUserId = MatrixClientPeg.get().getUserId();
const profileInfo = this.state.profileInfo;
- const name = profileInfo ? profileInfo.name : fallbackUserId;
+ let name;
+ if (MatrixClientPeg.get().isGuest()) {
+ name = _t("Guest");
+ } else if (profileInfo) {
+ name = profileInfo.name;
+ } else {
+ name = fallbackUserId;
+ }
let nameElement;
if (!this.props.collapsed) {
nameElement =
diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
index b8e82a92e4..87b277215b 100644
--- a/src/components/views/context_menus/TopLeftMenu.js
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -30,10 +30,10 @@ export class TopLeftMenu extends React.Component {
render() {
return
;
}
diff --git a/src/components/views/dialogs/RoomSettingsDialog.js b/src/components/views/dialogs/RoomSettingsDialog.js
index ce834d564e..99e73fb2e0 100644
--- a/src/components/views/dialogs/RoomSettingsDialog.js
+++ b/src/components/views/dialogs/RoomSettingsDialog.js
@@ -20,6 +20,7 @@ import {Tab, TabbedView} from "../../structures/TabbedView";
import {_t, _td} from "../../../languageHandler";
import AccessibleButton from "../elements/AccessibleButton";
import dis from '../../../dispatcher';
+import GeneralRoomSettingsTab from "../settings/tabs/GeneralRoomSettingsTab";
// TODO: Ditch this whole component
export class TempTab extends React.Component {
@@ -37,18 +38,32 @@ export class TempTab extends React.Component {
}
}
-export default class UserSettingsDialog extends React.Component {
+export default class RoomSettingsDialog extends React.Component {
static propTypes = {
+ roomId: PropTypes.string.isRequired,
onFinished: PropTypes.func.isRequired,
};
+ componentWillMount(): void {
+ this.dispatcherRef = dis.register(this._onAction);
+ }
+
+ componentWillUnmount(): void {
+ dis.unregister(this.dispatcherRef);
+ }
+
+ _onAction = (payload) => {
+ if (payload.action !== 'close_room_settings') return;
+ this.props.onFinished();
+ };
+
_getTabs() {
const tabs = [];
tabs.push(new Tab(
_td("General"),
"mx_RoomSettingsDialog_settingsIcon",
-
-
-
- {_t("Settings")} +
- {_t("Settings")}
-
-
- {_t("Sign out")} +
- {_t("Sign out")}
General Test
,
+
-
{ _t('Addresses') }
-
- { _t('The main address for this room is') }: { canonical_alias_section }
-
+
+ {canonical_alias_section}
- {
+ e.stopPropagation();
+ e.preventDefault();
+
+ this.refs.avatarUpload.click();
+ };
+
+ _saveProfile = async (e) => {
+ e.stopPropagation();
+ e.preventDefault();
+
+ if (!this.state.enableProfileSave) return;
+ this.setState({enableProfileSave: false});
+
+ const client = MatrixClientPeg.get();
+ const newState = {};
+
+ // TODO: What do we do about errors?
+
+ if (this.state.originalDisplayName !== this.state.displayName) {
+ await client.setRoomName(this.props.roomId, this.state.displayName);
+ newState.originalDisplayName = this.state.displayName;
+ }
+
+ if (this.state.avatarFile) {
+ const uri = await client.uploadContent(this.state.avatarFile);
+ await client.sendStateEvent(this.props.roomId, 'm.room.avatar', {url: uri}, '');
+ newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
+ newState.originalAvatarUrl = newState.avatarUrl;
+ newState.avatarFile = null;
+ }
+
+ if (this.state.originalTopic !== this.state.topic) {
+ await client.setRoomTopic(this.props.roomId, this.state.topic);
+ newState.originalTopic = this.state.topic;
+ }
+
+ newState.enableProfileSave = true;
+ this.setState(newState);
+ };
+
+ _onDisplayNameChanged = (e) => {
+ this.setState({
+ displayName: e.target.value,
+ enableProfileSave: true,
+ });
+ };
+
+ _onTopicChanged = (e) => {
+ this.setState({
+ topic: e.target.value,
+ enableProfileSave: true,
+ });
+ };
+
+ _onAvatarChanged = (e) => {
+ if (!e.target.files || !e.target.files.length) {
+ this.setState({
+ avatarUrl: this.state.originalAvatarUrl,
+ avatarFile: null,
+ enableProfileSave: false,
+ });
+ return;
+ }
+
+ const file = e.target.files[0];
+ const reader = new FileReader();
+ reader.onload = (ev) => {
+ this.setState({
+ avatarUrl: ev.target.result,
+ avatarFile: file,
+ enableProfileSave: true,
+ });
+ };
+ reader.readAsDataURL(file);
+ };
+
+ render() {
+ // TODO: Why is rendering a box with an overlay so complicated? Can the DOM be reduced?
+
+ let showOverlayAnyways = true;
+ let avatarElement = ;
+ if (this.state.avatarUrl) {
+ showOverlayAnyways = false;
+ avatarElement = 
;
+ }
+
+ const avatarOverlayClasses = classNames({
+ "mx_ProfileSettings_avatarOverlay": true,
+ "mx_ProfileSettings_avatarOverlay_show": showOverlayAnyways,
+ });
+ let avatarHoverElement = (
+
{ _t('Flair') }
+ {_t("Upload room avatar")}
+
+ );
+ if (!this.state.canSetAvatar) {
+ if (!showOverlayAnyways) {
+ avatarHoverElement = null;
+ } else {
+ const disabledOverlayClasses = classNames({
+ "mx_ProfileSettings_avatarOverlay": true,
+ "mx_ProfileSettings_avatarOverlay_show": true,
+ "mx_ProfileSettings_avatarOverlay_disabled": true,
+ });
+ avatarHoverElement = (
+
+
+
+
+ {_t("No room avatar")}
+
+ );
+ }
+ }
+
+ return (
+
+ );
+ }
+}
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index fe2a2bacf4..1662692164 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -1,7 +1,7 @@
/*
Copyright 2016 OpenMarket Ltd
Copyright 2017 Travis Ralston
-Copyright 2018 New Vector Ltd
+Copyright 2018-2019 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.
@@ -16,12 +16,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-import {MatrixClient} from "matrix-js-sdk";
const React = require('react');
import PropTypes from 'prop-types';
const sdk = require("../../../index");
import { _t, _td } from '../../../languageHandler';
import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import dis from "../../../dispatcher";
+import MatrixClientPeg from "../../../MatrixClientPeg";
module.exports = React.createClass({
@@ -31,21 +32,16 @@ module.exports = React.createClass({
room: PropTypes.object,
},
- contextTypes: {
- matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
- },
-
- saveSettings: function() {
- const promises = [];
- if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
- if (this.refs.urlPreviewsSelf) promises.push(this.refs.urlPreviewsSelf.save());
- return promises;
+ _onClickUserSettings: (e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ dis.dispatch({action: 'view_user_settings'});
},
render: function() {
const SettingsFlag = sdk.getComponent("elements.SettingsFlag");
const roomId = this.props.room.roomId;
- const isEncrypted = this.context.matrixClient.isRoomEncrypted(roomId);
+ const isEncrypted = MatrixClientPeg.get().isRoomEncrypted(roomId);
let previewsForAccount = null;
let previewsForRoom = null;
@@ -56,13 +52,13 @@ module.exports = React.createClass({
if (accountEnabled) {
previewsForAccount = (
_t("You have enabled URL previews by default.", {}, {
- 'a': (sub)=>{ sub },
+ 'a': (sub)=>{ sub },
})
);
} else if (accountEnabled) {
previewsForAccount = (
_t("You have disabled URL previews by default.", {}, {
- 'a': (sub)=>{ sub },
+ 'a': (sub)=>{ sub },
})
);
}
@@ -73,9 +69,7 @@ module.exports = React.createClass({
-
{ _t("URL Previews") }
-
+
+
{ _t('When someone puts a URL in their message, a URL preview can be shown to give more ' +
'information about that link such as the title, description, and an image from the website.') }
-
+ {
+ // TODO: Live modification?
+ if (!this.refs.aliasSettings) return;
+ this.refs.aliasSettings.saveSettings();
+ };
+
+ _saveGroups = (e) => {
+ // TODO: Live modification?
+ if (!this.refs.flairSettings) return;
+ this.refs.flairSettings.saveSettings();
+ };
+
+ _onLeaveClick = () => {
+ dis.dispatch({
+ action: 'leave_room',
+ room_id: this.props.roomId,
+ });
+ };
+
+ render() {
+ const AliasSettings = sdk.getComponent("room_settings.AliasSettings");
+ const RelatedGroupSettings = sdk.getComponent("room_settings.RelatedGroupSettings");
+ const UrlPreviewSettings = sdk.getComponent("room_settings.UrlPreviewSettings");
+
+ const client = MatrixClientPeg.get();
+ const room = client.getRoom(this.props.roomId);
+
+ const canSetAliases = true; // Previously, we arbitrarily only allowed admins to do this
+ const canSetCanonical = room.currentState.mayClientSendStateEvent("m.room.canonical_alias", client);
+ const canonicalAliasEv = room.currentState.getStateEvents("m.room.canonical_alias", '');
+ const aliasEvents = room.currentState.getStateEvents("m.room.aliases");
+
+ const canChangeGroups = room.currentState.mayClientSendStateEvent("m.room.related_groups", client);
+ const groupsEvent = room.currentState.getStateEvents("m.room.related_groups", "");
+
+ return (
+
+
{ previewsForAccount }
{ previewsForRoom }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f61ce8d594..bbfc4649d2 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -82,7 +82,11 @@ module.exports = React.createClass({
this.collapsedState = collapsedJson ? JSON.parse(collapsedJson) : {};
this._layoutSections = [];
- this._layout = new Layout((key, size) => {
+ const unfilteredOptions = {
+ allowWhitespace: false,
+ handleHeight: 1,
+ };
+ this._unfilteredlayout = new Layout((key, size) => {
const subList = this._subListRefs[key];
if (subList) {
subList.setHeight(size);
@@ -95,7 +99,19 @@ module.exports = React.createClass({
window.localStorage.setItem("mx_roomlist_sizes",
JSON.stringify(this.subListSizes));
}
- }, this.subListSizes, this.collapsedState);
+ }, this.subListSizes, this.collapsedState, unfilteredOptions);
+
+ this._filteredLayout = new Layout((key, size) => {
+ const subList = this._subListRefs[key];
+ if (subList) {
+ subList.setHeight(size);
+ }
+ }, null, null, {
+ allowWhitespace: false,
+ handleHeight: 0,
+ });
+
+ this._layout = this._unfilteredlayout;
return {
isLoadingLeftRooms: false,
@@ -187,15 +203,21 @@ module.exports = React.createClass({
},
componentDidUpdate: function(prevProps) {
+ let forceLayoutUpdate = false;
this._repositionIncomingCallBox(undefined, false);
- // if (this.props.searchFilter !== prevProps.searchFilter) {
- // this._checkSubListsOverflow();
- // }
+ if (!this.props.searchFilter && prevProps.searchFilter) {
+ this._layout = this._unfilteredlayout;
+ forceLayoutUpdate = true;
+ } else if (this.props.searchFilter && !prevProps.searchFilter) {
+ this._layout = this._filteredLayout;
+ forceLayoutUpdate = true;
+ }
this._layout.update(
this._layoutSections,
this.resizeContainer && this.resizeContainer.clientHeight,
+ forceLayoutUpdate,
);
- // TODO: call layout.setAvailableHeight, window height was changed when bannerShown prop was changed
+ this._checkSubListsOverflow();
},
onAction: function(payload) {
@@ -617,7 +639,7 @@ module.exports = React.createClass({
onHeaderClick(collapsed);
}
};
- const startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
+ let startAsHidden = props.startAsHidden || this.collapsedState[chosenKey];
this._layoutSections.push({
id: chosenKey,
count: len,
@@ -625,6 +647,7 @@ module.exports = React.createClass({
let subList = (
+
+ );
+ }
+}
diff --git a/src/components/views/settings/tabs/GeneralSettingsTab.js b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
similarity index 86%
rename from src/components/views/settings/tabs/GeneralSettingsTab.js
rename to src/components/views/settings/tabs/GeneralUserSettingsTab.js
index c3ad55cc7b..a504953cab 100644
--- a/src/components/views/settings/tabs/GeneralSettingsTab.js
+++ b/src/components/views/settings/tabs/GeneralUserSettingsTab.js
@@ -16,6 +16,11 @@ limitations under the License.
import React from 'react';
import {_t} from "../../../../languageHandler";
+import MatrixClientPeg from "../../../../MatrixClientPeg";
+import GroupUserSettings from "../../groups/GroupUserSettings";
+import PropTypes from "prop-types";
+import {MatrixClient} from "matrix-js-sdk";
+import { DragDropContext } from 'react-beautiful-dnd';
import ProfileSettings from "../ProfileSettings";
import EmailAddresses from "../EmailAddresses";
import PhoneNumbers from "../PhoneNumbers";
@@ -31,7 +36,11 @@ const sdk = require('../../../../index');
const Modal = require("../../../../Modal");
const dis = require("../../../../dispatcher");
-export default class GeneralSettingsTab extends React.Component {
+export default class GeneralUserSettingsTab extends React.Component {
+ static childContextTypes = {
+ matrixClient: PropTypes.instanceOf(MatrixClient),
+ };
+
constructor() {
super();
@@ -41,6 +50,12 @@ export default class GeneralSettingsTab extends React.Component {
};
}
+ getChildContext() {
+ return {
+ matrixClient: MatrixClientPeg.get(),
+ };
+ }
+
_onLanguageChange = (newLanguage) => {
if (this.state.language === newLanguage) return;
@@ -95,6 +110,11 @@ export default class GeneralSettingsTab extends React.Component {
{_t("General")}
+
+
+
+ {_t("Room Addresses")}
+
+
+ {_t("Save")}
+
+
+
+ {_t("Flair")}
+
+
+ {_t("Save")}
+
+
+
+ {_t("URL Previews")}
+
+
+
+ {_t("Leave room")}
+
+
+ { _t('Leave room') }
+
+
+
{_t("Profile")}
+
);
}
@@ -103,7 +123,7 @@ export default class GeneralSettingsTab extends React.Component {
const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
const passwordChangeForm = (
{_t("Account")}
{_t("Set a new account password...")} @@ -132,7 +152,7 @@ export default class GeneralSettingsTab extends React.Component { return (
{_t("Language and region")}
-
);
@@ -142,7 +162,7 @@ export default class GeneralSettingsTab extends React.Component {
// TODO: Re-enable theme selection once the themes actually work
const SettingsFlag = sdk.getComponent("views.elements.SettingsFlag");
return (
-
+
{_t("Theme")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9300537051..60f3c855dd 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -431,6 +431,9 @@
"Display Name": "Display Name",
"Save": "Save",
"Flair": "Flair",
+ "General": "General",
+ "Room Addresses": "Room Addresses",
+ "URL Previews": "URL Previews",
"Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
"Success": "Success",
"Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
@@ -448,7 +451,6 @@
"Account management": "Account management",
"Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
"Close Account": "Close Account",
- "General": "General",
"Legal": "Legal",
"For help with using Riot, click here.": "For help with using Riot, click here.",
"For help with using Riot, click here or start a chat with our bot using the button below.": "For help with using Riot, click here or start a chat with our bot using the button below.",
@@ -760,11 +762,10 @@
"'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
"Invalid address format": "Invalid address format",
"'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+ "Main address": "Main address",
"not specified": "not specified",
"not set": "not set",
"Remote addresses for this room:": "Remote addresses for this room:",
- "Addresses": "Addresses",
- "The main address for this room is": "The main address for this room is",
"Local addresses for this room:": "Local addresses for this room:",
"This room has no local addresses": "This room has no local addresses",
"New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
@@ -773,12 +774,16 @@
"Showing flair for these communities:": "Showing flair for these communities:",
"This room is not showing flair for any communities": "This room is not showing flair for any communities",
"New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+ "Room avatar": "Room avatar",
+ "Upload room avatar": "Upload room avatar",
+ "No room avatar": "No room avatar",
+ "Room Name": "Room Name",
+ "Room Topic": "Room Topic",
"You have enabled URL previews by default.": "You have enabled URL previews by default.",
"You have disabled URL previews by default.": "You have disabled URL previews by default.",
"URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
"URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
"In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.": "In encrypted rooms, like this one, URL previews are disabled by default to ensure that your homeserver (where the previews are generated) cannot gather information about links you see in this room.",
- "URL Previews": "URL Previews",
"When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.": "When someone puts a URL in their message, a URL preview can be shown to give more information about that link such as the title, description, and an image from the website.",
"Members": "Members",
"Files": "Files",
@@ -1332,6 +1337,7 @@
"Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.",
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Tried to load a specific point in this room's timeline, but was unable to find it.",
"Failed to load timeline position": "Failed to load timeline position",
+ "Guest": "Guest",
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
"Uploading %(filename)s and %(count)s others|zero": "Uploading %(filename)s",
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
diff --git a/src/resizer/distributors/roomsublist2.js b/src/resizer/distributors/roomsublist2.js
index d6bf8d6c7a..e70e6893c6 100644
--- a/src/resizer/distributors/roomsublist2.js
+++ b/src/resizer/distributors/roomsublist2.js
@@ -16,9 +16,6 @@ limitations under the License.
import FixedDistributor from "./fixed";
-// const allowWhitespace = true;
-const handleHeight = 1;
-
function clamp(height, min, max) {
if (height > max) return max;
if (height < min) return min;
@@ -26,7 +23,7 @@ function clamp(height, min, max) {
}
export class Layout {
- constructor(applyHeight, initialSizes, collapsedState) {
+ constructor(applyHeight, initialSizes, collapsedState, options) {
// callback to set height of section
this._applyHeight = applyHeight;
// list of {id, count} objects,
@@ -41,6 +38,17 @@ export class Layout {
this._sectionHeights = Object.assign({}, initialSizes);
// in-progress heights, while dragging. Committed on mouse-up.
this._heights = [];
+ // use while manually resizing to cancel
+ // the resize for a given mouse position
+ // when the previous resize made the layout
+ // constrained
+ this._clampedOffset = 0;
+ // used while manually resizing, to clear
+ // _clampedOffset when the direction of resizing changes
+ this._lastOffset = 0;
+
+ this._allowWhitespace = options && options.allowWhitespace;
+ this._handleHeight = (options && options.handleHeight) || 0;
}
setAvailableHeight(newSize) {
@@ -60,7 +68,7 @@ export class Layout {
this._applyNewSize();
}
- update(sections, availableHeight) {
+ update(sections, availableHeight, force = false) {
let heightChanged = false;
if (Number.isFinite(availableHeight) && availableHeight !== this._availableHeight) {
@@ -75,7 +83,7 @@ export class Layout {
return a.id !== b.id || a.count !== b.count;
});
- if (!heightChanged && !sectionsChanged) {
+ if (!heightChanged && !sectionsChanged && !force) {
return;
}
@@ -104,7 +112,7 @@ export class Layout {
const collapsed = this._collapsedState[section.id];
return count + (collapsed ? 0 : 1);
}, 0);
- return this._availableHeight - ((nonCollapsedSectionCount - 1) * handleHeight);
+ return this._availableHeight - ((nonCollapsedSectionCount - 1) * this._handleHeight);
}
_applyNewSize() {
@@ -130,9 +138,10 @@ export class Layout {
if (collapsed) {
return this._sectionHeight(0);
+ } else if (!this._allowWhitespace) {
+ return this._sectionHeight(section.count);
} else {
return 100000;
- // return this._sectionHeight(section.count);
}
}
@@ -268,6 +277,22 @@ export class Layout {
this._sectionHeights[section.id] = this._heights[i];
});
}
+
+ _setUncommittedSectionHeight(sectionIndex, offset) {
+ if (Math.sign(offset) != Math.sign(this._lastOffset)) {
+ this._clampedOffset = undefined;
+ }
+ if (this._clampedOffset !== undefined) {
+ if (offset < 0 && offset < this._clampedOffset) {
+ return;
+ }
+ if (offset > 0 && offset > this._clampedOffset) {
+ return;
+ }
+ }
+ this._clampedOffset = this._relayout(sectionIndex, offset);
+ this._lastOffset = offset;
+ }
}
class Handle {
@@ -278,7 +303,10 @@ class Handle {
}
setHeight(height) {
- this._layout._relayout(this._sectionIndex, height - this._initialHeight);
+ this._layout._setUncommittedSectionHeight(
+ this._sectionIndex,
+ height - this._initialHeight,
+ );
return this;
}
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 036a7c04fc..ba78e7687f 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -122,7 +122,9 @@ class RoomViewStore extends Store {
case 'open_room_settings':
if (SettingsStore.isFeatureEnabled("feature_tabbed_settings")) {
const RoomSettingsDialog = sdk.getComponent("dialogs.RoomSettingsDialog");
- Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {}, 'mx_SettingsDialog');
+ Modal.createTrackedDialog('Room settings', '', RoomSettingsDialog, {
+ roomId: this._state.roomId,
+ }, 'mx_SettingsDialog');
} else {
this._setState({
isEditingSettings: true,
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 3bccdcf825..dd91e812bc 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -1,191 +1,192 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import expect from 'expect';
-import jest from 'jest-mock';
-import Promise from 'bluebird';
-import * as testUtils from '../../../test-utils';
-import sdk from 'matrix-react-sdk';
-const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
-import MatrixClientPeg from '../../../../src/MatrixClientPeg';
-import SettingsStore from '../../../../src/settings/SettingsStore';
-
-
-describe('RoomSettings', () => {
- let parentDiv = null;
- let sandbox = null;
- let client = null;
- let roomSettings = null;
- const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
-
- function expectSentStateEvent(roomId, eventType, expectedEventContent) {
- let found = false;
- for (const call of client.sendStateEvent.mock.calls) {
- const [
- actualRoomId,
- actualEventType,
- actualEventContent,
- ] = call.slice(0, 3);
-
- if (roomId === actualRoomId && actualEventType === eventType) {
- expect(actualEventContent).toEqual(expectedEventContent);
- found = true;
- break;
- }
- }
- expect(found).toBe(true);
- }
-
- beforeEach(function(done) {
- testUtils.beforeEach(this);
- sandbox = testUtils.stubClient();
- client = MatrixClientPeg.get();
- client.credentials = {userId: '@me:domain.com'};
-
- client.setRoomName = jest.fn().mockReturnValue(Promise.resolve());
- client.setRoomTopic = jest.fn().mockReturnValue(Promise.resolve());
- client.setRoomDirectoryVisibility = jest.fn().mockReturnValue(Promise.resolve());
-
- // Covers any room state event (e.g. name, avatar, topic)
- client.sendStateEvent = jest.fn().mockReturnValue(Promise.resolve());
-
- // Covers room tagging
- client.setRoomTag = jest.fn().mockReturnValue(Promise.resolve());
- client.deleteRoomTag = jest.fn().mockReturnValue(Promise.resolve());
-
- // Covers any setting in the SettingsStore
- // (including local client settings not stored via matrix)
- SettingsStore.setValue = jest.fn().mockReturnValue(Promise.resolve());
-
- parentDiv = document.createElement('div');
- document.body.appendChild(parentDiv);
-
- const gatherWrappedRef = (r) => {roomSettings = r;};
-
- // get use wrappedRef because we're using wrapInMatrixClientContext
- ReactDOM.render(
-