Skip to content

[pull] master from mattermost:master#754

Merged
pull[bot] merged 4 commits into
code:masterfrom
mattermost:master
Jun 5, 2026
Merged

[pull] master from mattermost:master#754
pull[bot] merged 4 commits into
code:masterfrom
mattermost:master

Conversation

@pull

@pull pull Bot commented Jun 5, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

tnir and others added 4 commits June 5, 2026 14:48
Follows up PR 33783

The `@types/react-custom-scrollbars` devDependency provides types for the
`react-custom-scrollbars` runtime package, but that package is no longer a
dependency of any webapp workspace and is not imported anywhere in
webapp/channels (scrollbars now use simplebar-react) after PR 33783.
The type definitions are therefore dead.

Remove it from webapp/channels/package.json and prune its entries from
webapp/package-lock.json (the channels devDep reference and the
node_modules/@types/react-custom-scrollbars package block). It has no
dependents in the lockfile, so no other entries are affected.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Rename innerRefWidth to _innerRefWidth

* Remove duplicate scrollToFailed prop

* Remove unused style prop from children callback

* Explicitly type listData

* Explicitly type return value of initScrollToIndex

* Inline outerTagName and innerTagName props to simplify typing

* Null check usage of _outerRef

* Replace _innerRefWidth with _innerRef and typing of innerRef

* Replace Object.prototype.hasOwnProperty.call with Object.hasOwn

* Remove unused visibleId prop

This was originally added in
mattermost/dynamic-virtualized-list#29, but we
never ended up using it.

* Stop making type of listData generic

* Migrate DynamicVirtualizedList to TS
…eshes (#36861)

When a remote user is synced into a shared channel, the user_added
  websocket event recorded the membership but never loaded the user's
  profile. The member list selectors drop users without a loaded profile,
  so synced members did not appear in the participant list (though they
  showed when posting). Fetch the profile on user_added when it is missing.
…ng (#36928)

* MM-69131: Keep app__body off backstage routes to fix dark-theme styling

Centralizing app__body ownership on WithUserTheme (MM-67913) made the class
persist on backstage routes (integrations, custom emoji), which render a
static light surface. Under dark themes this leaked themed colors in, making
text and form inputs illegible.

useAppBodyClass now takes the current pathname and omits app__body on
backstage routes via isBackstageRoute, while keeping it persisted across
channels, products, and plugins so the original white-flash fix still holds.

Co-authored-by: Cursor <cursoragent@cursor.com>

* MM-69131: Address theme provider review feedback

Keep backstage route detection local to the theme provider and let the app body class hook read routing context directly.

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
@pull pull Bot locked and limited conversation to collaborators Jun 5, 2026
@pull pull Bot added the ⤵️ pull label Jun 5, 2026
@pull pull Bot merged commit ff01f82 into code:master Jun 5, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants