Merge branch 'develop' into verji-develop

verji · Aug 15, 2024 · 4a10fd0 · 4a10fd0
2 parents c0336d5 + 040bacb
commit 4a10fd0
Show file tree

Hide file tree

Showing 221 changed files with 3,564 additions and 7,471 deletions.
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
@@ -1,6 +1,5 @@
 name: Static Analysis
 on:
-    workflow_dispatch:
     pull_request: {}
     merge_group:
         types: [checks_requested]
@@ -22,44 +21,14 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
+
             - uses: actions/setup-node@v4
               with:
                   cache: "yarn"
-            # VERJI SPECIFIC - yarn link FOR matrix-react-sdk-module-api on verji-main branch
-            #- name: "Veri - Clone Github Repo Action - Download verji-main of module-api"
-            #  # You may pin to the exact commit or the version.
-            #  # uses: GuillaumeFalourd/clone-github-repo-action@19817562c346ff60f9935158dede6c5ece8fd0ac
-            #  uses: GuillaumeFalourd/[email protected]
-            #  with:
-            #       # Repository Owner
-            #       owner: verji
-            #       # Repository name
-            #       repository: "matrix-react-sdk-module-api"
-            #       # PAT with repository scope (https://github.com/settings/tokens)
-            #       access-token: ${{secrets.PAT}}
-            #       # Depth of the clone (default: full history)
-            #       depth: 1
-            #       # Branch name (default: main)
-            #       branch: "verji-main"
-            #       # Clone with submodules
-            #       submodule: false # optional, default is false
-            # - name: "Verji - Build and yarn link matrix-react-sdk-module-api (prepublish)"
-            #   uses: Azure/powershell@v2
-            #   with:
-            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck build --skipLibCheck
-            #       inlineScript: "cd matrix-react-sdk-module-api && yarn && yarn link && yarn prepublishOnly && cd .. && cd .. && cd 'matrix-react-sdk'"
-            #       azPSVersion: "latest"
-            #END VERJI SPECIFIC
+
             - name: Install Deps
               run: "./scripts/ci/install-deps.sh --ignore-scripts"
-              # VERJI
-            # - name: "Verji - yarn link matrix-react-sdk-module-api/verji-main into matrix-react-sdk"
-            #   uses: Azure/powershell@v2
-            #   with:
-            #       # Yarn link matrix-react-sdk-module-api #--skipLibCheck
-            #       inlineScript: "yarn link '@matrix-org/react-sdk-module-api'"
-            #       azPSVersion: "latest"
-            # VERJI END
+
             - name: Typecheck
               run: "yarn run lint:types"
 
@@ -86,7 +55,6 @@ jobs:
 
     i18n_lint:
         name: "i18n Check"
-        if: ${{ github.ref_name != 'verji-develop' }}
         uses: matrix-org/matrix-web-i18n/.github/workflows/i18n_check.yml@main
         with:
             hardcoded-words: "Element"

