The repo had no upstream ancestry: a whole tree arrived in one commit in May, so
every update meant re-applying our patches by hand onto a fresh checkout, and a file
Element moved would take our lines with it silently.
The real base was found by measuring tree distance across develop rather than trusting
the changelog: deadd548, not the v1.12.17 tag. With that set as a temporary graft, this
merge computed as a proper three-way merge - 32 conflicts instead of 1757.
Resolutions, each decided rather than defaulted:
- 24 GitHub workflows stay deleted; we build on GitLab CI.
- MImageBody.tsx is gone upstream, migrated to MVVM. Our ClamAV error label moved into
ImageBodyViewModel.computeErrorLabel, ahead of the DecryptError branch, matching what
VideoBodyViewModel and FileBodyViewModel already do.
- Upstream extracted the room list item body into RoomListItemContent. Our call
participants list and its getInitials helper moved there; both sides' CSS classes and
both sides' props are kept.
- matrix-js-sdk follows upstream at 42.2.0 - our git ref pin was a workaround for a
stale ref, and following upstream is the point of this merge.
- Element Call stays ours. Checked before deciding: @element-hq/element-call-embedded
is referenced nowhere in the tree, while webpack.config.ts needs
@sorb/threadnet-call-embedded, so taking upstream's line would have deleted the noise
suppression from #0054 without a word.
The lockfile was regenerated with pnpm 11.20.0, which upstream now requires through
devEngines. CI already runs corepack enable, and onFail: download makes it fetch that
version by itself.
Not yet accepted: this needs a build and the ClamAV functional test - send an encrypted
file, receive a rejected one - before it goes near main.
* Add new setting to store section state
* Store section state in device settings
* Wire up section header view model and new section functions
* Update room list vm tests
* Add e2e test on section state persistence
* Use more intuitive syntax for SectionExpansionState
* Formatting
* Fix chats section staying expanded
* Add CHAT section case in e2e test
* Expose SDKContextClass via window for debugging
* Remove stores from window if they are exposed via sdkContext
* Avoid usages of global store instance where React context is accessible
* Fix tests by adding SDKContext.Provider
* Fix tests by adding SDKContext.Provider
* Fix tests by adding SDKContext.Provider
* Fix tests by adding SDKContext.Provider
* Iterate
* Discard changes to apps/web/src/components/views/elements/AppTile.tsx
* Add back Favourites and Low Priority filter into shared components
* Wireup RoomList.showSections and filters in room list vm
* Add e2e test for filters and showSection setting
* Add new settings to enable/disable the sections
* Add `RoomList.showSections` settings to preference user settings
* Hide sections ui in room list header
- Hide the collapse/expand button and the *new section* entry in the
menu.
- Display the *start chat* button instead of the compose menu when the
only action available is to create a DM
* Hide sections ui in context menu of room item
* Listen to show section settings in room list item vm
* Listen to show sections setting in room list header vm
* Put all the rooms inside the chat section when sections are disabled
When the chat section is the only section, the room list is in "flat
list mode". Putting all the rooms inside the chat section.
The section filters (aka custom section, favourites etc) are not passed
to the skip list.
* Update preferences settings screenshot
* Add e2e test for RoomList.showSections toggle
* Hide "Chat moved" toast when a room is tagged when RoomList.showSections is disabled
* Separate out SDKContext
...from SDKContextClass, as the comments hopefully explain.
Also make the captitalisation consistent.
* Adding the new file usually helps too
* Fix import
* More comment
* Update the various imports of SDKContextClass
* Also fix case of TestSDKContext
* Update the mock
* Forward the scroller element and scroll handle through VirtualizedList
The room list needs two things the generic list did not expose: the underlying
scroll container (to observe which items are genuinely visible) and the imperative
scroll handle (to scroll an item into view). Forward an optional scrollerRef from
useVirtualizedList and pass scrollHandleRef through FlatVirtualizedList, mirroring
what GroupedVirtualizedList already exposes. Both are additive and optional, so other
consumers are unaffected.
Signed-off-by: David Langley <langley.dave@gmail.com>
* Add an unread-activity toast to the room list
Show a clickable "You have unread activity" pill when there are unread rooms
scrolled below the visible fold, including unreads hidden inside collapsed sections
whose header is below the fold. Clicking it scrolls the next such unread into view.
The visible fold is tracked with an IntersectionObserver over the rendered item
elements, so the toast appears as soon as a room crosses the fold rather than only
once it leaves Virtuoso's overscan buffer. The toast click is wired through an
imperative scroll handle the view registers with the view model.
Signed-off-by: David Langley <langley.dave@gmail.com>
* Change toast to target notifications only, not unread activity.
* Fix formatting and refresh Toast snapshots for compound-web 9.7.0
- Apply oxfmt to the room list view model and virtualized view.
- Refresh the RoomListToast/RoomListView story snapshots: compound-web
9.7.0 moves the typography classes onto the toast .content element and
rebuilds the Toast CSS module hashes.
- Add the missing UnreadActivityToast render snapshot baseline.
* Add e2e tests for the room list unread activity toast
Cover the unread-activity toast end to end:
- it appears for a notifying room scrolled below the fold and clicking it
scrolls that room into view (then the toast clears);
- a room with only an unread-activity dot (no notification count) does not
raise it;
- a collapsed section hiding a notifying room raises it, and clicking
scrolls the section header into view.
* Add visual snapshot baselines for the unread-activity toast stories
* Converge room-list toast codepaths into a single state-driven toast
Reviewer feedback: the unread-activity toast and the transient event toasts
(section_created / chat_moved) should share one mechanism, with toast
lifecycle and precedence owned by the view model rather than split across a
separate snapshot flag and a view-level ternary.
- RoomListViewModel now reconciles the transient event toast and the derived
unread-activity state into a single snapshot.toast via recomputeToast(); the
event toast still takes precedence and auto-dismisses, and the unread toast
reappears once it clears. Drops hasUnreadActivityBelow from the snapshot.
- RoomListView renders a single RoomListToast driven by snapshot.toast; the
ToastType union gains 'unread_activity'. The standalone UnreadActivityToast
component is folded into RoomListToast (clickable arrow-down variant).
- Adds VM tests for the unread-activity toast and the event/unread precedence.
* Pre-bundle the room-list dnd-kit + virtuoso graph in vitest browser mode
The room-list suites (RoomListView, VirtualizedRoomListView,
RoomListItemMoreOptionsMenu) import a heavy @dnd-kit + react-virtuoso graph.
Only @dnd-kit/abstract was pinned in optimizeDeps.include; @dnd-kit/dom,
@dnd-kit/react, @dnd-kit/abstract/modifiers and react-virtuoso were left to
runtime discovery. Under CI load the browser-mode dep optimizer can discover
them late, re-bundle and reload the page, which fails the in-flight
setupTests.ts import for those suites. Pinning the whole graph forces it into
the initial optimize pass so no re-run happens while tests load.
---------
Signed-off-by: David Langley <langley.dave@gmail.com>
* feat(rls): centralize room-list section ordering via getOrderedSections
Introduce a single source of truth for the ordered list of section
tags (defaults + custom) in section.ts. RoomListStoreV3 no longer
hard-codes the default tag order — it asks section.ts.
* feat(vm): add section reorder logic to RoomListStoreV3 and view model
* refactor(sc): extract RoomListSectionHeaderContent from RoomListSectionHeaderView
* feat(sc): add drag-and-drop reordering for room-list sections
* test(sc): update existing tests
* test: add new tests
* test(sc): add snapshot test for overlay
* test(e2e): add playright test for dnd of sections
* feat: tweak opacity
* fix: section detection when dragged
* feat: use relative position in section order
* chore: move style to room list section header view
* test: add e2e test for moving section before another
* feat: make favourite and low priority no draggable
* test: remove deprecated e2e test
* fix: type correctly dnd provider and hooks
* fix: use String instead of casting to string
* fix: wrong a11y attributes on section header
* test: fix keyboard navigation e2e tests
* feat: use custom a11y announcement for dnd
* fix: add aria-hidden to the overlay
* chore: remove duplicated code in a11Y announcement
* fix: increase keyboard drag offset
* fix: tests
* fix: virtuoso computed item key
* fix: aria-expanded double annoncement why dragging
* fix: re-add screen reader instructions
* chore: remove unused import
* fix: reduce keyboard drag offset
* fix: improve text readback on unread section
* feat: use a custom a11y plugin instead of buitin a11y plugin
* chore: formatting
* test: fix incorrect tests
* chore: use randomUUID
* fix: try to make test working
* fix: put back mock
* fix: circular import
* Revert "fix: circular import"
This reverts commit 6c69313ade9ed2ab17a4622c692b435fbdb94ad2.
* chore: add @dnd-kit/abstract to optimizeDeps.include
* test: fix e2e tests
* fix: disable interaction with section when dragging
* fix: be more explicit if the section will be dropped before or after
* fix: add info that space is dropping too
* fix: scroll to dropped section
* test: fix virtualized room list test
* chore: update lang
* chore: fix dead code analyze
* test: add provider section story
* fix: lang
* fix: again lang...
* fix: improve voice over on chrome
* test: upate snapshot
* fix: add readback when a section is over a non droppable element
* fix: don't display the empty/collapse icon when the room list is empty
* Fix jest lcov projectRoot config
---------
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
* feat: display empty custom sections in the space where they were created
* test: update tests
* fix: room can't be drag in to a section if a section is created before
* fix: re-render issue when section is created
* refactor: move all access to custom sections settings into `section.ts`
* fix: add robustness when getting the order list of custom sections
* fix: add robustness when getting the custom section data
* fix: ignore malformed section but don't erase them
* fix: remove useless await operator
* test: add more tests
* chore: add dnd kit deps
* chore: patch dnd kit to fix ts error
* feat(sc): add drag-and-drop to room list item and wrapper
* feat(sc): make the room list header a droppable element
* feat(sc): add dnd to room list view
* feat(tags): can tag room as CHAT
* feat(vm): implement `changeRoomSection`
* feat(sc): disable dragging in flat list
* fix: disable keyboard navigation when dragging element
* test(sc): update snapshots
* test(sc): add dnd test
* test(e2e): add e2e tests for room drag and drop
* test(vm): add tests for changeRoomSection
* fix: remove focus visible when dropping with the mouse
* test(playwright): update existing screenshots
* chore(sc): move numbers out of main build
The Ew RecorderWorklet imports shared component bundle. However if the
bundle uses some deps using document/window which, the worklet will not
work.
The solution is to put the used functions into a separate bundle.
* doc(sc): add subpath import into README
* doc: typo barrel/bundle
* test: improve test expect
* refactor: add utils to section tag
* fix: incorrect check in tagRoom
* fix: add doc about dndkit tunning
* chore: update compound design tokens
* feat(sc): add collapse/expand button to room list header
* feat: add new events to broadcast section state
* feat(vm): add expand/collpase event to room list events
* test: add e2e tests
* chore: fix company name in copyright
* chore: use two differant actions for collapse/expand
* Update apps/web/src/viewmodels/room-list/RoomListHeaderViewModel.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
* test: fix existing tests
---------
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
* feat(sc): add section menu to section header
* feat(rls): add edit and remove sections
* feat(dialog): add editing mode to CreateSectionDialog
* feat(dialog): add remove section dialog
* feat(vm): wire up vm and stores
* test: update existing snapshots
* test(e2e): add playwright tests to edit and remove a section
* chore: fix remove section i18n key
* fix: able to send empty sections
* chore: update create section editing docs
* chore: remove useless fallback
* chore: add logs when section is unknown
* feat: use different wording when removing an empty section
* fix: only animate the chevron icon in the section header
* fix: change dialog subtitle weight to medium
* feat(rls): return section tag when created
* feat(vm): assign section tag to room when section created
* test: update exisiting tests
* test(e2e): check that room is in section
* feat(sc): add new toast type for room list
* feat(sc): add section entries in room list item menu
* feat(rls): expose util functions
* feat: allows to tag room with custom sections
* feat(vm): add new Chat moved toast to room list vm
* feat(vm): add section selection to room list item vm
* feat(e2e): add tests for adding room in a custom section
* test(e2e): update existing screenshots
* chore: fix lint after merge
* chore: remove outline in test
* feat: add creation section dialog
* feat: add in skip list a method to change filters
* feat: add helper to creation section
* feat: add custom sections data to Settings
* feat: add custom section to room list store v3
* feat: update header and room list item vms
* feat: add toast to room list vm
* feat: add new translation
* chore: move util functions of room list specs
* test: add custom section playwright tests
* chore: call loadCustomSections in RoomListStoreV3 ctor
* fix: section being empty in flat list mode
When switching space (or removing a section later), if the Chat section
is collpased and the room list is in flat list mode in the other space,
the room list is empty.
The fix forces the section to be in expanded state if in flat list mode
* fix: store section expanded state by space
* feat: add unread status to section view
* feat: add unread tracking in room list section
* feat: populate rooms into section header vm
* test: add units for unread in section view model
* test(e2e): add unread tests
* feat: add sections to RLSV3
* feat: add sections in vms
* feat: add room list section labs flag
* fix: wrong margin for room list item when in sections
* feat: hide favourites and low priority filters
* fix: crash when changing filter
* feat: support sticky room in sections
* test: update SC snapshot
* test: update SC screenshot
* test: update RLS tests
* test: add tests to RoomListSectionHeaderViewModel
* test: fix existing test in RoomListViewModel
* test: add sections tests for RoomListViewModel
* test: add e2e tests for sections
* fix: incorrect selected room when expanding/collasping a section
* fix: typo in `roomSkipList`
* feat: use one skip list with all filters instead of one list by tag
* chore: put back comment about `roomIndexInSection`
* chore: add missing `readonly`
* chore: add doc about possible undefined value for room item vm
* Give rooms with calls a proper accessible description
Besides improving accessibility, this makes it possible to check for the presence of a call indicator in the room list in Playwright tests.
* Make room list react to calls in a room, even when not connected to them
To use the results of CallStore.getRoom reactively, you need to listen for Call events, not ConnectedCalls events.
* Don't assume that every call starts off as a video call
If a Call object is created by way of someone starting a voice call, then of course the call's initial type needs to be 'voice'.
* Make room list items react to changes in call type
The type of a call may change over time; therefore room list items explicitly need to react to the changes.
* Update a call's type before notifying listeners of the change
If we notify listeners of a change in a call's type before actually making that change, the listeners will be working with glitched state. This would cause the room list to show the wrong call type in certain situations.
* Ignore the Vitest attachments directory
* perf: add memo to room avatar view
* perf: batch rlsV3 emit
* perf: avoid to re-render the room list if the room list state and sections are same
* perf: listen only message preview of the specific room
* perf: avoid to re-render the room list item if the notification or the content is same
* chore: replace useState and useEffect by useMemo in virtualized list
* fix: listen to room name event in RoomAvatar
* fix: room avatar re-render when room is low priority
* chore: rename snapshot, actions and vm according to MVVM doc
* doc: add naming conventions
* chore: fix UrlGroupView naming, folders and children
* chore: remove `Example` column
* refactor: rename `UrlPreviewGroupViewPreview` into `UrlPreview`
* feat: add section header
* refactor: remove index and role related to list box from RoomListItemView
* feat: add wrapper to RoomListItemView to handle different accessiblity pattern
* feat: add section support to VirtualizedRoomListView
* feat: add sections support to RoomListView
* test: add screenshot for sections header
* test: add/update screenshots for sections
* feat: force flat list on view model
This is an intermediary step before implementing sections in the vm. We
force the flat list but we use the underneath the view supporting
sections.
* test: update RoomListViewModel test
* test: fix breaking test
* chore: rename `getSectionViewModel` to `getSectionHeaderViewModel`
* chore: add missing `RoomListItemAccessibilityWrapper` export
* chore: merge `react` imports
* chore: simplify and add comment to `getItemKey` and `getHeaderKey`
* chore add comments to `getItemComponent` variants
* chore: fix typo in example doc
* refactor: move `MessagePreviewStore` and previews into its own directory
The `MessagePreviewStore` is used widly and not only by the room list.
Moving to its own folder to be able to remove old room list later with
less friction
* test: add more tests
* refactor: move `DefaultTagID` and `TagID` to rls v3
Move the enum and type in rls v3 and update imports
* refactor: move `getChangedOverrideRoomMutePushRules` from rls to rls v3
* refactor: replace `VisiblityProvider` by `isRoomVisible` and move it to rls v3
* perf(room list): clear room list item vm only when changing space
Clearing all the item vms at every room list change is causing massive
re-render of all the room list items. References to the vms are already
removed when out of view (see RoomListViewMode.updateVisibleRooms) and
handled by GC.
* perf(room list): avoid to re-render filters at every room list update
RoomListView re-renders on update but the filters (children) don't need
to.
Add a memo to avoid excessive-rerenders.
* chore: add `keepIfSame` to do diff on vm objects
* perf(room list): avoid to create new filter ids and keys when the room list is updated
The filterKeys are passed in the virtuoso context so it should reduce
internal computing
The filter ids array has always the same value, there is no point to
create a new instance.
* test(room list): remove no longer relevant test
* test(room list): add new test to ensure that room list item vms are preserved
* feat(call store): add new `CallEvent.Participants` event
The room list needs to listen to `CallEvent.Participants` to be able to
display the Call icon. This was working before
https://github.com/element-hq/element-web/pull/32663 due to an excessive
re-renders or relying on the notification events.
* chore(room list): listen to `CallEvent.Participants`
* test(room list): add test for new listener
* test(call store): add tests for `CallEvent.Particpants`
* Revert "feat(call store): add new `CallEvent.Participants` event"
This reverts commit d2a7a009a4c55325404ad38f23fa662a8103cff4.
* Revert "test(call store): add tests for `CallEvent.Particpants`"
This reverts commit 4455182fb3aea54ea10cfabb8beb7946cfdf8a6c.
* chore(room list): listen to `Call#CallEvent.Participants` insteaf of listening to `CallStore`
* test(room list): update added test
* fix(room list): clean properly listeners on previous call
* test(room list): add missing test
* fix(room list): don't use trackListeners to avoid leaking memory when listening to call event
* fix(room list): listen to participant change when vm is created
* test(room list): add test case when there is an existing call
mkdir apps/web/scripts
mv scripts/{cleanup.sh,ci_package.sh,copy-res.ts,deploy.py,package.sh} apps/web/scripts
And a couple of gitignore tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
Thore Cimbal
Michael TelatynskiandGitHub
Florian DurosandGitHub
David BakerandGitHub
David LangleyandGitHub
sorB
RobinandGitHub