Skip to content

refactor: remove unnecessary ReactElement type annotations in RoomAvatarEditor and UserAvatarEditor components#40825

Merged
ggazzo merged 1 commit into
developfrom
refactor/prepare-types-for-react-19-23
Jun 10, 2026
Merged

refactor: remove unnecessary ReactElement type annotations in RoomAvatarEditor and UserAvatarEditor components#40825
ggazzo merged 1 commit into
developfrom
refactor/prepare-types-for-react-19-23

Conversation

@tassoevan

@tassoevan tassoevan commented Jun 4, 2026

Copy link
Copy Markdown
Member

⚠️ This is part 23/23 of #40796. PR for refactor/prepare-types-for-react-19-22 must be merged first.


Proposed changes (including videos or screenshots)

As a first step towards upgrading to React 19, it handles types from @types/react looking forward the next major.

Issue(s)

Task: ARCH-2170

Steps to test or reproduce

Further comments

No runtime change is expected from it.

Summary by CodeRabbit

  • Refactor
    • Simplified component type signatures for improved code maintainability. Runtime behavior and functionality remain unchanged.

@changeset-bot

changeset-bot Bot commented Jun 4, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 53cf4a8

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 630d45fc-f9ab-4f45-9e97-918a55e812fe

📥 Commits

Reviewing files that changed from the base of the PR and between 299568d and 53cf4a8.

📒 Files selected for processing (2)
  • apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
  • apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
📜 Recent review details
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (5)
  • GitHub Check: 📦 Build Packages
  • GitHub Check: cubic · AI code reviewer
  • GitHub Check: Hacktron Security Check
  • GitHub Check: CodeQL-Build
  • GitHub Check: CodeQL-Build
🧰 Additional context used
📓 Path-based instructions (1)
**/*.{ts,tsx,js}

📄 CodeRabbit inference engine (.cursor/rules/playwright.mdc)

**/*.{ts,tsx,js}: Write concise, technical TypeScript/JavaScript with accurate typing in Playwright tests
Avoid code comments in the implementation

Files:

  • apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
  • apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
🧠 Learnings (2)
📚 Learning: 2026-03-27T14:52:56.865Z
Learnt from: dougfabris
Repo: RocketChat/Rocket.Chat PR: 39892
File: apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx:150-155
Timestamp: 2026-03-27T14:52:56.865Z
Learning: In Rocket.Chat, there are two different `ModalBackdrop` components with different prop APIs. During review, confirm the import source: (1) `rocket.chat/fuselage` `ModalBackdrop` uses `ModalBackdropProps` based on `BoxProps` (so it supports `onClick` and other Box/DOM props) and does not have an `onDismiss` prop; (2) `rocket.chat/ui-client` `ModalBackdrop` uses a narrower props interface like `{ children?: ReactNode; onDismiss?: () => void }` and handles Escape keypress and outside mouse-up, and it does not forward arbitrary DOM props such as `onClick`. Flag mismatched props (e.g., `onDismiss` passed to the fuselage component or `onClick` passed to the ui-client component) and ensure the usage matches the correct component being imported.

Applied to files:

  • apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
  • apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
📚 Learning: 2026-05-06T12:21:44.083Z
Learnt from: juliajforesti
Repo: RocketChat/Rocket.Chat PR: 40256
File: apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx:121-149
Timestamp: 2026-05-06T12:21:44.083Z
Learning: Field wrappers in rocket.chat/fuselage-forms (Field, FieldLabel, FieldRow, FieldError, FieldHint) auto-create htmlFor/id associations, aria-describedby, and role="alert" for errors. Do not manually set htmlFor, id, aria-describedby, or role attributes when using these wrappers. This automatic wiring does not apply to plain rocket.chat/fuselage components, which require explicit ID wiring per the accessibility docs. In code reviews, prefer using fuselage-forms wrappers for form fields and verify there is no unnecessary manual ID/aria wiring in files that use these wrappers. If a component uses plain fuselage components, ensure proper id wiring as per docs.

Applied to files:

  • apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
  • apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
🔇 Additional comments (2)
apps/meteor/client/components/avatar/RoomAvatarEditor.tsx (1)

22-22: LGTM!

apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx (1)

6-6: LGTM!

Also applies to: 26-26


Walkthrough

This PR simplifies TypeScript typing for two avatar editor components. RoomAvatarEditor and UserAvatarEditor each had their explicit : ReactElement<any> return type annotations removed from their function signatures, along with corresponding ReactElement type imports from React. Component runtime behavior and props handling are unchanged.

Changes

Avatar Editor Component Typing Refactor

Layer / File(s) Summary
Remove explicit ReactElement return types from avatar editors
apps/meteor/client/components/avatar/RoomAvatarEditor.tsx, apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
RoomAvatarEditor removes ReactElement from imports and drops the : ReactElement<any> return type annotation. UserAvatarEditor splits its React imports to isolate ChangeEvent and removes the : ReactElement<any> return type annotation. Component logic and props remain unchanged.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • RocketChat/Rocket.Chat#40804: Removes explicit ReactElement return type annotations from other avatar components (AppAvatar, RoomAvatar).
  • RocketChat/Rocket.Chat#40818: Broader refactoring removing unnecessary ReactElement return type annotations across React components.
  • RocketChat/Rocket.Chat#40813: Same TypeScript refactor pattern—removes explicit ReactElement return-type annotations from exported React components.

Suggested labels

type: chore

Suggested reviewers

  • ggazzo
  • juliajforesti
🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: removing unnecessary ReactElement type annotations from two specific components as part of a React 19 upgrade preparation.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

Warning

Review ran into problems

🔥 Problems

Errors were encountered while retrieving linked issues.

Errors (2)
  • REACT-19: Request failed with status code 401
  • ARCH-2170: Request failed with status code 401

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@dionisio-bot

dionisio-bot Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

@tassoevan tassoevan force-pushed the refactor/prepare-types-for-react-19-23 branch from 88af044 to 53cf4a8 Compare June 10, 2026 00:58
@tassoevan tassoevan added this to the 8.6.0 milestone Jun 10, 2026
@tassoevan tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Jun 10, 2026
@tassoevan tassoevan marked this pull request as ready for review June 10, 2026 00:59
@tassoevan tassoevan requested a review from a team as a code owner June 10, 2026 00:59
@dionisio-bot dionisio-bot Bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 10, 2026

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 2 files

Re-trigger cubic

@codecov

codecov Bot commented Jun 10, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.10%. Comparing base (299568d) to head (53cf4a8).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #40825      +/-   ##
===========================================
- Coverage    70.10%   70.10%   -0.01%     
===========================================
  Files         3341     3341              
  Lines       123661   123661              
  Branches     22133    22170      +37     
===========================================
- Hits         86690    86688       -2     
+ Misses       33621    33619       -2     
- Partials      3350     3354       +4     
Flag Coverage Δ
e2e 59.24% <100.00%> (-0.04%) ⬇️
e2e-api 46.27% <ø> (+<0.01%) ⬆️
unit 70.95% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@tassoevan tassoevan enabled auto-merge June 10, 2026 01:19
@ggazzo ggazzo disabled auto-merge June 10, 2026 02:02
@ggazzo ggazzo merged commit 0e52007 into develop Jun 10, 2026
46 of 48 checks passed
@ggazzo ggazzo deleted the refactor/prepare-types-for-react-19-23 branch June 10, 2026 02:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge type: chore

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants