Merge branch 't3chguy/fix/21502.2' of github.com:matrix-org/matrix-re…

…act-sdk into t3chguy/fix/21502.2

.github/workflows/element-build-and-test.yaml

@@ -23,14 +23,23 @@ jobs:
  cache: 'yarn'
 
  - name: Fetch layered build
- run: scripts/ci/layered.sh
+ id: layered_build
+ run: |
+ scripts/ci/layered.sh
+ JSSDK_SHA=$(git -C matrix-js-sdk rev-parse --short=12 HEAD)
+ REACT_SHA=$(git rev-parse --short=12 HEAD)
+ VECTOR_SHA=$(git -C element-web rev-parse --short=12 HEAD)
+ echo "::set-output name=VERSION::$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA"
 
  - name: Copy config
  run: cp element.io/develop/config.json config.json
  working-directory: ./element-web
 
  - name: Build
- run: CI_PACKAGE=true yarn build
+ env:
+ CI_PACKAGE: true
+ VERSION: "${{ steps.layered_build.outputs.VERSION }}"
+ run: yarn build
  working-directory: ./element-web
 
  - name: Upload Artifact

.github/workflows/netlify.yaml

@@ -7,26 +7,36 @@ on:
  types:
  - completed
 jobs:
- build:
+ deploy:
  runs-on: ubuntu-latest
- if: >
- ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request' }}
+ if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
  steps:
  - name: "🔍 Read PR number"
  id: readctx
- # we need to find the PR number that corresponds to the branch, which we do by
- # searching the GH API
+ # We need to find the PR number that corresponds to the branch, which we do by searching the GH API
  # The workflow_run event includes a list of pull requests, but it doesn't get populated for
  # forked PRs: https://docs.github.com/en/rest/reference/checks#create-a-check-run
  run: |
  head_branch='${{github.event.workflow_run.head_repository.owner.login}}:${{github.event.workflow_run.head_branch}}'
- echo "head branch: $head_branch"
+ echo "Head branch: $head_branch"
  pulls_uri="https://api.github.com/repos/${{ github.repository }}/pulls?head=$(jq -Rr '@uri' <<<$head_branch)"
  pr_number=$(curl -s -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' "$pulls_uri" |
  jq -r '.[] | .number')
  echo "PR number: $pr_number"
  echo "::set-output name=prnumber::$pr_number"
 
+ - name: Create Deployment ID
+ uses: altinukshini/deployment-action@v1.2.6
+ id: deployment
+ with:
+ token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+ pr: true
+ pr_id: ${{ steps.readctx.outputs.prnumber }}
+ transient_environment: true
+ environment: Netlify
+ initial_status: in_progress
+ ref: ${{ github.event.workflow_run.head_sha }}
+
  # There's a 'download artifact' action but it hasn't been updated for the
  # workflow_run action (https://github.com/actions/download-artifact/issues/60)
  # so instead we get this mess:
@@ -69,12 +79,25 @@ jobs:
  NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
  timeout-minutes: 1
 
- - name: Edit PR Description
- uses: Beakyn/gha-comment-pull-request@2167a7aee24f9e61ce76a23039f322e49a990409
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Update deployment status (success)
+ if: success()
+ uses: altinukshini/deployment-status@v1.0.1
+ with:
+ token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+ environment_url: ${{ steps.netlify.outputs.deploy-url }}
+ state: "success"
+ deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+ pr: true
+ pr_id: ${{ steps.readctx.outputs.prnumber }}
+ description: |
+ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware.
+ Exercise caution. Use test accounts.
+ - name: Update deployment status (failure)
+ if: failure()
+ uses: altinukshini/deployment-status@v1.0.1
  with:
- pull-request-number: ${{ steps.readctx.outputs.prnumber }}
- description-message: |
- Preview: ${{ steps.netlify.outputs.deploy-url }}
- ⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
+ token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
+ state: "failure"
+ deployment_id: ${{ steps.deployment.outputs.deployment_id }}
+ pr: true
+ pr_id: ${{ steps.readctx.outputs.prnumber }}

