- { content }
-
- }
-
let childToggle;
let childSection;
if (children) {
@@ -201,7 +195,7 @@ const Tile: React.FC
-
- { _t("Explore rooms") }
-+ { children &&
} ; } else { results =
@@ -547,32 +535,78 @@ const SpaceRoomDirectory: React.FC = ({ space, initialText = "", onFinis
}
{_t("Your server does not support showing space hierarchies.")}
; } // TODO loading state/error state + return <> +
+
+ { _t("Explore rooms") }
+
- { explanation }
+ { _t("If you can't find the room you're looking for, ask for an invite or create a new room.",
+ null,
+ {a: sub => {
+ return {sub} ;
+ }},
+ ) }
- {
+ showRoom(room, viaServers, autoJoin);
+ onFinished();
+ }}
+ initialText={initialText}
+ >
+
+ { _t("Create room") }
+
+
+ { visibilitySection }
+ { joinRule === "public" &&
+ {(count) => count > 0 ? (
+ {
+ defaultDispatcher.dispatch({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.RoomMemberList,
+ refireParams: { space },
+ });
+ }}
+ >
+ { _t("%(count)s members", { count }) }
+
+ ) : null}
+ }
+
+};
+
const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) => {
const cli = useContext(MatrixClientContext);
const myMembership = useMyRoomMembership(space);
@@ -124,30 +156,36 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
}
joinButtons = <>
-
{ inviterSection }
-
{(topic, ref) =>
+ { space.getJoinRule() === "public" && {
- showRoomInviteDialog(space.roomId);
- }}>
- { _t("Invite people") }
+ {
+ showRoomInviteDialog(space.roomId);
+ }}
+ >
+ { _t("Invite") }
);
}
const canAddRooms = myMembership === "join" && space.currentState.maySendStateEvent(EventType.SpaceChild, userId);
- const [_, forceUpdate] = useStateToggle(false); // TODO
+ const [refreshToken, forceUpdate] = useStateToggle(false);
let addRoomButtons;
if (canAddRooms) {
@@ -253,49 +266,13 @@ const SpaceLanding = ({ space }) => {
;
}
- const [loading, roomsMap, relations, numRooms] = useAsyncMemo(async () => {
- try {
- const data = await cli.getSpaceSummary(space.roomId, undefined, myMembership !== "join");
-
- const parentChildRelations = new EnhancedMap>();
- data.events.map((ev: ISpaceSummaryEvent) => {
- if (ev.type === EventType.SpaceChild) {
- parentChildRelations.getOrCreate(ev.room_id, new Map()).set(ev.state_key, ev);
- }
- });
-
- const roomsMap = new Map(data.rooms.map(r => [r.room_id, r]));
- const numRooms = data.rooms.filter(r => r.room_type !== RoomType.Space).length;
- return [false, roomsMap, parentChildRelations, numRooms];
- } catch (e) {
- console.error(e); // TODO
- }
-
- return [false];
- }, [space, _], [true]);
-
- let previewRooms;
- if (roomsMap) {
- previewRooms =
- {
- showRoom(roomsMap.get(roomId), [], autoJoin);
- }}
- />
- ;
- } else if (loading) {
- previewRooms = ({
+ action: Action.SetRightPanelPhase,
+ phase: RightPanelPhases.RoomMemberList,
+ refireParams: { space },
+ });
+ };
return
- {(count) => count > 0 ? (
- {
- defaultDispatcher.dispatch({
- action: Action.SetRightPanelPhase,
- phase: RightPanelPhases.RoomMemberList,
- refireParams: { space },
- });
- }}
- >
- { _t("%(count)s members", { count }) }
-
- ) : null}
-
};
- if (shouldShowSpaceSettings(cli, space)) {
- if (space.getJoinRule() === "public") {
- return _t("Your public space
;
};
@@ -407,11 +365,13 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
{ fields }
- { visibilitySection }
-
- {(count) => count > 0 ? (
- {
- defaultDispatcher.dispatch({
- action: Action.SetRightPanelPhase,
- phase: RightPanelPhases.RoomMemberList,
- refireParams: { space },
- });
- }}
- >
- { _t("%(count)s members", { count }) }
-
- ) : null}
-
-
+
@@ -199,6 +207,7 @@ const SpacePreview = ({ space, onJoinButtonClicked, onRejectButtonClicked }) =>
}
{ joinButtons }
@@ -213,17 +222,21 @@ const SpaceLanding = ({ space }) => {
let inviteButton;
if (myMembership === "join" && space.canInvite(userId)) {
inviteButton = (
-
-
- { myMembership === "join" ? _t("Rooms") : _t("Default Rooms")}
- { numRooms } -{_t("Your server does not support showing space hierarchies.")}
; - } + const onMembersClick = () => { + defaultDispatcher.dispatch{ name }
-
+
- { inviteButton }
{ addRoomButtons }
{ settingsButton }
- { previewRooms }
+
-
;
};
@@ -419,14 +379,16 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
const SpaceSetupPublicShare = ({ space, onFinished }) => {
return { _t("Share %(name)s", { name: space.name }) }
-
+
;
};
@@ -545,7 +507,9 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
{ _t("It's just you at the moment, it will be even better with others.") }
-
-
+ { _t("Go to my first room") }
+
-
+ { buttonLabel }
+
;
};
@@ -630,6 +594,8 @@ export default class SpaceRoomView extends React.PureComponent
-
diff --git a/src/components/structures/auth/SetupEncryptionBody.js b/src/components/structures/auth/SetupEncryptionBody.js
index e246b9cbd0..803df19d00 100644
--- a/src/components/structures/auth/SetupEncryptionBody.js
+++ b/src/components/structures/auth/SetupEncryptionBody.js
@@ -155,15 +155,14 @@ export default class SetupEncryptionBody extends React.Component {
let verifyButton;
if (store.hasDevicesToVerifyAgainst) {
verifyButton = Room ID: {roomId}
- Event ID: {eventId}
+ Room ID: {roomId}
+ Event ID: {eventId}
{isEditing ? this.editSourceContent() : this.viewSourceContent()}
{_t( - "Verify this login to access your encrypted messages and " + - "prove to others that this login is really you.", + "Verify your identity to access encrypted messages and prove your identity to others.", )}
@@ -205,8 +204,8 @@ export default class SetupEncryptionBody extends React.Component {
return (
= ({ matrixClient: cli, space,
const title =
;
@@ -128,29 +127,9 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
className="mx_textinput_icon mx_textinput_search"
placeholder={ _t("Filter your rooms and spaces") }
onSearch={setQuery}
+ autoComplete={true}
/>
- { spaces.length > 0 ? (
-
= ({ matrixClient: cli, space,
) : undefined }
+ { spaces.length > 0 ? (
+ = ({ matrixClient: cli, space,
- {
setBusy(true);
@@ -200,7 +200,9 @@ const AddExistingToSpaceDialog: React.FC = ({ matrixClient: cli, space,
}
setBusy(false);
}}
- />
+ >
+ { busy ? _t("Adding...") : _t("Add") }
+
;
};
diff --git a/src/components/views/dialogs/InviteDialog.tsx b/src/components/views/dialogs/InviteDialog.tsx
index de0b5b237b..6b17d3ce60 100644
--- a/src/components/views/dialogs/InviteDialog.tsx
+++ b/src/components/views/dialogs/InviteDialog.tsx
@@ -43,6 +43,7 @@ import {Room} from "matrix-js-sdk/src/models/room";
import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
import {replaceableComponent} from "../../../utils/replaceableComponent";
import {mediaFromMxc} from "../../../customisations/Media";
+import {getAddressType} from "../../../UserAddress";
// we have a number of types defined from the Matrix spec which can't reasonably be altered here.
/* eslint-disable camelcase */
@@ -673,19 +674,20 @@ export default class InviteDialog extends React.PureComponent {
+ _inviteUsers = async () => {
const startTime = CountlyAnalytics.getTimestamp();
this.setState({busy: true});
this._convertFilter();
const targets = this._convertFilter();
const targetIds = targets.map(t => t.userId);
- const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+ const cli = MatrixClientPeg.get();
+ const room = cli.getRoom(this.props.roomId);
if (!room) {
console.error("Failed to find the room to invite users to");
this.setState({
@@ -695,12 +697,34 @@ export default class InviteDialog extends React.PureComponent {
+ try {
+ const result = await inviteMultipleToRoom(this.props.roomId, targetIds)
CountlyAnalytics.instance.trackSendInvite(startTime, this.props.roomId, targetIds.length);
if (!this._shouldAbortAfterInviteError(result)) { // handles setting error message too
this.props.onFinished();
}
- }).catch(err => {
+
+ if (cli.isRoomEncrypted(this.props.roomId) &&
+ SettingsStore.getValue("feature_room_history_key_sharing")) {
+ const visibilityEvent = room.currentState.getStateEvents(
+ "m.room.history_visibility", "",
+ );
+ const visibility = visibilityEvent && visibilityEvent.getContent() &&
+ visibilityEvent.getContent().history_visibility;
+ if (visibility == "world_readable" || visibility == "shared") {
+ const invitedUsers = [];
+ for (const [addr, state] of Object.entries(result.states)) {
+ if (state === "invited" && getAddressType(addr) === "mx-user-id") {
+ invitedUsers.push(addr);
+ }
+ }
+ console.log("Sharing history with", invitedUsers);
+ cli.sendSharedHistoryKeys(
+ this.props.roomId, invitedUsers,
+ );
+ }
+ }
+ } catch (err) {
console.error(err);
this.setState({
busy: false,
@@ -708,7 +732,7 @@ export default class InviteDialog extends React.PureComponent {
@@ -886,19 +910,21 @@ export default class InviteDialog extends React.PureComponent {
- let filterText = this.state.filterText;
- const targets = this.state.targets.map(t => t); // cheap clone for mutation
- const idx = targets.indexOf(member);
- if (idx >= 0) {
- targets.splice(idx, 1);
- } else {
- targets.push(member);
- filterText = ""; // clear the filter when the user accepts a suggestion
- }
- this.setState({targets, filterText});
+ if (!this.state.busy) {
+ let filterText = this.state.filterText;
+ const targets = this.state.targets.map(t => t); // cheap clone for mutation
+ const idx = targets.indexOf(member);
+ if (idx >= 0) {
+ targets.splice(idx, 1);
+ } else {
+ targets.push(member);
+ filterText = ""; // clear the filter when the user accepts a suggestion
+ }
+ this.setState({targets, filterText});
- if (this._editorRef && this._editorRef.current) {
- this._editorRef.current.focus();
+ if (this._editorRef && this._editorRef.current) {
+ this._editorRef.current.focus();
+ }
}
};
@@ -1189,10 +1215,12 @@ export default class InviteDialog extends React.PureComponent
+ ![]({require("../../../../res/img/element-icons/info.svg")})
+ {" " + _t("Invited people will be able to read old messages.")}
+ ;
+ }
+ }
} else if (this.props.kind === KIND_CALL_TRANSFER) {
title = _t("Transfer");
buttonText = _t("Transfer");
@@ -1321,6 +1368,7 @@ export default class InviteDialog extends React.PureComponent
+ {keySharingWarning}
{this._renderIdentityServerWarning()}
boolean;
+}
+
+interface IState {
+ recoveryKey: string;
+ recoveryKeyValid: boolean | null;
+ recoveryKeyCorrect: boolean | null;
+ recoveryKeyFileError: boolean | null;
+ forceRecoveryKey: boolean;
+ passPhrase: string;
+ keyMatches: boolean | null;
+}
+
/*
* Access Secure Secret Storage by requesting the user's passphrase.
*/
-export default class AccessSecretStorageDialog extends React.PureComponent {
- static propTypes = {
- // { passphrase, pubkey }
- keyInfo: PropTypes.object.isRequired,
- // Function from one of { passphrase, recoveryKey } -> boolean
- checkPrivateKey: PropTypes.func.isRequired,
- }
+export default class AccessSecretStorageDialog extends React.PureComponent {
+ private fileUpload = React.createRef();
constructor(props) {
super(props);
- this._fileUpload = React.createRef();
-
this.state = {
recoveryKey: "",
recoveryKeyValid: null,
@@ -61,21 +69,21 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
};
}
- _onCancel = () => {
+ private onCancel = () => {
this.props.onFinished(false);
- }
+ };
- _onUseRecoveryKeyClick = () => {
+ private onUseRecoveryKeyClick = () => {
this.setState({
forceRecoveryKey: true,
});
- }
+ };
- _validateRecoveryKeyOnChange = debounce(() => {
- this._validateRecoveryKey();
+ private validateRecoveryKeyOnChange = debounce(async () => {
+ await this.validateRecoveryKey();
}, VALIDATION_THROTTLE_MS);
- async _validateRecoveryKey() {
+ private async validateRecoveryKey() {
if (this.state.recoveryKey === '') {
this.setState({
recoveryKeyValid: null,
@@ -102,27 +110,27 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
}
}
- _onRecoveryKeyChange = (e) => {
+ private onRecoveryKeyChange = (ev: ChangeEvent) => {
this.setState({
- recoveryKey: e.target.value,
+ recoveryKey: ev.target.value,
recoveryKeyFileError: null,
});
// also clear the file upload control so that the user can upload the same file
// the did before (otherwise the onchange wouldn't fire)
- if (this._fileUpload.current) this._fileUpload.current.value = null;
+ if (this.fileUpload.current) this.fileUpload.current.value = null;
// We don't use Field's validation here because a) we want it in a separate place rather
// than in a tooltip and b) we want it to display feedback based on the uploaded file
// as well as the text box. Ideally we would refactor Field's validation logic so we could
// re-use some of it.
- this._validateRecoveryKeyOnChange();
- }
+ this.validateRecoveryKeyOnChange();
+ };
- _onRecoveryKeyFileChange = async e => {
- if (e.target.files.length === 0) return;
+ private onRecoveryKeyFileChange = async (ev: ChangeEvent) => {
+ if (ev.target.files.length === 0) return;
- const f = e.target.files[0];
+ const f = ev.target.files[0];
if (f.size > KEY_FILE_MAX_SIZE) {
this.setState({
@@ -140,7 +148,7 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
recoveryKeyFileError: null,
recoveryKey: contents.trim(),
});
- this._validateRecoveryKey();
+ await this.validateRecoveryKey();
} else {
this.setState({
recoveryKeyFileError: true,
@@ -150,14 +158,14 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
});
}
}
+ };
+
+ private onRecoveryKeyFileUploadClick = () => {
+ this.fileUpload.current.click();
}
- _onRecoveryKeyFileUploadClick = () => {
- this._fileUpload.current.click();
- }
-
- _onPassPhraseNext = async (e) => {
- e.preventDefault();
+ private onPassPhraseNext = async (ev: FormEvent) => {
+ ev.preventDefault();
if (this.state.passPhrase.length <= 0) return;
@@ -169,10 +177,10 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
} else {
this.setState({ keyMatches });
}
- }
+ };
- _onRecoveryKeyNext = async (e) => {
- e.preventDefault();
+ private onRecoveryKeyNext = async (ev: FormEvent) => {
+ ev.preventDefault();
if (!this.state.recoveryKeyValid) return;
@@ -184,16 +192,16 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
} else {
this.setState({ keyMatches });
}
- }
+ };
- _onPassPhraseChange = (e) => {
+ private onPassPhraseChange = (ev: ChangeEvent) => {
this.setState({
- passPhrase: e.target.value,
+ passPhrase: ev.target.value,
keyMatches: null,
});
- }
+ };
- getKeyValidationText() {
+ private getKeyValidationText(): string {
if (this.state.recoveryKeyFileError) {
return _t("Wrong file type");
} else if (this.state.recoveryKeyCorrect) {
@@ -208,7 +216,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
}
render() {
- const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+ // Caution: Making this an import will break tests.
+ const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
const hasPassphrase = (
this.props.keyInfo &&
@@ -244,18 +253,18 @@ export default class AccessSecretStorageDialog extends React.PureComponent {
{
button: s =>
{s}
,
},
)}
-
);
}
diff --git a/src/components/views/elements/FacePile.tsx b/src/components/views/elements/FacePile.tsx
new file mode 100644
index 0000000000..e223744352
--- /dev/null
+++ b/src/components/views/elements/FacePile.tsx
@@ -0,0 +1,66 @@
+/*
+Copyright 2021 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, { HTMLAttributes } from "react";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { sortBy } from "lodash";
+
+import MemberAvatar from "../avatars/MemberAvatar";
+import { _t } from "../../../languageHandler";
+import DMRoomMap from "../../../utils/DMRoomMap";
+import TextWithTooltip from "../elements/TextWithTooltip";
+import { useRoomMembers } from "../../../hooks/useRoomMembers";
+
+const DEFAULT_NUM_FACES = 5;
+
+interface IProps extends HTMLAttributes {
+ room: Room;
+ onlyKnownUsers?: boolean;
+ numShown?: number;
+}
+
+const isKnownMember = (member: RoomMember) => !!DMRoomMap.shared().getDMRoomsForUserId(member.userId)?.length;
+
+const FacePile = ({ room, onlyKnownUsers = true, numShown = DEFAULT_NUM_FACES, ...props }: IProps) => {
+ let members = useRoomMembers(room);
+
+ // sort users with an explicit avatar first
+ const iteratees = [member => !!member.getMxcAvatarUrl()];
+ if (onlyKnownUsers) {
+ members = members.filter(isKnownMember);
+ } else {
+ // sort known users first
+ iteratees.unshift(member => isKnownMember(member));
+ }
+ if (members.length < 1) return null;
+
+ const shownMembers = sortBy(members, iteratees).slice(0, numShown);
+ return = ({
brandClass = `mx_SSOButton_brand_${brandName}`;
icon = 
;
} else if (typeof idp?.icon === "string" && idp.icon.startsWith("mxc://")) {
- const src = mediaFromMxc(idp.icon).getSquareThumbnailHttp(24);
+ const src = mediaFromMxc(idp.icon, matrixClient).getSquareThumbnailHttp(24);
icon = 
;
}
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index b0eb6f2f35..353f40b6a9 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -216,12 +216,12 @@ export default class TextualBody extends React.Component {
}
_addLineNumbers(pre) {
+ // Calculate number of lines in pre
+ const number = pre.innerHTML.replace(/\n(<\/code>)?$/, "").split(/\n/).length;
pre.innerHTML = '' + pre.innerHTML + '';
const lineNumbers = pre.getElementsByClassName("mx_EventTile_lineNumbers")[0];
- // Calculate number of lines in pre
- const number = pre.innerHTML.split(/\n/).length;
// Iterate through lines starting with 1 (number of the first line is 1)
- for (let i = 1; i < number; i++) {
+ for (let i = 1; i <= number; i++) {
lineNumbers.innerHTML += '' + i + '';
}
}
diff --git a/src/components/views/right_panel/EncryptionInfo.tsx b/src/components/views/right_panel/EncryptionInfo.tsx
index 10d35200bd..aa51965ac6 100644
--- a/src/components/views/right_panel/EncryptionInfo.tsx
+++ b/src/components/views/right_panel/EncryptionInfo.tsx
@@ -52,7 +52,7 @@ const EncryptionInfo: React.FC = ({
let text: string;
if (waitingForOtherParty) {
if (isSelfVerification) {
- text = _t("Waiting for you to accept on your other session…");
+ text = _t("Accept on your other login…");
} else {
text = _t("Waiting for %(displayName)s to accept…", {
displayName: member.displayName || member.name || member.userId,
diff --git a/src/components/views/rooms/BasicMessageComposer.tsx b/src/components/views/rooms/BasicMessageComposer.tsx
index 1a95b4366a..5dabd80399 100644
--- a/src/components/views/rooms/BasicMessageComposer.tsx
+++ b/src/components/views/rooms/BasicMessageComposer.tsx
@@ -46,6 +46,7 @@ import {IDiff} from "../../../editor/diff";
import AutocompleteWrapperModel from "../../../editor/autocomplete";
import DocumentPosition from "../../../editor/position";
import {ICompletion} from "../../../autocomplete/Autocompleter";
+import { AutocompleteAction, getKeyBindingsManager, MessageComposerAction } from '../../../KeyBindingsManager';
import {replaceableComponent} from "../../../utils/replaceableComponent";
// matches emoticons which follow the start of a line or whitespace
@@ -422,98 +423,94 @@ export default class BasicMessageEditor extends React.Component
private onKeyDown = (event: React.KeyboardEvent) => {
const model = this.props.model;
- const modKey = IS_MAC ? event.metaKey : event.ctrlKey;
let handled = false;
- // format bold
- if (modKey && event.key === Key.B) {
- this.onFormatAction(Formatting.Bold);
- handled = true;
- // format italics
- } else if (modKey && event.key === Key.I) {
- this.onFormatAction(Formatting.Italics);
- handled = true;
- // format quote
- } else if (modKey && event.key === Key.GREATER_THAN) {
- this.onFormatAction(Formatting.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()) {
- const {parts, caret} = this.historyManager.undo(this.props.model);
- // pass matching inputType so historyManager doesn't push echo
- // when invoked from rerender callback.
- model.reset(parts, caret, "historyUndo");
- }
- handled = true;
- // insert newline on Shift+Enter
- } else if (event.key === Key.ENTER && (event.shiftKey || (IS_MAC && event.altKey))) {
- this.insertText("\n");
- handled = true;
- // move selection to start of composer
- } else if (modKey && event.key === Key.HOME && !event.shiftKey) {
- setSelection(this.editorRef.current, model, {
- index: 0,
- offset: 0,
- });
- handled = true;
- // move selection to end of composer
- } else if (modKey && event.key === Key.END && !event.shiftKey) {
- setSelection(this.editorRef.current, model, {
- index: model.parts.length - 1,
- offset: model.parts[model.parts.length - 1].text.length,
- });
- handled = true;
- // autocomplete or enter to send below shouldn't have any modifier keys pressed.
- } else {
- const metaOrAltPressed = event.metaKey || event.altKey;
- const modifierPressed = metaOrAltPressed || event.shiftKey;
- if (model.autoComplete && model.autoComplete.hasCompletions()) {
- const autoComplete = model.autoComplete;
- switch (event.key) {
- case Key.ARROW_UP:
- if (!modifierPressed) {
- autoComplete.onUpArrow(event);
- handled = true;
- }
- break;
- case Key.ARROW_DOWN:
- if (!modifierPressed) {
- autoComplete.onDownArrow(event);
- handled = true;
- }
- break;
- case Key.TAB:
- if (!metaOrAltPressed) {
- autoComplete.onTab(event);
- handled = true;
- }
- break;
- case Key.ESCAPE:
- if (!modifierPressed) {
- autoComplete.onEscape(event);
- handled = true;
- }
- break;
- default:
- return; // don't preventDefault on anything else
- }
- } else if (event.key === Key.TAB) {
- this.tabCompleteName(event);
+ const action = getKeyBindingsManager().getMessageComposerAction(event);
+ switch (action) {
+ case MessageComposerAction.FormatBold:
+ this.onFormatAction(Formatting.Bold);
handled = true;
- } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
- this.formatBarRef.current.hide();
- }
+ break;
+ case MessageComposerAction.FormatItalics:
+ this.onFormatAction(Formatting.Italics);
+ handled = true;
+ break;
+ case MessageComposerAction.FormatQuote:
+ this.onFormatAction(Formatting.Quote);
+ handled = true;
+ break;
+ case MessageComposerAction.EditRedo:
+ 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;
+ break;
+ case MessageComposerAction.EditUndo:
+ if (this.historyManager.canUndo()) {
+ const {parts, caret} = this.historyManager.undo(this.props.model);
+ // pass matching inputType so historyManager doesn't push echo
+ // when invoked from rerender callback.
+ model.reset(parts, caret, "historyUndo");
+ }
+ handled = true;
+ break;
+ case MessageComposerAction.NewLine:
+ this.insertText("\n");
+ handled = true;
+ break;
+ case MessageComposerAction.MoveCursorToStart:
+ setSelection(this.editorRef.current, model, {
+ index: 0,
+ offset: 0,
+ });
+ handled = true;
+ break;
+ case MessageComposerAction.MoveCursorToEnd:
+ setSelection(this.editorRef.current, model, {
+ index: model.parts.length - 1,
+ offset: model.parts[model.parts.length - 1].text.length,
+ });
+ handled = true;
+ break;
}
+ if (handled) {
+ event.preventDefault();
+ event.stopPropagation();
+ return;
+ }
+
+ const autocompleteAction = getKeyBindingsManager().getAutocompleteAction(event);
+ if (model.autoComplete && model.autoComplete.hasCompletions()) {
+ const autoComplete = model.autoComplete;
+ switch (autocompleteAction) {
+ case AutocompleteAction.PrevSelection:
+ autoComplete.onUpArrow(event);
+ handled = true;
+ break;
+ case AutocompleteAction.NextSelection:
+ autoComplete.onDownArrow(event);
+ handled = true;
+ break;
+ case AutocompleteAction.ApplySelection:
+ autoComplete.onTab(event);
+ handled = true;
+ break;
+ case AutocompleteAction.Cancel:
+ autoComplete.onEscape(event);
+ handled = true;
+ break;
+ default:
+ return; // don't preventDefault on anything else
+ }
+ } else if (autocompleteAction === AutocompleteAction.ApplySelection) {
+ this.tabCompleteName(event);
+ handled = true;
+ } else if (event.key === Key.BACKSPACE || event.key === Key.DELETE) {
+ this.formatBarRef.current.hide();
+ }
+
if (handled) {
event.preventDefault();
event.stopPropagation();
diff --git a/src/components/views/rooms/EditMessageComposer.js b/src/components/views/rooms/EditMessageComposer.js
index be04a50798..b006fe8c8d 100644
--- a/src/components/views/rooms/EditMessageComposer.js
+++ b/src/components/views/rooms/EditMessageComposer.js
@@ -29,11 +29,10 @@ import EditorStateTransfer from '../../../utils/EditorStateTransfer';
import classNames from 'classnames';
import {EventStatus} from 'matrix-js-sdk/src/models/event';
import BasicMessageComposer from "./BasicMessageComposer";
-import {Key, isOnlyCtrlOrCmdKeyEvent} from "../../../Keyboard";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import {Action} from "../../../dispatcher/actions";
-import SettingsStore from "../../../settings/SettingsStore";
import CountlyAnalytics from "../../../CountlyAnalytics";
+import {getKeyBindingsManager, MessageComposerAction} from '../../../KeyBindingsManager';
import {replaceableComponent} from "../../../utils/replaceableComponent";
function _isReply(mxEvent) {
@@ -136,38 +135,41 @@ export default class EditMessageComposer extends React.Component {
if (this._editorRef.isComposing(event)) {
return;
}
- if (event.metaKey || event.altKey || event.shiftKey) {
- return;
- }
- const ctrlEnterToSend = !!SettingsStore.getValue('MessageComposerInput.ctrlEnterToSend');
- const send = ctrlEnterToSend ? event.key === Key.ENTER && isOnlyCtrlOrCmdKeyEvent(event)
- : event.key === Key.ENTER;
- if (send) {
- this._sendEdit();
- event.preventDefault();
- } else if (event.key === Key.ESCAPE) {
- this._cancelEdit();
- } else if (event.key === Key.ARROW_UP) {
- if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) {
- return;
- }
- const previousEvent = findEditableEvent(this._getRoom(), false, this.props.editState.getEvent().getId());
- if (previousEvent) {
- dis.dispatch({action: 'edit_event', event: previousEvent});
+ const action = getKeyBindingsManager().getMessageComposerAction(event);
+ switch (action) {
+ case MessageComposerAction.Send:
+ this._sendEdit();
event.preventDefault();
+ break;
+ case MessageComposerAction.CancelEditing:
+ this._cancelEdit();
+ break;
+ case MessageComposerAction.EditPrevMessage: {
+ if (this._editorRef.isModified() || !this._editorRef.isCaretAtStart()) {
+ return;
+ }
+ const previousEvent = findEditableEvent(this._getRoom(), false,
+ this.props.editState.getEvent().getId());
+ if (previousEvent) {
+ dis.dispatch({action: 'edit_event', event: previousEvent});
+ event.preventDefault();
+ }
+ break;
}
- } else if (event.key === Key.ARROW_DOWN) {
- if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) {
- return;
+ case MessageComposerAction.EditNextMessage: {
+ if (this._editorRef.isModified() || !this._editorRef.isCaretAtEnd()) {
+ return;
+ }
+ const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId());
+ if (nextEvent) {
+ dis.dispatch({action: 'edit_event', event: nextEvent});
+ } else {
+ dis.dispatch({action: 'edit_event', event: null});
+ dis.fire(Action.FocusComposer);
+ }
+ event.preventDefault();
+ break;
}
- const nextEvent = findEditableEvent(this._getRoom(), true, this.props.editState.getEvent().getId());
- if (nextEvent) {
- dis.dispatch({action: 'edit_event', event: nextEvent});
- } else {
- dis.dispatch({action: 'edit_event', event: null});
- dis.fire(Action.FocusComposer);
- }
- event.preventDefault();
}
}
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index ce426a64ed..3f6054304d 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -1,5 +1,5 @@
/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020, 2021 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.
@@ -28,6 +28,8 @@ import defaultDispatcher from "../../../dispatcher/dispatcher";
import {ViewUserPayload} from "../../../dispatcher/payloads/ViewUserPayload";
import {Action} from "../../../dispatcher/actions";
import dis from "../../../dispatcher/dispatcher";
+import SpaceStore from "../../../stores/SpaceStore";
+import {showSpaceInvite} from "../../../utils/space";
const NewRoomIntro = () => {
const cli = useContext(MatrixClientContext);
@@ -100,17 +102,48 @@ const NewRoomIntro = () => {
});
}
- let buttons;
- if (room.canInvite(cli.getUserId())) {
- const onInviteClick = () => {
- dis.dispatch({ action: "view_invite", roomId });
- };
+ let parentSpace;
+ if (
+ SpaceStore.instance.activeSpace?.canInvite(cli.getUserId()) &&
+ SpaceStore.instance.getSpaceFilteredRoomIds(SpaceStore.instance.activeSpace).has(room.roomId)
+ ) {
+ parentSpace = SpaceStore.instance.activeSpace;
+ }
+ let buttons;
+ if (parentSpace) {
buttons =
;
}
const avatarUrl = room.currentState.getStateEvents(EventType.RoomAvatar, "")?.getContent()?.url;
diff --git a/src/components/views/rooms/RoomList.tsx b/src/components/views/rooms/RoomList.tsx
index 4378154d8f..963e94ebbb 100644
--- a/src/components/views/rooms/RoomList.tsx
+++ b/src/components/views/rooms/RoomList.tsx
@@ -20,6 +20,7 @@ import React, { ReactComponentElement } from "react";
import { Dispatcher } from "flux";
import { Room } from "matrix-js-sdk/src/models/room";
import * as fbEmitter from "fbemitter";
+import { EventType } from "matrix-js-sdk/src/@types/event";
import { _t, _td } from "../../../languageHandler";
import { RovingTabIndexProvider } from "../../../accessibility/RovingTabIndex";
@@ -48,9 +49,8 @@ import { IconizedContextMenuOption, IconizedContextMenuOptionList } from "../con
import AccessibleButton from "../elements/AccessibleButton";
import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore";
import CallHandler from "../../../CallHandler";
-import SpaceStore, { SUGGESTED_ROOMS } from "../../../stores/SpaceStore";
-import { showAddExistingRooms, showCreateNewRoom } from "../../../utils/space";
-import { EventType } from "matrix-js-sdk/src/@types/event";
+import SpaceStore, {SUGGESTED_ROOMS} from "../../../stores/SpaceStore";
+import {showAddExistingRooms, showCreateNewRoom, showSpaceInvite} from "../../../utils/space";
import {replaceableComponent} from "../../../utils/replaceableComponent";
import RoomAvatar from "../avatars/RoomAvatar";
import { ISpaceSummaryRoom } from "../../structures/SpaceRoomDirectory";
@@ -62,6 +62,7 @@ interface IProps {
onResize: () => void;
resizeNotifier: ResizeNotifier;
isMinimized: boolean;
+ activeSpace: Room;
}
interface IState {
@@ -194,8 +195,8 @@ const TAG_AESTHETICS: ITagAestheticsMap = {
: _t("You do not have permissions to add rooms to this space")}
/>
{_t( - "Without completing security on this session, it won’t have " + - "access to encrypted messages.", + "Without verifying, you won’t have access to all your messages " + + "and may appear as untrusted to others.", )}
-
{ _t("Add existing spaces/rooms") }
+{ _t("Add existing rooms") }
{ spaceOptionSection }
- {
- if (checked) {
- selectedToAdd.add(space);
- } else {
- selectedToAdd.delete(space);
- }
- setSelectedToAdd(new Set(selectedToAdd));
- }}
- />;
- }) }
-
- ) : null }
-
{ rooms.length > 0 ? (
{ _t("Spaces") }
- { spaces.map(space => { - return{ _t("Rooms") }
@@ -172,6 +151,27 @@ const AddExistingToSpaceDialog: React.FC
+ {
+ if (checked) {
+ selectedToAdd.add(space);
+ } else {
+ selectedToAdd.delete(space);
+ }
+ setSelectedToAdd(new Set(selectedToAdd));
+ }}
+ />;
+ }) }
+
+ ) : null }
+
{ spaces.length + rooms.length < 1 ?
{ _t("No results") }
: undefined }
@@ -185,8 +185,8 @@ const AddExistingToSpaceDialog: React.FC{ _t("Spaces") }
+ { spaces.map(space => { + return
+ {" " + _t("Invited people will be able to read old messages.")}
+ ;
+ }
+ }
} else if (this.props.kind === KIND_CALL_TRANSFER) {
title = _t("Transfer");
buttonText = _t("Transfer");
@@ -1321,6 +1368,7 @@ export default class InviteDialog extends React.PureComponent{this.state.errorText}
diff --git a/src/components/views/dialogs/SpaceSettingsDialog.tsx b/src/components/views/dialogs/SpaceSettingsDialog.tsx
index f6bf5b87e6..83f5d7141b 100644
--- a/src/components/views/dialogs/SpaceSettingsDialog.tsx
+++ b/src/components/views/dialogs/SpaceSettingsDialog.tsx
@@ -28,7 +28,6 @@ import {getTopic} from "../elements/RoomTopic";
import {avatarUrlForRoom} from "../../../Avatar";
import ToggleSwitch from "../elements/ToggleSwitch";
import AccessibleButton from "../elements/AccessibleButton";
-import FormButton from "../elements/FormButton";
import Modal from "../../../Modal";
import defaultDispatcher from "../../../dispatcher/dispatcher";
import {allSettled} from "../../../utils/promise";
@@ -127,23 +126,24 @@ const SpaceSettingsDialog: React.FC = ({ matrixClient: cli, space, onFin
{
defaultDispatcher.dispatch({
action: "leave_room",
room_id: space.roomId,
});
}}
- />
+ >
+ { _t("Leave Space") }
+
Modal.createDialog(DevtoolsDialog, {roomId: space.roomId})}>
@@ -152,7 +152,9 @@ const SpaceSettingsDialog: React.FC = ({ matrixClient: cli, space, onFin
{ _t("Cancel") }
-
+ { busy ? _t("Saving...") : _t("Save Changes") }
+
;
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index 308dc6d622..205597a1c4 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -50,7 +50,7 @@ export default class VerificationRequestDialog extends React.Component {
const member = this.props.member ||
otherUserId && MatrixClientPeg.get().getUser(otherUserId);
const title = request && request.isSelfVerification ?
- _t("Verify other session") : _t("Verification Request");
+ _t("Verify other login") : _t("Verification Request");
return
{ _t("Make this space private") }
setJoinRule(checked ? "private" : "invite")}
+ checked={joinRule !== "public"}
+ onChange={checked => setJoinRule(checked ? "invite" : "public")}
disabled={!canSetJoinRule}
aria-label={_t("Make this space private")}
/>
-
+
+};
+
+export default FacePile;
diff --git a/src/components/views/elements/SSOButtons.tsx b/src/components/views/elements/SSOButtons.tsx
index 4e41db0ae7..a9eb04d4ec 100644
--- a/src/components/views/elements/SSOButtons.tsx
+++ b/src/components/views/elements/SSOButtons.tsx
@@ -73,7 +73,7 @@ const SSOButton: React.FC
+ { shownMembers.map(member => {
+ return
+ ;
+ }) }
+
+ { onlyKnownUsers &&
+ { _t("%(count)s people you know have already joined", { count: members.length }) }
+ }
+
-
+ {
+ showSpaceInvite(parentSpace);
+ }}
+ >
+ {_t("Invite to %(spaceName)s", { spaceName: parentSpace.name })}
+
+ { room.canInvite(cli.getUserId()) && {
+ dis.dispatch({ action: "view_invite", roomId });
+ }}
+ >
+ {_t("Invite to just this room")}
+ }
+
;
+ } else if (room.canInvite(cli.getUserId())) {
+ buttons =
+ {
+ dis.dispatch({ action: "view_invite", roomId });
+ }}
+ >
{_t("Invite to this room")}
-
+
+
+ {_t("Invite people")}
+ }
+
+ {_t("Explore rooms")}
;
} else if (Object.values(this.state.sublists).some(list => list.length > 0)) {
diff --git a/src/components/views/rooms/RoomSublist.tsx b/src/components/views/rooms/RoomSublist.tsx
index eb821809d9..74052e8ba1 100644
--- a/src/components/views/rooms/RoomSublist.tsx
+++ b/src/components/views/rooms/RoomSublist.tsx
@@ -51,6 +51,7 @@ import { objectExcluding, objectHasDiff } from "../../../utils/objects";
import ExtraTile from "./ExtraTile";
import { ListNotificationState } from "../../../stores/notifications/ListNotificationState";
import IconizedContextMenu from "../context_menus/IconizedContextMenu";
+import { getKeyBindingsManager, RoomListAction } from "../../../KeyBindingsManager";
import {replaceableComponent} from "../../../utils/replaceableComponent";
const SHOW_N_BUTTON_HEIGHT = 28; // As defined by CSS
@@ -470,18 +471,19 @@ export default class RoomSublist extends React.Component{ _t("Quick actions") }
+ { this.props.activeSpace.canInvite(MatrixClientPeg.get().getUserId()) &&
{
@@ -208,6 +208,23 @@ export default class EventIndexPanel extends React.Component {
}
);
+ } else {
+ eventIndexingSettings = (
+
+
+ );
}
return eventIndexingSettings;
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index b7dbfa4a3b..b1ad9f3d23 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -206,10 +206,10 @@ export default class GeneralUserSettingsTab extends React.Component {
_onPasswordChangeError = (err) => {
// TODO: Figure out a design that doesn't involve replacing the current dialog
- let errMsg = err.error || "";
+ let errMsg = err.error || err.message || "";
if (err.httpStatus === 403) {
errMsg = _t("Failed to change password. Is your password correct?");
- } else if (err.httpStatus) {
+ } else if (!errMsg) {
errMsg += ` (HTTP status ${err.httpStatus})`;
}
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 238f875e22..0cd3dd6698 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -74,6 +74,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
this.state = {
autoLaunch: false,
autoLaunchSupported: false,
+ warnBeforeExit: true,
+ warnBeforeExitSupported: false,
alwaysShowMenuBar: true,
alwaysShowMenuBarSupported: false,
minimizeToTray: true,
@@ -96,6 +98,12 @@ export default class PreferencesUserSettingsTab extends React.Component {
autoLaunch = await platform.getAutoLaunchEnabled();
}
+ const warnBeforeExitSupported = await platform.supportsWarnBeforeExit();
+ let warnBeforeExit = false;
+ if (warnBeforeExitSupported) {
+ warnBeforeExit = await platform.shouldWarnBeforeExit();
+ }
+
const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
let alwaysShowMenuBar = true;
if (alwaysShowMenuBarSupported) {
@@ -111,6 +119,8 @@ export default class PreferencesUserSettingsTab extends React.Component {
this.setState({
autoLaunch,
autoLaunchSupported,
+ warnBeforeExit,
+ warnBeforeExitSupported,
alwaysShowMenuBarSupported,
alwaysShowMenuBar,
minimizeToTraySupported,
@@ -122,6 +132,10 @@ export default class PreferencesUserSettingsTab extends React.Component {
PlatformPeg.get().setAutoLaunchEnabled(checked).then(() => this.setState({autoLaunch: checked}));
};
+ _onWarnBeforeExitChange = (checked) => {
+ PlatformPeg.get().setWarnBeforeExit(checked).then(() => this.setState({warnBeforeExit: checked}));
+ }
+
_onAlwaysShowMenuBarChange = (checked) => {
PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
};
@@ -161,6 +175,14 @@ export default class PreferencesUserSettingsTab extends React.Component {
label={_t('Start automatically after system login')} />;
}
+ let warnBeforeExitOption = null;
+ if (this.state.warnBeforeExitSupported) {
+ warnBeforeExitOption = + {_t("Message search initilisation failed")} +
+ {EventIndexPeg.error && ( +
+
+ )}
+
+ {_t("Advanced")}
+
+ {EventIndexPeg.error.message}
+
+