Skip to content

Conversation

@hazzuk
Copy link
Member

@hazzuk hazzuk commented Sep 28, 2025

Merge upstream Element-web v1.11.112.

renovate bot and others added 30 commits July 9, 2025 07:36
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…#30286)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update all non-major dependencies

* Prettier

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>
…q#30291)

* DeviceListener: add logging around key backup upload check

... in an attempt to diagnose what is going on with
element-hq#30270

* fix typescript

* fix lint
* fix: remove white background on e2e verification icon and put white on the checkmark

* test(e2e): add non regression tests

* chore: remove unused CSS mask
* fix: remove white background on e2e verification icon and put white on the checkmark

* test(e2e): add non regression tests

* chore: remove unused CSS mask

(cherry picked from commit a05ca97)

Co-authored-by: Florian Duros <[email protected]>
…ent-hq#30302)

Only the playwright tests are automatically updated, and are therefore safe to
auto-close.
* Very first pass at shared component views

Turn the trivial TextualEvent into a shared component with a separate view
model for element web. Args to view model will probably change to be more
specific and VM typer needs abstracting out into an interface, but should
give the general idea.

* Remove old TextualEvent

* Pass showHiddenEvents

Because we used it anyway, we just cheated by getting it from the context

* Factor out common view model stuff

* Move ViewModel interface into the shared components

* Add tiny wrapper hook

* Move showHiddenEvents into props fully

* Fill in stories / test

* chore: setup storybook

cherry pick edc5e87
from florianduros/storybook

* Add TextualEvent component to storybook

* Add mock view model & snapshot

* Remove old style stories entry

* Change import

* Change import

* Prettier

* Add paxckage patch to @types/mdx

for React 19 compat

* Pass getSnapshot as getServerSnapshot too

* Maybe make sonar regognise tests as tests

* Typo

* Use storybook reacvt-vite

There's no reason to use the react-webpack plugin just because our app
is stuck on webpack, it just means we have vite as a dependency too.

* Change here too

* Workaround for incomatible types in rollup

rollup/rollup#5199

* Remove webpack styling addon

Not necessary now we're using vite

* Hopefully do screenshot testing...

* need newer node

* quote issues

* Make it an npm script

* colons

* use right port

* Install playwright browsers

* Try without the if

* Oh right, we need the headless shell

* Pass flag to store received screenshots

and upload diffs too

* Update snapshot from received

* Include platform in snapshot / received dir

because font rendering differs between platforms

* Suffix snapshots with platform instead

like we do for playwright

* Remove unnecessary env vars

and better name

* Add some comments

* Prettier

* Fix yarn.lock

* Memoise vm creation

Co-authored-by: Florian Duros <[email protected]>

* Add implements

Co-authored-by: Florian Duros <[email protected]>

* Fix listener interface

* Add implements

Co-authored-by: Florian Duros <[email protected]>

* Fix types

* Fix more types

* Revert useMemo

as this isn't a hook

* Unused import

* Add missing playwright step

* Add return type annotation

* Change to add / remove subscription callback

* Change to 'add' rather than 'subs.subscribe'

* Add cache specifier for only shell playwright browsers

* Add copyright headers

---------

Co-authored-by: Florian Duros <[email protected]>
Co-authored-by: Florian Duros <[email protected]>
There are two potential problems here:
1. mouse.scroll returns before the scroll is completed
2. visibility check does not check if the element is actually in the
   viewport.

I've added a helper function to make it easier to scroll to the end of
an infinite list.
* refactor: extract i18n from languageHandler to not import matrix-js-sdk, settings...

* fix: circular deps

* feat: add language selector to storybook

* fix: make visual test works in CI
…ment-hq#30323)

