Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19304

Author: t3chguy

res/css/_components.scss

@@ -39,6 +39,7 @@
 @import "./structures/_ViewSource.scss";
 @import "./structures/auth/_CompleteSecurity.scss";
 @import "./structures/auth/_Login.scss";
+@import "./structures/auth/_SetupEncryptionBody.scss";
 @import "./views/audio_messages/_AudioPlayer.scss";
 @import "./views/audio_messages/_PlayPauseButton.scss";
 @import "./views/audio_messages/_PlaybackContainer.scss";

res/css/structures/auth/_CompleteSecurity.scss

@@ -33,6 +33,19 @@ limitations under the License.
  margin: 0 auto;
 }
 
+.mx_CompleteSecurity_skip {
+ mask: url('$(res)/img/feather-customised/cancel.svg');
+ mask-repeat: no-repeat;
+ mask-position: center;
+ mask-size: cover;
+ width: 18px;
+ height: 18px;
+ background-color: $dialog-close-fg-color;
+ cursor: pointer;
+ position: absolute;
+ right: 24px;
+}
+
 .mx_CompleteSecurity_body {
  font-size: $font-15px;
 }

src/contexts/MatrixClientContext.ts renamed to res/css/structures/auth/_SetupEncryptionBody.scss

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 The Matrix.org Foundation C.I.C.
+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.
@@ -14,9 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { createContext } from "react";
-import { MatrixClient } from "matrix-js-sdk/src/client";
+.mx_SetupEncryptionBody_reset {
+ color: $light-fg-color;
+ margin-top: $font-14px;
 
-const MatrixClientContext = createContext<MatrixClient>(undefined);
-MatrixClientContext.displayName = "MatrixClientContext";
-export default MatrixClientContext;
+ a.mx_SetupEncryptionBody_reset_link:is(:link, :hover, :visited) {
+ color: $warning-color;
+ }
+}

res/css/views/dialogs/_AddExistingToSpaceDialog.scss

@@ -75,7 +75,7 @@ limitations under the License.
  @mixin ProgressBarBorderRadius 8px;
  }
 
