-
- );
- } else if (this.props.isInvite && this.props.list.length) {
- // no notifications but highlight anyway because this is an invite badge
- badge = (
-
-
- { this.props.list.length }
-
-
- );
- }
- }
-
// When collapsed, allow a long hover on the header to show user
// the full tag name and room count
let title;
@@ -305,17 +275,6 @@ export default class RoomSubList extends React.PureComponent {
;
}
- let addRoomButton;
- if (this.props.onAddRoom) {
- addRoomButton = (
-
- );
- }
-
const len = this.props.list.length + this.props.extraTiles.length;
let chevron;
if (len) {
@@ -327,25 +286,81 @@ export default class RoomSubList extends React.PureComponent {
chevron = ();
}
- return (
-
- );
+ return
+ {({onFocus, isActive, ref}) => {
+ const tabIndex = isActive ? 0 : -1;
+
+ let badge;
+ if (!this.props.collapsed) {
+ const badgeClasses = classNames({
+ 'mx_RoomSubList_badge': true,
+ 'mx_RoomSubList_badgeHighlight': subListNotifHighlight,
+ });
+ // Wrap the contents in a div and apply styles to the child div so that the browser default outline works
+ if (subListNotifCount > 0) {
+ badge = (
+
+
+
+ );
+ } else if (this.props.isInvite && this.props.list.length) {
+ // no notifications but highlight anyway because this is an invite badge
+ badge = (
+
+
+ { _t("You can use /help to list available commands. " +
+ "Did you mean to send this as a message?", {}, {
+ code: t => { t },
+ }) }
+
+
+ { _t("Hint: Begin your message with // to start it with a slash.", {}, {
+ code: t => { t },
+ }) }
+
+
,
+ button: _t('Send as message'),
+ });
+ const [sendAnyway] = await finished;
+ // if !sendAnyway bail to let the user edit the composer and try again
+ if (!sendAnyway) return;
+ }
+ }
+
+ if (shouldSend) {
const isReply = !!RoomViewStore.getQuotingEvent();
const {roomId} = this.props.room;
const content = createMessageContent(this.model, this.props.permalinkCreator);
@@ -253,6 +296,7 @@ export default class SendMessageComposer extends React.Component {
});
}
}
+
this.sendHistoryManager.save(this.model);
// clear composer
this.model.reset([]);
@@ -326,7 +370,8 @@ export default class SendMessageComposer extends React.Component {
member.rawDisplayName : userId;
const caret = this._editorRef.getCaret();
const position = model.positionForOffset(caret.offset, caret.atNodeEnd);
- const insertIndex = position.index + 1;
+ // index is -1 if there are no parts but we only care for if this would be the part in position 0
+ const insertIndex = position.index > 0 ? position.index : 0;
const parts = partCreator.createMentionParts(insertIndex, displayName, userId);
model.transform(() => {
const addedLen = model.insert(parts, position);
diff --git a/src/components/views/settings/CrossSigningPanel.js b/src/components/views/settings/CrossSigningPanel.js
index 49046cd051..f7d3d62b4f 100644
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@@ -1,5 +1,5 @@
/*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019, 2020 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.
@@ -29,7 +29,9 @@ export default class CrossSigningPanel extends React.PureComponent {
this.state = {
error: null,
- ...this._getUpdatedStatus(),
+ crossSigningPublicKeysOnDevice: false,
+ crossSigningPrivateKeysInStorage: false,
+ secretStorageKeyInAccount: false,
};
}
@@ -38,6 +40,7 @@ export default class CrossSigningPanel extends React.PureComponent {
cli.on("accountData", this.onAccountData);
cli.on("userTrustStatusChanged", this.onStatusChanged);
cli.on("crossSigning.keysChanged", this.onStatusChanged);
+ this._getUpdatedStatus();
}
componentWillUnmount() {
@@ -52,12 +55,12 @@ export default class CrossSigningPanel extends React.PureComponent {
onAccountData = (event) => {
const type = event.getType();
if (type.startsWith("m.cross_signing") || type.startsWith("m.secret_storage")) {
- this.setState(this._getUpdatedStatus());
+ this._getUpdatedStatus();
}
};
onStatusChanged = () => {
- this.setState(this._getUpdatedStatus());
+ this._getUpdatedStatus();
};
async _getUpdatedStatus() {
@@ -69,11 +72,11 @@ export default class CrossSigningPanel extends React.PureComponent {
const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
const secretStorageKeyInAccount = await secretStorage.hasKey();
- return {
+ this.setState({
crossSigningPublicKeysOnDevice,
crossSigningPrivateKeysInStorage,
secretStorageKeyInAccount,
- };
+ });
}
/**
@@ -93,7 +96,7 @@ export default class CrossSigningPanel extends React.PureComponent {
console.error("Error bootstrapping secret storage", e);
}
if (this._unmounted) return;
- this.setState(this._getUpdatedStatus());
+ this._getUpdatedStatus();
}
render() {
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
index ab71de86b9..a245c7c7b9 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.js
@@ -21,15 +21,10 @@ import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import AccessibleButton from "../../../elements/AccessibleButton";
import SdkConfig from "../../../../../SdkConfig";
import createRoom from "../../../../../createRoom";
-import packageJson from "../../../../../../package.json";
import Modal from "../../../../../Modal";
import * as sdk from "../../../../../";
import PlatformPeg from "../../../../../PlatformPeg";
-// if this looks like a release, use the 'version' from package.json; else use
-// the git sha. Prepend version with v, to look like riot-web version
-const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '';
-
// Simple method to help prettify GH Release Tags and Commit Hashes.
const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
const ghVersionLabel = function(repo, token='') {
@@ -188,9 +183,6 @@ export default class HelpUserSettingsTab extends React.Component {
);
}
- const reactSdkVersion = REACT_SDK_VERSION !== ''
- ? ghVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION)
- : REACT_SDK_VERSION;
const vectorVersion = this.state.vectorVersion
? ghVersionLabel('vector-im/riot-web', this.state.vectorVersion)
: 'unknown';
@@ -243,7 +235,6 @@ export default class HelpUserSettingsTab extends React.Component {
{_t("Versions")}
- {_t("matrix-react-sdk version:")} {reactSdkVersion}
{_t("riot-web version:")} {vectorVersion}
{_t("olm version:")} {olmVersion}
{updateButton}
diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index a55eed97da..ba380f2809 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -61,18 +61,26 @@ export function textSerialize(model) {
}
export function containsEmote(model) {
+ return startsWith(model, "/me ");
+}
+
+export function startsWith(model, prefix) {
const firstPart = model.parts[0];
// part type will be "plain" while editing,
// and "command" while composing a message.
return firstPart &&
(firstPart.type === "plain" || firstPart.type === "command") &&
- firstPart.text.startsWith("/me ");
+ firstPart.text.startsWith(prefix);
}
export function stripEmoteCommand(model) {
// trim "/me "
+ return stripPrefix(model, "/me ");
+}
+
+export function stripPrefix(model, prefix) {
model = model.clone();
- model.removeText({index: 0, offset: 0}, 4);
+ model.removeText({index: 0, offset: 0}, prefix.length);
return model;
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 22c09b5ae6..62373e8092 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -200,7 +200,6 @@
"Sends the given message coloured as a rainbow": "Sends the given message coloured as a rainbow",
"Sends the given emote coloured as a rainbow": "Sends the given emote coloured as a rainbow",
"Displays list of commands with usages and descriptions": "Displays list of commands with usages and descriptions",
- "Unrecognised command:": "Unrecognised command:",
"Reason": "Reason",
"%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
"%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
@@ -688,7 +687,6 @@
"Clear cache and reload": "Clear cache and reload",
"FAQ": "FAQ",
"Versions": "Versions",
- "matrix-react-sdk version:": "matrix-react-sdk version:",
"riot-web version:": "riot-web version:",
"olm version:": "olm version:",
"Homeserver is": "Homeserver is",
@@ -905,6 +903,7 @@
"This message cannot be decrypted": "This message cannot be decrypted",
"Encrypted by an unverified device": "Encrypted by an unverified device",
"Unencrypted": "Unencrypted",
+ "Encrypted by a deleted device": "Encrypted by a deleted device",
"Please select the destination room for this message": "Please select the destination room for this message",
"Scroll to bottom of page": "Scroll to bottom of page",
"Close preview": "Close preview",
@@ -1077,6 +1076,11 @@
"Server error": "Server error",
"Command error": "Command error",
"Server unavailable, overloaded, or something else went wrong.": "Server unavailable, overloaded, or something else went wrong.",
+ "Unknown Command": "Unknown Command",
+ "Unrecognised command: %(commandText)s": "Unrecognised command: %(commandText)s",
+ "You can use /help to list available commands. Did you mean to send this as a message?": "You can use /help to list available commands. Did you mean to send this as a message?",
+ "Hint: Begin your message with // to start it with a slash.": "Hint: Begin your message with // to start it with a slash.",
+ "Send as message": "Send as message",
"Failed to connect to integration manager": "Failed to connect to integration manager",
"You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
"Add some now": "Add some now",
diff --git a/test/accessibility/RovingTabIndex-test.js b/test/accessibility/RovingTabIndex-test.js
new file mode 100644
index 0000000000..8be4a2976c
--- /dev/null
+++ b/test/accessibility/RovingTabIndex-test.js
@@ -0,0 +1,121 @@
+/*
+Copyright 2020 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 Adapter from "enzyme-adapter-react-16";
+import { configure, mount } from "enzyme";
+
+import {
+ RovingTabIndexProvider,
+ RovingTabIndexWrapper,
+ useRovingTabIndex,
+} from "../../src/accessibility/RovingTabIndex";
+
+configure({ adapter: new Adapter() });
+
+const Button = (props) => {
+ const [onFocus, isActive, ref] = useRovingTabIndex();
+ return ;
+};
+
+const checkTabIndexes = (buttons, expectations) => {
+ expect(buttons.length).toBe(expectations.length);
+ for (let i = 0; i < buttons.length; i++) {
+ expect(buttons.at(i).prop("tabIndex")).toBe(expectations[i]);
+ }
+};
+
+// give the buttons keys for the fibre reconciler to not treat them all as the same
+const button1 = ;
+const button2 = ;
+const button3 = ;
+const button4 = ;
+
+describe("RovingTabIndex", () => {
+ it("RovingTabIndexProvider renders children as expected", () => {
+ const wrapper = mount(
+ {() =>