{ _t( @@ -93,7 +92,7 @@ export default createReactClass({
{ groupNodes }
- :
+ :
{ _t(
"You're not currently a member of any communities.",
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 6310efffb9..664aaaf21f 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -28,6 +28,7 @@ import { _t } from '../../languageHandler';
import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
import Analytics from '../../Analytics';
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
+import {ALL_ROOMS} from "../views/directory/NetworkDropdown";
const MAX_NAME_LENGTH = 80;
const MAX_TOPIC_LENGTH = 160;
@@ -40,25 +41,17 @@ export default createReactClass({
displayName: 'RoomDirectory',
propTypes: {
- config: PropTypes.object,
onFinished: PropTypes.func.isRequired,
},
- getDefaultProps: function() {
- return {
- config: {},
- };
- },
-
getInitialState: function() {
return {
publicRooms: [],
loading: true,
protocolsLoading: true,
error: null,
- instanceId: null,
- includeAll: false,
- roomServer: null,
+ instanceId: undefined,
+ roomServer: MatrixClientPeg.getHomeserverName(),
filterString: null,
};
},
@@ -98,6 +91,10 @@ export default createReactClass({
});
},
+ componentDidMount: function() {
+ this.refreshRoomList();
+ },
+
componentWillUnmount: function() {
if (this.filterTimeout) {
clearTimeout(this.filterTimeout);
@@ -130,10 +127,10 @@ export default createReactClass({
if (my_server != MatrixClientPeg.getHomeserverName()) {
opts.server = my_server;
}
- if (this.state.instanceId) {
- opts.third_party_instance_id = this.state.instanceId;
- } else if (this.state.includeAll) {
+ if (this.state.instanceId === ALL_ROOMS) {
opts.include_all_networks = true;
+ } else if (this.state.instanceId) {
+ opts.third_party_instance_id = this.state.instanceId;
}
if (this.nextBatch) opts.since = this.nextBatch;
if (my_filter_string) opts.filter = { generic_search_term: my_filter_string };
@@ -247,7 +244,7 @@ export default createReactClass({
}
},
- onOptionChange: function(server, instanceId, includeAll) {
+ onOptionChange: function(server, instanceId) {
// clear next batch so we don't try to load more rooms
this.nextBatch = null;
this.setState({
@@ -257,7 +254,6 @@ export default createReactClass({
publicRooms: [],
roomServer: server,
instanceId: instanceId,
- includeAll: includeAll,
error: null,
}, this.refreshRoomList);
// We also refresh the room list each time even though this
@@ -305,7 +301,7 @@ export default createReactClass({
onJoinFromSearchClick: function(alias) {
// If we don't have a particular instance id selected, just show that rooms alias
- if (!this.state.instanceId) {
+ if (!this.state.instanceId || this.state.instanceId === ALL_ROOMS) {
// If the user specified an alias without a domain, add on whichever server is selected
// in the dropdown
if (alias.indexOf(':') == -1) {
@@ -593,7 +589,7 @@ export default createReactClass({
}
let placeholder = _t('Find a room…');
- if (!this.state.instanceId) {
+ if (!this.state.instanceId || this.state.instanceId === ALL_ROOMS) {
placeholder = _t("Find a room… (e.g. %(exampleRoom)s)", {exampleRoom: "#example:" + this.state.roomServer});
} else if (instance_expected_field_type) {
placeholder = instance_expected_field_type.placeholder;
@@ -610,10 +606,18 @@ export default createReactClass({
listHeader =
-
);
},
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index d58961f964..69ebb72a6f 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -122,7 +122,6 @@ export default createReactClass({
},
render: function() {
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
if (this.props.devices === null) {
const Spinner = sdk.getComponent("elements.Spinner");
return
+
+ { desc }
+ );
+ });
+ });
- _makeMenuOption(server, instance, includeAll, handleClicks) {
- if (handleClicks === undefined) handleClicks = true;
+ let subtitle;
+ if (server === hsName) {
+ subtitle = (
+ ![]({require("../../../../res/img/network-matrix.svg")})
;
- } else {
- key = server + '_inst_' + instance.instance_id;
- const imgUrl = instance.icon ?
- MatrixClientPeg.get().mxcUrlToHttp(instance.icon, 25, 25, 'crop', true) :
- DEFAULT_ICON_URL;
- icon = 
;
- name = instance.desc;
- }
+ const [ok] = await finished;
+ if (!ok) return;
- const clickHandler = handleClicks ? this.onMenuOptionClick.bind(this, server, instance, includeAll) : null;
+ // delete from setting
+ setUserDefinedServers(servers.filter(s => s !== server));
- return
+
+ {_t("Matrix")}
+
+ { entries }
+
);
+ });
+
+ const onClick = async () => {
+ closeMenu();
+ const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
+ const { finished } = Modal.createTrackedDialog("Network Dropdown", "Add a new server", TextInputDialog, {
+ title: _t("Add a new server"),
+ description: _t("Enter the name of a new server you want to explore."),
+ button: _t("Add"),
+ hasCancel: false,
+ placeholder: _t("Server name"),
+ validator: validServer,
+ fixedWidth: false,
+ }, "mx_NetworkDropdown_dialog");
+
+ const [ok, newServer] = await finished;
+ if (!ok) return;
+
+ if (!userDefinedServers.includes(newServer)) {
+ setUserDefinedServers([...userDefinedServers, newServer]);
+ }
+
+ onOptionChange(newServer); // change filter to the new server
+ };
+
+ const buttonRect = handle.current.getBoundingClientRect();
+ content =
+ ;
+ } else {
+ let currentValue;
+ if (selectedInstanceId === ALL_ROOMS) {
+ currentValue = _t("All rooms");
+ } else if (selectedInstanceId) {
+ const instance = instanceForInstanceId(protocols, selectedInstanceId);
+ currentValue = _t("%(networkName)s rooms", {
+ networkName: instance.desc,
+ });
+ } else {
+ currentValue = _t("Matrix rooms");
}
- return
- { props.children }
- ;
-}
-export default GeminiScrollbarWrapper;
-
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index e659352b74..f70c769ad7 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -27,6 +27,7 @@ import { GroupMemberType } from '../../../groups';
import GroupStore from '../../../stores/GroupStore';
import AccessibleButton from '../elements/AccessibleButton';
import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
export default createReactClass({
displayName: 'GroupMemberInfo',
@@ -182,10 +183,9 @@ export default createReactClass({
this.props.groupMember.displayname || this.props.groupMember.userId
);
- const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
return (
+
);
},
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 05af70b266..2853e70afa 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -26,6 +26,7 @@ import { showGroupInviteDialog } from '../../../GroupAddressPicker';
import AccessibleButton from '../elements/AccessibleButton';
import TintableSvg from '../elements/TintableSvg';
import {RIGHT_PANEL_PHASES} from "../../../stores/RightPanelStorePhases";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
const INITIAL_LOAD_NUM_MEMBERS = 30;
@@ -172,7 +173,6 @@ export default createReactClass({
},
render: function() {
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
if (this.state.fetching || this.state.fetchingInvitedMembers) {
const Spinner = sdk.getComponent("elements.Spinner");
return ({explanation}
+ {explanation}
{listHeader}
{content}
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 36e30343e4..17a496b037 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -405,21 +405,6 @@ export default createReactClass({
this.onResize();
document.addEventListener("keydown", this.onKeyDown);
-
- // XXX: EVIL HACK to autofocus inviting on empty rooms.
- // We use the setTimeout to avoid racing with focus_composer.
- if (this.state.room &&
- this.state.room.getJoinedMemberCount() == 1 &&
- this.state.room.getLiveTimeline() &&
- this.state.room.getLiveTimeline().getEvents() &&
- this.state.room.getLiveTimeline().getEvents().length <= 6) {
- const inviteBox = document.getElementById("mx_SearchableEntityList_query");
- setTimeout(function() {
- if (inviteBox) {
- inviteBox.focus();
- }
- }, 50);
- }
},
shouldComponentUpdate: function(nextProps, nextState) {
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index b81b3ebede..c218fee5d6 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -782,7 +782,7 @@ export default createReactClass({
if (!this._divScroll) {
// Likewise, we should have the ref by this point, but if not
// turn the NPE into something meaningful.
- throw new Error("ScrollPanel._getScrollNode called before gemini ref collected");
+ throw new Error("ScrollPanel._getScrollNode called before AutoHideScrollbar ref collected");
}
return this._divScroll;
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 622e63d8ce..f1a39d6fcf 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -28,6 +28,7 @@ import { _t } from '../../languageHandler';
import { Droppable } from 'react-beautiful-dnd';
import classNames from 'classnames';
import MatrixClientContext from "../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "./AutoHideScrollbar";
const TagPanel = createReactClass({
displayName: 'TagPanel',
@@ -106,7 +107,6 @@ const TagPanel = createReactClass({
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const ActionButton = sdk.getComponent('elements.ActionButton');
const TintableSvg = sdk.getComponent('elements.TintableSvg');
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
const tags = this.state.orderedTags.map((tag, index) => {
return
-
) }
-
+
;
},
});
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 8cb16dd88f..07a1eae5d5 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -33,6 +33,7 @@ export default createReactClass({
onFinished: PropTypes.func.isRequired,
headerImage: PropTypes.string,
quitOnly: PropTypes.bool, // quitOnly doesn't show the cancel button just the quit [x].
+ fixedWidth: PropTypes.bool,
},
getDefaultProps: function() {
@@ -63,11 +64,14 @@ export default createReactClass({
primaryButtonClass = "danger";
}
return (
-
{ this.props.description }
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 0ffc072cc0..b9f6f6ebce 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -18,6 +18,7 @@ import React, {createRef} from 'react';
import createReactClass from 'create-react-class';
import PropTypes from 'prop-types';
import * as sdk from '../../../index';
+import Field from "../elements/Field";
export default createReactClass({
displayName: 'TextInputDialog',
@@ -28,9 +29,13 @@ export default createReactClass({
PropTypes.string,
]),
value: PropTypes.string,
+ placeholder: PropTypes.string,
button: PropTypes.string,
focus: PropTypes.bool,
onFinished: PropTypes.func.isRequired,
+ hasCancel: PropTypes.bool,
+ validator: PropTypes.func, // result of withValidation
+ fixedWidth: PropTypes.bool,
},
getDefaultProps: function() {
@@ -39,34 +44,70 @@ export default createReactClass({
value: "",
description: "",
focus: true,
+ hasCancel: true,
+ };
+ },
+
+ getInitialState: function() {
+ return {
+ value: this.props.value,
+ valid: false,
};
},
UNSAFE_componentWillMount: function() {
- this._textinput = createRef();
+ this._field = createRef();
},
componentDidMount: function() {
if (this.props.focus) {
// Set the cursor at the end of the text input
- this._textinput.current.value = this.props.value;
+ // this._field.current.value = this.props.value;
+ this._field.current.focus();
}
},
- onOk: function() {
- this.props.onFinished(true, this._textinput.current.value);
+ onOk: async function(ev) {
+ ev.preventDefault();
+ if (this.props.validator) {
+ await this._field.current.validate({ allowEmpty: false });
+
+ if (!this._field.current.state.valid) {
+ this._field.current.focus();
+ this._field.current.validate({ allowEmpty: false, focused: true });
+ return;
+ }
+ }
+ this.props.onFinished(true, this.state.value);
},
onCancel: function() {
this.props.onFinished(false);
},
+ onChange: function(ev) {
+ this.setState({
+ value: ev.target.value,
+ });
+ },
+
+ onValidate: async function(fieldState) {
+ const result = await this.props.validator(fieldState);
+ this.setState({
+ valid: result.valid,
+ });
+ return result;
+ },
+
render: function() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
return (
-
- { _t('"%(RoomName)s" contains sessions that you haven\'t seen before.', {RoomName: this.props.room.name}) }
@@ -176,7 +175,7 @@ export default createReactClass({ { _t("Unknown sessions") }:
+ {_t("Your server")}
+
+ );
+ }
- let icon;
- let name;
- let key;
+ let removeButton;
+ if (removableServers.has(server)) {
+ const onClick = async () => {
+ closeMenu();
+ const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+ const {finished} = Modal.createTrackedDialog("Network Dropdown", "Remove server", QuestionDialog, {
+ title: _t("Are you sure?"),
+ description: _t("Are you sure you want to remove %(serverName)s", {
+ serverName: server,
+ }, {
+ b: serverName => { serverName },
+ }),
+ button: _t("Remove"),
+ fixedWidth: false,
+ }, "mx_NetworkDropdown_dialog");
- if (!instance && includeAll) {
- key = server;
- name = server;
- } else if (!instance) {
- key = server + '_all';
- name = 'Matrix';
- icon = ;
- } else {
- key = server + '_inst_' + instance.instance_id;
- const imgUrl = instance.icon ?
- MatrixClientPeg.get().mxcUrlToHttp(instance.icon, 25, 25, 'crop', true) :
- DEFAULT_ICON_URL;
- icon = ;
- name = instance.desc;
- }
+ const [ok] = await finished;
+ if (!ok) return;
- const clickHandler = handleClicks ? this.onMenuOptionClick.bind(this, server, instance, includeAll) : null;
+ // delete from setting
+ setUserDefinedServers(servers.filter(s => s !== server));
- return
- {icon}
- {name}
-
;
- }
+ // the selected server is being removed, reset to our HS
+ if (serverSelected === server) {
+ onOptionChange(hsName, undefined);
+ }
+ };
+ removeButton = ;
+ }
- render() {
- let currentValue;
+ // ARIA: in actual fact the entire menu is one large radio group but for better screen reader support
+ // we use group to notate server wrongly.
+ return (
+
+ { server }
+ { removeButton }
+
+ { subtitle }
- let menu;
- if (this.state.expanded) {
- const menuOptions = this._getMenuOptions();
- menu =
- {menuOptions}
-
;
- currentValue = ;
- } else {
- const instance = instanceForInstanceId(this.props.protocols, this.state.selectedInstanceId);
- currentValue = this._makeMenuOption(
- this.state.selectedServer, instance, this.state.includeAllNetworks, false,
+
+ {options}
+
+
+
-
;
+
+ ({selectedServerName})
+
+ ;
}
-}
+
+ return
+ content =
+
{currentValue}
-
- {menu}
-
-
+ {content}
+
;
+};
NetworkDropdown.propTypes = {
onOptionChange: PropTypes.func.isRequired,
protocols: PropTypes.object,
- // The room directory config. May have a 'servers' key that is a list of server names to include in the dropdown
- config: PropTypes.object,
};
-NetworkDropdown.defaultProps = {
- protocols: {},
- config: {},
-};
+export default NetworkDropdown;
diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
deleted file mode 100644
index 13eb14ecc3..0000000000
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2018 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.
-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 GeminiScrollbar from 'react-gemini-scrollbar';
-
-function GeminiScrollbarWrapper(props) {
- const {wrappedRef, ...wrappedProps} = props;
-
- // Enable forceGemini so that gemini is always enabled. This is
- // to avoid future issues where a feature is implemented without
- // doing QA on every OS/browser combination.
- //
- // By default GeminiScrollbar allows native scrollbars to be used
- // on macOS. Use forceGemini to enable Gemini's non-native
- // scrollbars on all OSs.
- return
-
+
![]({require("../../../../res/img/cancel.svg")})
@@ -199,7 +199,7 @@ export default createReactClass({
{ adminTools }
-
@@ -225,10 +225,10 @@ export default createReactClass({
return (
{ badge }
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
deleted file mode 100644
index 807ddbf729..0000000000
--- a/src/components/views/rooms/SearchableEntityList.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-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.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import createReactClass from 'create-react-class';
-import * as sdk from "../../../index";
-import { _t } from '../../../languageHandler';
-
-// A list capable of displaying entities which conform to the SearchableEntity
-// interface which is an object containing getJsx(): Jsx and matches(query: string): boolean
-const SearchableEntityList = createReactClass({
- displayName: 'SearchableEntityList',
-
- propTypes: {
- emptyQueryShowsAll: PropTypes.bool,
- showInputBox: PropTypes.bool,
- onQueryChanged: PropTypes.func, // fn(inputText)
- onSubmit: PropTypes.func, // fn(inputText)
- entities: PropTypes.array,
- truncateAt: PropTypes.number,
- },
-
- getDefaultProps: function() {
- return {
- showInputBox: true,
- entities: [],
- emptyQueryShowsAll: false,
- onSubmit: function() {},
- onQueryChanged: function(input) {},
- };
- },
-
- getInitialState: function() {
- return {
- query: "",
- focused: false,
- truncateAt: this.props.truncateAt,
- results: this.getSearchResults("", this.props.entities),
- };
- },
-
- componentWillReceiveProps: function(newProps) {
- // recalculate the search results in case we got new entities
- this.setState({
- results: this.getSearchResults(this.state.query, newProps.entities),
- });
- },
-
- componentWillUnmount: function() {
- // pretend the query box was blanked out else filters could still be
- // applied to other components which rely on onQueryChanged.
- this.props.onQueryChanged("");
- },
-
- /**
- * Public-facing method to set the input query text to the given input.
- * @param {string} input
- */
- setQuery: function(input) {
- this.setState({
- query: input,
- results: this.getSearchResults(input, this.props.entities),
- });
- },
-
- onQueryChanged: function(ev) {
- const q = ev.target.value;
- this.setState({
- query: q,
- // reset truncation if they back out the entire text
- truncateAt: (q.length === 0 ? this.props.truncateAt : this.state.truncateAt),
- results: this.getSearchResults(q, this.props.entities),
- }, () => {
- // invoke the callback AFTER we've flushed the new state. We need to
- // do this because onQueryChanged can result in new props being passed
- // to this component, which will then try to recalculate the search
- // list. If we do this without flushing, we'll recalc with the last
- // search term and not the current one!
- this.props.onQueryChanged(q);
- });
- },
-
- onQuerySubmit: function(ev) {
- ev.preventDefault();
- this.props.onSubmit(this.state.query);
- },
-
- getSearchResults: function(query, entities) {
- if (!query || query.length === 0) {
- return this.props.emptyQueryShowsAll ? entities : [];
- }
- return entities.filter(function(e) {
- return e.matches(query);
- });
- },
-
- _showAll: function() {
- this.setState({
- truncateAt: -1,
- });
- },
-
- _createOverflowEntity: function(overflowCount, totalCount) {
- const EntityTile = sdk.getComponent("rooms.EntityTile");
- const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
- const text = _t("and %(count)s others...", { count: overflowCount });
- return (
-
- { this.state.results.map((entity) => {
- return entity.getJsx();
- }) }
-
- );
- } else {
- list = (
-
- { list }
-
- );
- }
-
- return (
-
{ inviteButton }
-
+
{ joined }
{ invited }
-
+
{ inputBox }
);
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index 7b9f43f15f..91d84be4d1 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -24,6 +24,7 @@ import * as sdk from '../../../index';
import { _t } from '../../../languageHandler';
import GroupStore from '../../../stores/GroupStore';
import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
export default createReactClass({
displayName: 'GroupRoomInfo',
@@ -153,7 +154,6 @@ export default createReactClass({
render: function() {
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
if (this.state.groupRoomRemoveLoading || !this.state.groupRoom) {
const Spinner = sdk.getComponent("elements.Spinner");
return
@@ -216,7 +216,7 @@ export default createReactClass({
const groupRoomName = this.state.groupRoom.displayname;
return (
);
},
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 5fd8c9f31d..dee304e1f6 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -22,6 +22,7 @@ import PropTypes from 'prop-types';
import { showGroupAddRoomDialog } from '../../../GroupAddressPicker';
import AccessibleButton from '../elements/AccessibleButton';
import TintableSvg from '../elements/TintableSvg';
+import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
const INITIAL_LOAD_NUM_ROOMS = 30;
@@ -150,17 +151,16 @@ export default createReactClass({
placeholder={_t('Filter community rooms')} autoComplete="off" />
);
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
const TruncatedList = sdk.getComponent("elements.TruncatedList");
return (
-
+
@@ -231,7 +231,7 @@ export default createReactClass({
{ adminTools }
-
+
{ inviteButton }
-
+
{ this.makeGroupRoomTiles(this.state.searchQuery) }
-
+
{ inputBox }
);
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f8e2151c4f..857a80c34a 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -236,8 +236,7 @@ export default class AliasSettings extends React.Component {
// TODO: In future, we should probably be making sure that the alias actually belongs
// to this room. See https://github.com/vector-im/riot-web/issues/7353
MatrixClientPeg.get().deleteAlias(alias).then(() => {
- const localAliases = this.state.localAliases.slice();
- localAliases.splice(index, 1);
+ const localAliases = this.state.localAliases.filter(a => a !== alias);
this.setState({localAliases});
if (this.state.canonicalAlias === alias) {
diff --git a/src/components/views/rooms/BasicMessageComposer.js b/src/components/views/rooms/BasicMessageComposer.js
index dabf04ab99..147f3c0af8 100644
--- a/src/components/views/rooms/BasicMessageComposer.js
+++ b/src/components/views/rooms/BasicMessageComposer.js
@@ -370,6 +370,16 @@ export default class BasicMessageEditor extends React.Component {
} else if (modKey && event.key === Key.GREATER_THAN) {
this._onFormatAction("quote");
handled = true;
+ // redo
+ } else if ((!IS_MAC && modKey && event.key === Key.Y) ||
+ (IS_MAC && modKey && event.shiftKey && event.key === Key.Z)) {
+ if (this.historyManager.canRedo()) {
+ const {parts, caret} = this.historyManager.redo();
+ // pass matching inputType so historyManager doesn't push echo
+ // when invoked from rerender callback.
+ model.reset(parts, caret, "historyRedo");
+ }
+ handled = true;
// undo
} else if (modKey && event.key === Key.Z) {
if (this.historyManager.canUndo()) {
@@ -379,15 +389,6 @@ export default class BasicMessageEditor extends React.Component {
model.reset(parts, caret, "historyUndo");
}
handled = true;
- // redo
- } else if (modKey && event.key === Key.Y) {
- if (this.historyManager.canRedo()) {
- const {parts, caret} = this.historyManager.redo();
- // pass matching inputType so historyManager doesn't push echo
- // when invoked from rerender callback.
- model.reset(parts, caret, "historyRedo");
- }
- handled = true;
// insert newline on Shift+Enter
} else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) {
this._insertText("\n");
diff --git a/src/components/views/rooms/JumpToBottomButton.js b/src/components/views/rooms/JumpToBottomButton.js
index 487071855f..d3305f498a 100644
--- a/src/components/views/rooms/JumpToBottomButton.js
+++ b/src/components/views/rooms/JumpToBottomButton.js
@@ -24,7 +24,7 @@ export default (props) => {
}
return (
- { this.state.results.map((entity) => {
- return entity.getJsx();
- }) }
-
- );
- }
- const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
- list = (
-
- { inputBox }
- { list }
- { list ?
: '' }
-
- );
- },
-});
-
-export default SearchableEntityList;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cdfc3cbb89..37ac1ee947 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -961,7 +961,7 @@
"Encrypted by a deleted session": "Encrypted by a deleted session",
"Please select the destination room for this message": "Please select the destination room for this message",
"Invite only": "Invite only",
- "Scroll to bottom of page": "Scroll to bottom of page",
+ "Scroll to most recent messages": "Scroll to most recent messages",
"Close preview": "Close preview",
"device id: ": "device id: ",
"Disinvite": "Disinvite",
@@ -1450,6 +1450,20 @@
"And %(count)s more...|other": "And %(count)s more...",
"ex. @bob:example.com": "ex. @bob:example.com",
"Add User": "Add User",
+ "Enter a server name": "Enter a server name",
+ "Looks good": "Looks good",
+ "Can't find this server or its room list": "Can't find this server or its room list",
+ "All rooms": "All rooms",
+ "Your server": "Your server",
+ "Are you sure you want to remove %(serverName)s": "Are you sure you want to remove %(serverName)s",
+ "Remove server": "Remove server",
+ "Matrix": "Matrix",
+ "Add a new server": "Add a new server",
+ "Enter the name of a new server you want to explore.": "Enter the name of a new server you want to explore.",
+ "Server name": "Server name",
+ "Add a new server...": "Add a new server...",
+ "%(networkName)s rooms": "%(networkName)s rooms",
+ "Matrix rooms": "Matrix rooms",
"Matrix ID": "Matrix ID",
"Matrix Room ID": "Matrix Room ID",
"email address": "email address",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index abcfd21902..461761dfa2 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -330,6 +330,10 @@ export const SETTINGS = {
supportedLevels: ['account'],
default: [],
},
+ "room_directory_servers": {
+ supportedLevels: ['account'],
+ default: [],
+ },
"integrationProvisioning": {
supportedLevels: ['account'],
default: true,
diff --git a/yarn.lock b/yarn.lock
index ac921a619a..d0934ffc31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3907,10 +3907,6 @@ fuse.js@^2.2.0:
resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
integrity sha1-luQg/efvARrEnCWKYhMU/ldlNvk=
-"gemini-scrollbar@github:matrix-org/gemini-scrollbar#91e1e566", gemini-scrollbar@matrix-org/gemini-scrollbar#91e1e566:
- version "1.4.3"
- resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/91e1e566fa33324188f278801baf4a79f9f554ab"
-
gensync@^1.0.0-beta.1:
version "1.0.0-beta.1"
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -6968,12 +6964,6 @@ react-focus-lock@^2.2.1:
use-callback-ref "^1.2.1"
use-sidecar "^1.0.1"
-"react-gemini-scrollbar@github:matrix-org/react-gemini-scrollbar#9cf17f63b7c0b0ec5f31df27da0f82f7238dc594":
- version "2.1.5"
- resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/9cf17f63b7c0b0ec5f31df27da0f82f7238dc594"
- dependencies:
- gemini-scrollbar matrix-org/gemini-scrollbar#91e1e566
-
react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
version "16.13.0"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"