* Add quote functionality to MessageContextMenu (element-hq#29893)

* Remove unused import of getSelectedText from strings utility in EventTile component

* Add space after quoted text in ComposerInsert action

* Add space after quoted text in MessageContextMenu test

* add new line before and after the formated text
langleyd and others added 28 commits August 27, 2025 15:48
…ied (element-hq#30633)

* ListView should not handle the arrow keys if there is a modifier applied.

* lint

* Reduce nesting
…6.0.0 on develop) (element-hq#30373)

* Update vector-im

* Update snapshots

Signed-off-by: Michael Telatynski <[email protected]>

* Update tests

Signed-off-by: Michael Telatynski <[email protected]>

* Make BaseDialog's div keyboard focusable and fix test.

* Update more e2e tests to use switch instead of checkbox

* fix useParticipants incorrectly returning an array when a map is expected

* Try again to fix calParticipants

* try fix RoomHeader tests again by also mocking useParticipants

* Revert "try fix RoomHeader tests again by also mocking useParticipants"

This reverts commit f83093c.

* Try with no dependencies

* try mocking useCall rather than just useParticipantCount

* Mock the call store rather than the hook

* Only mock the call object for tests that expect it.

* Revert "Only mock the call object for tests that expect it."

This reverts commit 043d812.

* Revert "Mock the call store rather than the hook"

This reverts commit 644be31.

* Revert "try mocking useCall rather than just useParticipantCount"

This reverts commit 92034aa.

* Revert "Try with no dependencies"

This reverts commit fb502a6.

* Reapply "try fix RoomHeader tests again by also mocking useParticipants"

This reverts commit e456782.

* Revert "try fix RoomHeader tests again by also mocking useParticipants"

This reverts commit f83093c.

* Revert "Try again to fix calParticipants"

This reverts commit c45ad30.

* Revert "fix useParticipants incorrectly returning an array when a map is expected"

This reverts commit e06d76e.

* bump compound-web

* Update snapshots

* Fix bad merge, we don't need the second call to escape. The comment a couple of lines up explains things.

* Trigger build to fix licence/cla check

---------

Signed-off-by: Michael Telatynski <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>
Co-authored-by: David Langley <[email protected]>
* MatrixChat: only start session load once

When running in development mode, `MatrixChat.componentDidMount` is run twice,
meaning it checks the session lock twice. Sometimes, this means it shows the
"Element is running in another window" page.

The real problem is of course that we're running all this application logic
inside the `MatrixChat` component, but as a quick workaround, we can just
remember that we've started the session load code, and bail out on the second pass.

* Address review comments
The function was supposed to return an i18ned string but lacked a _t
…lement-hq#30538)

* Open the proper integration settings on integrations disabled error.

* Convert to functional component.

* Add test

* update snap
…ment-hq#30262)

* Remember whether sidebar is shown for calls when switching rooms

Stores the sidebar state per-room in LegacyCallHandler, along with other details about calls.

* Hide the Show/Hide Sidebar from the Picture-in-Picture preview

The toggle sidebar button currently does nothing in PIP mode, since PIP mode never shows a sidebar (even when the call is made fullscreen from the PIP preview)

* Add test for Show/Hide Sidebar feature

* Add more tests for LegacyCallView and LegacyCallViewForRoom

Also, fix issue where LegacyCallViewForRoom used roomId and not callId for checking for sidebar state
It looked for the ".stable" suffixed feature to work out what URL
to use but not to see whether the server supported it.
…element-hq#30641)

* Fix room joining over federation not specifying vias or using aliases

Signed-off-by: Michael Telatynski <[email protected]>

* Be consistent with viaServers

Signed-off-by: Michael Telatynski <[email protected]>

* Simplify modules

Signed-off-by: Michael Telatynski <[email protected]>

* Only consider canAskToJoin on 403 as per spec

Signed-off-by: Michael Telatynski <[email protected]>

* Remove unused helper which I only just added =(

Signed-off-by: Michael Telatynski <[email protected]>

* Update tests

Signed-off-by: Michael Telatynski <[email protected]>

* Add tests

Signed-off-by: Michael Telatynski <[email protected]>

* Add test

Signed-off-by: Michael Telatynski <[email protected]>

* Add tests

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>
* Always show media from your own user

* Update usages of useMediaVisible

* lint

* Add a test for HideActionButton

* Improve docs

* Document the event

* fixup test

* Allow users to hide their own media if they wish.

* Update tests

* remove a check\

* tweak

* tweak
…tory. (element-hq#30699) (element-hq#30705)

* Set nullglob

* Replace with a if statement (because we're using sh)

* combine if

(cherry picked from commit 1c30bec)

Co-authored-by: Will Hunt <[email protected]>
* Validate room upgrade relationships properly

Ensures only correctly related rooms are left when leaving the latest version of a room.
Ensures the room list does not wrongly hide rooms which have not yet been upgraded.
Ensures the breadcrumbs store finds the correct latest version of a room for a given stored room.

Signed-off-by: Michael Telatynski <[email protected]>

* Tests

Signed-off-by: Michael Telatynski <[email protected]>

---------

Signed-off-by: Michael Telatynski <[email protected]>
From upstream config.json
@hazzuk hazzuk added the upstream Features or fixes from the original repo label Sep 28, 2025
@github-actions
Copy link

Cloudflare Pages deployment

Latest commit f0225d2f2f041d2dce913b0eeaa3c12efbff20a5
Status ✅ Deployed!
URL https://a781513f.elecord-web.pages.dev

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream Features or fixes from the original repo

Projects

None yet

Development

Successfully merging this pull request may close these issues.