CHANGELOG.md

@@ -1,3 +1,54 @@
+Changes in [3.43.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.43.0) (2022-04-26)
+=====================================================================================================
+
+## ✨ Features
+ * Improve performance of switching to rooms with lots of servers and ACLs ([\#8347](https://github.com/matrix-org/matrix-react-sdk/pull/8347)).
+ * Avoid a reflow when setting caret position on an empty composer ([\#8348](https://github.com/matrix-org/matrix-react-sdk/pull/8348)).
+ * Add message right-click context menu as a labs feature ([\#5672](https://github.com/matrix-org/matrix-react-sdk/pull/5672)).
+ * Live location sharing - basic maximised beacon map ([\#8310](https://github.com/matrix-org/matrix-react-sdk/pull/8310)).
+ * Live location sharing - render users own beacons in timeline ([\#8296](https://github.com/matrix-org/matrix-react-sdk/pull/8296)).
+ * Improve Threads beta around degraded mode ([\#8318](https://github.com/matrix-org/matrix-react-sdk/pull/8318)).
+ * Live location sharing - beacon in timeline happy path ([\#8285](https://github.com/matrix-org/matrix-react-sdk/pull/8285)).
+ * Add copy button to View Source screen ([\#8278](https://github.com/matrix-org/matrix-react-sdk/pull/8278)). Fixes vector-im/element-web#21482. Contributed by @olivialivia.
+ * Add heart effect ([\#6188](https://github.com/matrix-org/matrix-react-sdk/pull/6188)). Contributed by @CicadaCinema.
+ * Update new room icon ([\#8239](https://github.com/matrix-org/matrix-react-sdk/pull/8239)).
+
+## 🐛 Bug Fixes
+ * Fix: "Code formatting button does not escape backticks" ([\#8181](https://github.com/matrix-org/matrix-react-sdk/pull/8181)). Contributed by @yaya-usman.
+ * Fix beta indicator dot causing excessive CPU usage ([\#8340](https://github.com/matrix-org/matrix-react-sdk/pull/8340)). Fixes vector-im/element-web#21793.
+ * Fix overlapping timestamps on empty messages ([\#8205](https://github.com/matrix-org/matrix-react-sdk/pull/8205)). Fixes vector-im/element-web#21381. Contributed by @goelesha.
+ * Fix power selector not showing up in user info when state_default undefined ([\#8297](https://github.com/matrix-org/matrix-react-sdk/pull/8297)). Fixes vector-im/element-web#21669.
+ * Avoid looking up settings during timeline rendering ([\#8313](https://github.com/matrix-org/matrix-react-sdk/pull/8313)). Fixes vector-im/element-web#21740.
+ * Fix a soft crash with video rooms ([\#8333](https://github.com/matrix-org/matrix-react-sdk/pull/8333)).
+ * Fixes call tiles overflow ([\#8096](https://github.com/matrix-org/matrix-react-sdk/pull/8096)). Fixes vector-im/element-web#20254. Contributed by @luixxiul.
+ * Fix a bug with emoji autocomplete sorting where adding the final ":" would cause the emoji with the typed shortcode to no longer be at the top of the autocomplete list. ([\#8086](https://github.com/matrix-org/matrix-react-sdk/pull/8086)). Fixes vector-im/element-web#19302. Contributed by @commonlawfeature.
+ * Fix image preview sizing for edge cases ([\#8322](https://github.com/matrix-org/matrix-react-sdk/pull/8322)). Fixes vector-im/element-web#20088.
+ * Refactor SecurityRoomSettingsTab and remove unused state ([\#8306](https://github.com/matrix-org/matrix-react-sdk/pull/8306)). Fixes matrix-org/element-web-rageshakes#12002.
+ * Don't show the prompt to enable desktop notifications immediately after registration ([\#8274](https://github.com/matrix-org/matrix-react-sdk/pull/8274)).
+ * Stop tracking threads if threads support is disabled ([\#8308](https://github.com/matrix-org/matrix-react-sdk/pull/8308)). Fixes vector-im/element-web#21766.
+ * Fix some issues with threads rendering ([\#8305](https://github.com/matrix-org/matrix-react-sdk/pull/8305)). Fixes vector-im/element-web#21670.
+ * Fix threads rendering issue in Safari ([\#8298](https://github.com/matrix-org/matrix-react-sdk/pull/8298)). Fixes vector-im/element-web#21757.
+ * Fix space panel width change on hovering over space item ([\#8299](https://github.com/matrix-org/matrix-react-sdk/pull/8299)). Fixes vector-im/element-web#19891.
+ * Hide the reply in thread button in deployments where beta is forcibly disabled ([\#8294](https://github.com/matrix-org/matrix-react-sdk/pull/8294)). Fixes vector-im/element-web#21753.
+ * Prevent soft crash around room list header context menu when space changes ([\#8289](https://github.com/matrix-org/matrix-react-sdk/pull/8289)). Fixes matrix-org/element-web-rageshakes#11416, matrix-org/element-web-rageshakes#11692, matrix-org/element-web-rageshakes#11739, matrix-org/element-web-rageshakes#11772, matrix-org/element-web-rageshakes#11891 matrix-org/element-web-rageshakes#11858 and matrix-org/element-web-rageshakes#11456.
+ * When selecting reply in thread on a thread response open existing thread ([\#8291](https://github.com/matrix-org/matrix-react-sdk/pull/8291)). Fixes vector-im/element-web#21743.
+ * Handle thread bundled relationships coming from the server via MSC3666 ([\#8292](https://github.com/matrix-org/matrix-react-sdk/pull/8292)). Fixes vector-im/element-web#21450.
+ * Fix: Avatar preview does not update when same file is selected repeatedly ([\#8288](https://github.com/matrix-org/matrix-react-sdk/pull/8288)). Fixes vector-im/element-web#20098.
+ * Fix a bug where user gets a warning when changing powerlevel from **Admin** to **custom level (100)** ([\#8248](https://github.com/matrix-org/matrix-react-sdk/pull/8248)). Fixes vector-im/element-web#21682. Contributed by @Jumeb.
+ * Use a consistent alignment for all text items in a list ([\#8276](https://github.com/matrix-org/matrix-react-sdk/pull/8276)). Fixes vector-im/element-web#21731. Contributed by @luixxiul.
+ * Fixes button labels being collapsed per a character in CJK languages ([\#8212](https://github.com/matrix-org/matrix-react-sdk/pull/8212)). Fixes vector-im/element-web#21287. Contributed by @luixxiul.
+ * Fix: Remove jittery timeline scrolling after jumping to an event ([\#8263](https://github.com/matrix-org/matrix-react-sdk/pull/8263)).
+ * Fix regression of edits showing up in the timeline with hidden events shown ([\#8260](https://github.com/matrix-org/matrix-react-sdk/pull/8260)). Fixes vector-im/element-web#21694.
+ * Fix reporting events not working ([\#8257](https://github.com/matrix-org/matrix-react-sdk/pull/8257)). Fixes vector-im/element-web#21713.
+ * Make Jitsi widgets in video rooms immutable ([\#8244](https://github.com/matrix-org/matrix-react-sdk/pull/8244)). Fixes vector-im/element-web#21647.
+ * Fix: Ensure links to events scroll the correct events into view ([\#8250](https://github.com/matrix-org/matrix-react-sdk/pull/8250)). Fixes vector-im/element-web#19934.
+
+Changes in [3.42.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.4) (2022-04-14)
+=====================================================================================================
+
+## 🐛 Bug Fixes
+ * Fixes around threads beta in degraded mode ([\#8319](https://github.com/matrix-org/matrix-react-sdk/pull/8319)). Fixes vector-im/element-web#21762.
+
 Changes in [3.42.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.42.3) (2022-04-12)
 =====================================================================================================
 
@@ -477,7 +528,7 @@ Changes in [3.39.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/
 =====================================================================================================
 
 ## 🐛 Bug Fixes
- * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797. 
+ * Fix the sticker picker ([\#7692](https://github.com/matrix-org/matrix-react-sdk/pull/7692)). Fixes vector-im/element-web#20797.
  * Ensure UserInfo can be rendered without a room ([\#7687](https://github.com/matrix-org/matrix-react-sdk/pull/7687)). Fixes vector-im/element-web#20830.
  * Fix publishing address wrongly demanding the alias be available ([\#7690](https://github.com/matrix-org/matrix-react-sdk/pull/7690)). Fixes vector-im/element-web#12013 and vector-im/element-web#20833.
 
@@ -1336,7 +1387,7 @@ Changes in [3.32.1](https://github.com/vector-im/element-desktop/releases/tag/v3
 ## 🐛 Bug Fixes
 
  * Upgrade to matrix-js-sdk#14.0.1
- 
+
 Changes in [3.32.0](https://github.com/vector-im/element-desktop/releases/tag/v3.32.0) (2021-10-11)
 ===================================================================================================
 
@@ -2482,7 +2533,7 @@ related to file upload. When uploading a file, the local file preview can lead
 to execution of scripts embedded in the uploaded file, but only after several
 user interactions to open the preview in a separate tab. This only impacts the
 local user while in the process of uploading. It cannot be exploited remotely
-or by other users. Thanks to [Muhammad Zaid Ghifari](https://github.com/MR-ZHEEV) 
+or by other users. Thanks to [Muhammad Zaid Ghifari](https://github.com/MR-ZHEEV)
 for responsibly disclosing this via Matrix's Security Disclosure Policy.
 
 ## All changes
@@ -6477,7 +6528,7 @@ Changes in [2.1.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v2.1.0-rc.1...v2.1.0-rc.2)
 
- * Fix error in previous attempt to upgrade JS SDK 
+ * Fix error in previous attempt to upgrade JS SDK
 
 Changes in [2.1.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v2.1.0-rc.1) (2020-02-13)
 =============================================================================================================

package.json

@@ -1,6 +1,6 @@
 {
  "name": "matrix-react-sdk",
- "version": "3.42.3",
+ "version": "3.43.0",
  "description": "SDK for matrix.org using React",
  "author": "matrix.org",
  "repository": {
@@ -22,7 +22,7 @@
  "README.md",
  "package.json"
  ],
- "main": "./src/index.ts",
+ "main": "./lib/index.ts",
  "matrix_src_main": "./src/index.ts",
  "matrix_lib_main": "./lib/index.ts",
  "matrix_lib_typings": "./lib/index.d.ts",
@@ -88,7 +88,7 @@
  "linkifyjs": "^4.0.0-beta.4",
  "lodash": "^4.17.20",
  "maplibre-gl": "^1.15.2",
- "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#daad3faed54f0b1f1e026a7498b4653e4d01cd90",
+ "matrix-analytics-events": "github:matrix-org/matrix-analytics-events.git#4aef17b56798639906f26a8739043a3c5c5fde7e",
  "matrix-encrypt-attachment": "^1.0.3",
  "matrix-events-sdk": "^0.0.1-beta.7",
  "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
@@ -236,5 +236,6 @@
  "text",
  "json"
  ]
- }
+ },
+ "typings": "./lib/index.d.ts"
 }

src/components/structures/HomePage.tsx

@@ -34,13 +34,15 @@ import Analytics from "../../Analytics";
 import PosthogTrackers from "../../PosthogTrackers";
 import EmbeddedPage from "./EmbeddedPage";
 
-const onClickSendDm = () => {
+const onClickSendDm = (ev: ButtonEvent) => {
  Analytics.trackEvent('home_page', 'button', 'dm');
+ PosthogTrackers.trackInteraction("WebHomeCreateChatButton", ev);
  dis.dispatch({ action: 'view_create_chat' });
 };
 
-const onClickExplore = () => {
+const onClickExplore = (ev: ButtonEvent) => {
  Analytics.trackEvent('home_page', 'button', 'room_directory');
+ PosthogTrackers.trackInteraction("WebHomeExploreRoomsButton", ev);
  dis.fire(Action.ViewRoomDirectory);
 };
 

src/components/structures/LeftPanel.tsx

@@ -43,6 +43,8 @@ import SettingsStore from "../../settings/SettingsStore";
 import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
 import { shouldShowComponent } from "../../customisations/helpers/UIComponents";
 import { UIComponent } from "../../settings/UIFeature";
+import { ButtonEvent } from "../views/elements/AccessibleButton";
+import PosthogTrackers from "../../PosthogTrackers";
 
 interface IProps {
  isMinimized: boolean;
@@ -116,8 +118,9 @@ export default class LeftPanel extends React.Component<IProps, IState> {
  dis.fire(Action.OpenDialPad);
  };
 
- private onExplore = () => {
+ private onExplore = (ev: ButtonEvent) => {
  dis.fire(Action.ViewRoomDirectory);
+ PosthogTrackers.trackInteraction("WebLeftPanelExploreRoomsButton", ev);
  };
 
  private refreshStickyHeaders = () => {

src/components/structures/MessagePanel.tsx

@@ -92,9 +92,13 @@ export function shouldFormContinuation(
  mxEvent.sender.name !== prevEvent.sender.name ||
  mxEvent.sender.getMxcAvatarUrl() !== prevEvent.sender.getMxcAvatarUrl()) return false;
 
- // Thread summaries in the main timeline should break up a continuation
- if (threadsEnabled && prevEvent.isThreadRoot &&
- timelineRenderingType !== TimelineRenderingType.Thread) return false;
+ // Thread summaries in the main timeline should break up a continuation on both sides
+ if (threadsEnabled &&
+ (mxEvent.isThreadRoot || prevEvent.isThreadRoot) &&
+ timelineRenderingType !== TimelineRenderingType.Thread
+ ) {
+ return false;
+ }
 
  // if we don't have tile for previous event then it was shown by showHiddenEvents and has no SenderProfile
  if (!haveRendererForEvent(prevEvent, showHiddenEvents)) return false;

src/components/views/avatars/MemberAvatar.tsx

@@ -30,7 +30,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 
 interface IProps extends Omit<React.ComponentProps<typeof BaseAvatar>, "name" | "idName" | "url"> {
- member: RoomMember;
+ member: RoomMember | null;
  fallbackUserId?: string;
  width: number;
  height: number;
@@ -107,8 +107,16 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
  }
 
  render() {
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- let { member, fallbackUserId, onClick, viewUserOnClick, forceHistorical, ...otherProps } = this.props;
+ let {
+ member,
+ fallbackUserId,
+ onClick,
+ viewUserOnClick,
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ forceHistorical,
+ hideTitle,
+ ...otherProps
+ } = this.props;
  const userId = member ? member.userId : fallbackUserId;
 
  if (viewUserOnClick) {
@@ -125,7 +133,7 @@ export default class MemberAvatar extends React.PureComponent<IProps, IState> {
  <BaseAvatar
  {...otherProps}
  name={this.state.name}
- title={this.props.hideTitle ? undefined : this.state.title}
+ title={hideTitle ? undefined : this.state.title}
  idName={userId}
  url={this.state.imageUrl}
  onClick={onClick}

src/components/views/messages/MessageActionBar.tsx

@@ -308,6 +308,11 @@ export default class MessageActionBar extends React.PureComponent<IMessageAction
  ];
 
  private get showReplyInThreadAction(): boolean {
+ if (!SettingsStore.getValue("feature_thread") && !Thread.hasServerSideSupport) {
+ // hide the prompt if the user would only have degraded mode
+ return null;
+ }
+
  if (!SettingsStore.getBetaInfo("feature_thread") &&
  !SettingsStore.getValue("feature_thread") &&
  !SdkConfig.get("show_labs_settings")

src/components/views/rooms/EventTile.tsx

@@ -96,7 +96,7 @@ export type GetRelationsForEvent = (eventId: string, relationType: string, event
 
 export interface IReadReceiptProps {
  userId: string;
- roomMember: RoomMember;
+ roomMember: RoomMember | null;
  ts: number;
 }