diff --git a/.github/workflows/verji-release-drafter.yml b/.github/workflows/verji-release-drafter.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+Changes in [3.100.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.100.0) (2024-06-04)
+=======================================================================================================
+## ✨ Features
+
+* Tooltip: Improve accessibility for  context menus ([#12462](https://github.com/matrix-org/matrix-react-sdk/pull/12462)). Contributed by @florianduros.
+* Tooltip: Improve accessibility of space panel ([#12525](https://github.com/matrix-org/matrix-react-sdk/pull/12525)). Contributed by @florianduros.
+
+## 🐛 Bug Fixes
+
+* Close the release announcement when a dialog is opened ([#12559](https://github.com/matrix-org/matrix-react-sdk/pull/12559)). Contributed by @florianduros.
+* Tooltip: close field tooltip when ESC is pressed ([#12553](https://github.com/matrix-org/matrix-react-sdk/pull/12553)). Contributed by @florianduros.
+* Fix tabbedview breakpoint width ([#12556](https://github.com/matrix-org/matrix-react-sdk/pull/12556)). Contributed by @dbkr.
+* Fix E2E icon display in room header ([#12545](https://github.com/matrix-org/matrix-react-sdk/pull/12545)). Contributed by @florianduros.
+* Tooltip: Improve placement for space settings ([#12541](https://github.com/matrix-org/matrix-react-sdk/pull/12541)). Contributed by @florianduros.
+* Fix deformed avatar in a call in a narrow timeline ([#12538](https://github.com/matrix-org/matrix-react-sdk/pull/12538)). Contributed by @florianduros.
+* Shown own sent state indicator even when showReadReceipts is disabled ([#12540](https://github.com/matrix-org/matrix-react-sdk/pull/12540)). Contributed by @t3chguy.
+* Ensure we do not fire the verification mismatch modal multiple times ([#12526](https://github.com/matrix-org/matrix-react-sdk/pull/12526)). Contributed by @t3chguy.
+* Fix avatar in chat export ([#12537](https://github.com/matrix-org/matrix-react-sdk/pull/12537)). Contributed by @florianduros.
+* Use `*` for italics as it doesn't break when used mid-word ([#12523](https://github.com/matrix-org/matrix-react-sdk/pull/12523)). Contributed by @t3chguy.
+
+
 Changes in [3.99.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.99.0) (2024-05-07)
 =====================================================================================================
 ## ✨ Features

diff --git a/jest.config.ts b/jest.config.ts
@@ -20,11 +20,10 @@ import type { Config } from "jest";
 
 const config: Config = {
     testEnvironment: "jsdom",
-    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)", "<rootDir>/test/**/**/*-test.[jt]s?(x)"],
+    testMatch: ["<rootDir>/test/**/*-test.[jt]s?(x)"],
     globalSetup: "<rootDir>/test/globalSetup.ts",
     setupFiles: ["jest-canvas-mock"],
     setupFilesAfterEnv: ["<rootDir>/test/setupTests.ts"],
-    moduleFileExtensions: ["js", "jsx", "json", "ts", "tsx"],
     moduleNameMapper: {
         "\\.(gif|png|ttf|woff2)$": "<rootDir>/__mocks__/imageMock.js",
         "\\.svg$": "<rootDir>/__mocks__/svg.js",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-react-sdk",
-    "version": "3.99.0",
+    "version": "3.100.0",
     "description": "SDK for matrix.org using React",
     "author": "matrix.org",
     "repository": {
@@ -23,7 +23,7 @@
         "package.json",
         ".stylelintrc.js"
     ],
-    "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",
@@ -62,6 +62,7 @@
     "resolutions": {
         "@types/react-dom": "17.0.25",
         "@types/react": "17.0.80",
+        "@types/seedrandom": "3.0.4",
         "oidc-client-ts": "3.0.1",
         "jwt-decode": "4.0.0"
     },
@@ -109,7 +110,7 @@
         "maplibre-gl": "^2.0.0",
         "matrix-encrypt-attachment": "^1.0.3",
         "matrix-events-sdk": "0.0.1",
-        "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
+        "matrix-js-sdk": "33.0.0",
         "matrix-widget-api": "^1.5.0",
         "memoize-one": "^6.0.0",
         "minimist": "^1.2.5",
@@ -128,7 +129,6 @@
         "react-focus-lock": "^2.5.1",
         "react-transition-group": "^4.4.1",
         "rfc4648": "^1.4.0",
-        "rss-parser": "^3.12.0",
         "sanitize-filename": "^1.6.3",
         "sanitize-html": "2.13.0",
         "tar-js": "^0.3.0",
@@ -183,9 +183,8 @@
         "@types/react-dom": "17.0.25",
         "@types/react-transition-group": "^4.4.0",
         "@types/sanitize-html": "2.11.0",
-        "@types/scheduler": "^0.23.0",
         "@types/sdp-transform": "^2.4.6",
-        "@types/seedrandom": "<3.0.5",
+        "@types/seedrandom": "3.0.4",
         "@types/tar-js": "^0.3.2",
         "@types/ua-parser-js": "^0.7.36",
         "@types/uuid": "^9.0.2",
@@ -222,7 +221,6 @@
         "postcss-scss": "^4.0.4",
         "prettier": "3.2.5",
         "raw-loader": "^4.0.2",
-        "react-test-renderer": "17.0.2",
         "rimraf": "^5.0.0",
         "stylelint": "^16.1.0",
         "stylelint-config-standard": "^36.0.0",
@@ -238,5 +236,6 @@
         "outputDirectory": "coverage",
         "outputName": "jest-sonar-report.xml",
         "relativePaths": true
-    }
+    },
+    "typings": "./lib/index.d.ts"
 }
diff --git a/...snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png b/...snapshots/threads/threads.spec.ts/Reply-to-the-location-on-ThreadView-linux.png
diff --git a/res/css/components/views/elements/_AppPermission.pcss b/res/css/components/views/elements/_AppPermission.pcss
@@ -44,24 +44,3 @@ limitations under the License.
         }
     }
 }
-
-.mx_Tooltip.mx_Tooltip--appPermission {
-    box-shadow: none;
-    background-color: $tooltip-timeline-bg-color;
-    color: $tooltip-timeline-fg-color;
-    border: none;
-    border-radius: 3px;
-    padding: 6px 8px;
-
-    &.mx_Tooltip--appPermission--dark {
-        .mx_Tooltip_chevron::after {
-            border-right-color: $tooltip-timeline-bg-color;
-        }
-    }
-
-    ul {
-        list-style-position: inside;
-        padding-left: 2px;
-        margin-left: 0;
-    }
-}
diff --git a/res/css/structures/_HomePage.pcss b/res/css/structures/_HomePage.pcss
@@ -22,7 +22,6 @@ limitations under the License.
     height: 100%;
     margin-left: auto;
     margin-right: auto;
-    max-height: 100%;
 }
 
 .mx_HomePage_default {

diff --git a/res/css/structures/_LeftPanel.pcss b/res/css/structures/_LeftPanel.pcss
@@ -148,8 +148,6 @@ limitations under the License.
                 }
             }
 
-            .mx_LeftPanel_omButton,
-            .mx_LeftPanel_newsButton,
             .mx_LeftPanel_exploreButton,
             .mx_LeftPanel_recentsButton {
                 width: 32px;
@@ -181,15 +179,6 @@ limitations under the License.
                 }
             }
 
-            //Verji start
-            .mx_LeftPanel_newsButton::before {
-                mask-image: url("$(res)/img/verji/news.svg");
-            }
-            .mx_LeftPanel_omButton::before {
-                mask-image: url("$(res)/img/verji/shield.svg");
-            }
-            //Verji end
-
             .mx_LeftPanel_exploreButton::before {
                 mask-image: url("$(res)/img/element-icons/roomlist/explore.svg");
             }

diff --git a/res/css/structures/_MiscHeader.scss b/res/css/structures/_MiscHeader.scss
diff --git a/res/css/structures/_RoomView.pcss b/res/css/structures/_RoomView.pcss
@@ -162,32 +162,6 @@ limitations under the License.
     margin-bottom: 80px; /* visually center the content (intentional offset) */
 }
 
-// Verji start
-@keyframes fade1 {
-    0% {
-        opacity: 0;
-    }
-    100% {
-        opacity: 1;
-    }
-}
-.mx_RoomView_News1 {
-    animation: 0.2s ease-out 0s 0.2 fade1;
-}
-
-@keyframes fade2 {
-    0% {
-        transform: translateX(70px);
-    }
-    100% {
-        transform: translateX(0);
-    }
-}
-.mx_RoomView_News2 {
-    animation: 0.2s ease 0s 0.2 fade2;
-}
-// Verji end
-
 .mx_RoomView_MessageList {
     list-style-type: none;
     padding: var(--RoomView_MessageList-padding); /* mx_ProfileResizer depends on this value */

diff --git a/res/css/structures/_TabbedView.pcss b/res/css/structures/_TabbedView.pcss
@@ -167,7 +167,7 @@ limitations under the License.
 }
 
 /* Hide the labels on tabs, showing only the icons, on narrow viewports. */
-@media (max-width: 768px) {
+@media (max-width: 1024px) {
     .mx_TabbedView_tabsOnLeft.mx_TabbedView_responsive {
         .mx_TabbedView_tabLabel_text {
             display: none;

diff --git a/res/css/structures/_UserMenu.pcss b/res/css/structures/_UserMenu.pcss
@@ -207,27 +207,6 @@ limitations under the License.
     .mx_UserMenu_iconSignOut::before {
         mask-image: url("$(res)/img/element-icons/leave.svg");
     }
-    /* Verji start */
-    .mx_UserMenu_iconMembers::before {
-        mask-image: url("$(res)/img/element-icons/room/members.svg");
-    }
-
-    .mx_UserMenu_iconInvite::before {
-        mask-image: url("$(res)/img/element-icons/room/invite.svg");
-    }
-
-    .mx_UserMenu_oidcmanage::before {
-        mask-image: url("$(res)/img/verji/address-card.svg");
-    }
-
-    .mx_UserMenu_portal::before {
-        mask-image: url("$(res)/img/verji/house-user.svg");
-    }
-
-    .mx_UserMenu_signing::before {
-        mask-image: url("$(res)/img/verji/signing.svg");
-    }
-    /* Verji end */
 }
 
 .mx_UserMenu_CustomStatusSection {