- .mx_AddExistingToSpace_progressText {
+ .mx_AddExistingToSpaceDialog_progressText {
  margin-top: 8px;
  font-size: $font-15px;
  line-height: $font-24px;

res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss

@@ -74,6 +74,7 @@ limitations under the License.
  font-size: $font-12px;
  line-height: $font-15px;
  color: $secondary-content;
+ margin-top: -13px; // match height of buttons to prevent height changing
 
  .mx_ProgressBar {
  height: 8px;

res/css/views/settings/_ProfileSettings.scss

@@ -67,5 +67,7 @@ limitations under the License.
 
  > .mx_AccessibleButton_kind_link {
  padding-left: 0; // to align with left side
+ padding-right: 0;
+ margin-right: 10px;
  }
 }

src/Avatar.ts

@@ -142,15 +142,11 @@ export function avatarUrlForRoom(room: Room, width: number, height: number, resi
  // space rooms cannot be DMs so skip the rest
  if (SpaceStore.spacesEnabled && room.isSpaceRoom()) return null;
 
- let otherMember = null;
- const otherUserId = DMRoomMap.shared().getUserIdForRoomId(room.roomId);
- if (otherUserId) {
- otherMember = room.getMember(otherUserId);
- } else {
- // if the room is not marked as a 1:1, but only has max 2 members
- // then still try to show any avatar (pref. other member)
- otherMember = room.getAvatarFallbackMember();
- }
+ // If the room is not a DM don't fallback to a member avatar
+ if (!DMRoomMap.shared().getUserIdForRoomId(room.roomId)) return null;
+
+ // If there are only two members in the DM use the avatar of the other member
+ const otherMember = room.getAvatarFallbackMember();
  if (otherMember?.getMxcAvatarUrl()) {
  return mediaFromMxc(otherMember.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
  }

src/RoomInvite.tsx

@@ -42,10 +42,15 @@ export interface IInviteResult {
  *
  * @param {string} roomId The ID of the room to invite to
  * @param {string[]} addresses Array of strings of addresses to invite. May be matrix IDs or 3pids.
+ * @param {function} progressCallback optional callback, fired after each invite.
  * @returns {Promise} Promise
  */
-export function inviteMultipleToRoom(roomId: string, addresses: string[]): Promise<IInviteResult> {
- const inviter = new MultiInviter(roomId);
+export function inviteMultipleToRoom(
+ roomId: string,
+ addresses: string[],
+ progressCallback?: () => void,
+): Promise<IInviteResult> {
+ const inviter = new MultiInviter(roomId, progressCallback);
  return inviter.invite(addresses).then(states => Promise.resolve({ states, inviter }));
 }
 
@@ -104,8 +109,8 @@ export function isValid3pidInvite(event: MatrixEvent): boolean {
  return true;
 }
 
-export function inviteUsersToRoom(roomId: string, userIds: string[]): Promise<void> {
- return inviteMultipleToRoom(roomId, userIds).then((result) => {
+export function inviteUsersToRoom(roomId: string, userIds: string[], progressCallback?: () => void): Promise<void> {
+ return inviteMultipleToRoom(roomId, userIds, progressCallback).then((result) => {
  const room = MatrixClientPeg.get().getRoom(roomId);
  showAnyInviteErrors(result.states, room, result.inviter);
  }).catch((err) => {

src/ScalarMessaging.ts

@@ -452,7 +452,9 @@ function setBotOptions(event: MessageEvent<any>, roomId: string, userId: string)
  });
 }
 
-function setBotPower(event: MessageEvent<any>, roomId: string, userId: string, level: number): void {
+async function setBotPower(
+ event: MessageEvent<any>, roomId: string, userId: string, level: number, ignoreIfGreater?: boolean,
+): Promise<void> {
  if (!(Number.isInteger(level) && level >= 0)) {
  sendError(event, _t('Power level must be positive integer.'));
  return;
@@ -465,22 +467,34 @@ function setBotPower(event: MessageEvent<any>, roomId: string, userId: string, l
  return;
  }
 
- client.getStateEvent(roomId, "m.room.power_levels", "").then((powerLevels) => {
- const powerEvent = new MatrixEvent(
+ try {
+ const powerLevels = await client.getStateEvent(roomId, "m.room.power_levels", "");
+
+ // If the PL is equal to or greater than the requested PL, ignore.
+ if (ignoreIfGreater === true) {
+ // As per https://matrix.org/docs/spec/client_server/r0.6.0#m-room-power-levels
+ const currentPl = (
+ powerLevels.content.users && powerLevels.content.users[userId]
+ ) || powerLevels.content.users_default || 0;
+
+ if (currentPl >= level) {
+ return sendResponse(event, {
+ success: true,
+ });
+ }
+ }
+ await client.setPowerLevel(roomId, userId, level, new MatrixEvent(
  {
  type: "m.room.power_levels",
  content: powerLevels,
  },
- );
-
- client.setPowerLevel(roomId, userId, level, powerEvent).then(() => {
- sendResponse(event, {
- success: true,
- });
- }, (err) => {
- sendError(event, err.message ? err.message : _t('Failed to send request.'), err);
+ ));
+ return sendResponse(event, {
+ success: true,
  });
- });
+ } catch (err) {
+ sendError(event, err.message ? err.message : _t('Failed to send request.'), err);
+ }
 }
 
 function getMembershipState(event: MessageEvent<any>, roomId: string, userId: string): void {
@@ -678,7 +692,7 @@ const onMessage = function(event: MessageEvent<any>): void {
  setBotOptions(event, roomId, userId);
  break;
  case Action.SetBotPower:
- setBotPower(event, roomId, userId, event.data.level);
+ setBotPower(event, roomId, userId, event.data.level, event.data.ignoreIfGreater);
  break;
  default:
  console.warn("Unhandled postMessage event with action '" + event.data.action +"'");

src/components/structures/ContextMenu.tsx

@@ -226,6 +226,11 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
  }
  };
 
+ private onClick = (ev: React.MouseEvent) => {
+ // Don't allow clicks to escape the context menu wrapper
+ ev.stopPropagation();
+ };
+
  private onKeyDown = (ev: React.KeyboardEvent) => {
  // don't let keyboard handling escape the context menu
  ev.stopPropagation();
@@ -383,6 +388,7 @@ export class ContextMenu extends React.PureComponent<IProps, IState> {
  className={classNames("mx_ContextualMenu_wrapper", this.props.wrapperClassName)}
  style={{ ...position, ...wrapperStyle }}
  onKeyDown={this.onKeyDown}
+ onClick={this.onClick}
  onContextMenu={this.onContextMenuPreventBubbling}
  >
  <div