Skip to content

refactor: replace ReactElement type annotations with ReactNode in functions#40817

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

refactor: replace ReactElement type annotations with ReactNode in functions#40817
ggazzo merged 1 commit into
developfrom
refactor/prepare-types-for-react-19-15

Conversation

@tassoevan

@tassoevan tassoevan commented Jun 4, 2026

Copy link
Copy Markdown
Member

⚠️ This is part 15/23 of #40796. PR for refactor/prepare-types-for-react-19-14 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
    • Improved TypeScript type definitions throughout the application to enhance code quality and consistency. Updated type signatures in various components and hooks to use more appropriate React types and explicit reference initialization patterns. These enhancements strengthen the codebase's type system and improve code maintainability without affecting any user-facing functionality or features.

@changeset-bot

changeset-bot Bot commented Jun 4, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: 88f489e

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: d5dd5dc0-2975-421b-81b7-7ac160d5865c

📥 Commits

Reviewing files that changed from the base of the PR and between 4588c28 and 88f489e.

📒 Files selected for processing (7)
  • apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/hooks/useRoomIcon.tsx
  • apps/meteor/client/hooks/useSingleFileInput.ts
  • apps/meteor/client/lib/appLayout.tsx
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/lib/normalizeThreadMessage.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/hooks/useFileInput.ts
  • apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
  • apps/meteor/client/lib/normalizeThreadMessage.tsx
  • apps/meteor/client/hooks/useRoomIcon.tsx
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
  • apps/meteor/client/lib/appLayout.tsx
🧠 Learnings (7)
📚 Learning: 2026-02-10T16:32:42.586Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 38528
File: apps/meteor/client/startup/roles.ts:14-14
Timestamp: 2026-02-10T16:32:42.586Z
Learning: In Rocket.Chat's Meteor client code, DDP streams use EJSON and Date fields arrive as Date objects; do not manually construct new Date() in stream handlers (for example, in sdk.stream()). Only REST API responses return plain JSON where dates are strings, so implement explicit conversion there if needed. Apply this guidance to all TypeScript files under apps/meteor/client to ensure consistent date handling in DDP streams and REST responses.

Applied to files:

  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
📚 Learning: 2026-05-11T20:30:35.265Z
Learnt from: tassoevan
Repo: RocketChat/Rocket.Chat PR: 40480
File: apps/meteor/client/meteor/startup/accounts.ts:59-61
Timestamp: 2026-05-11T20:30:35.265Z
Learning: In Rocket.Chat’s Meteor client code, when calling `dispatchToastMessage` with `{ type: 'error' }`, pass the raw caught error object as `message` without manual normalization. `dispatchToastMessage` is designed to accept `message: unknown` for error toasts, so avoid converting errors to strings (e.g., `String(error)`) or extracting `error.message` before passing them.

Applied to files:

  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In the Rocket.Chat repository, do not reference Biome lint rules in code review feedback. Biome is not used even if biome.json exists; only reference Biome rules if there is explicit, project-wide usage documented. For TypeScript files, review lint implications without Biome guidance unless the project enables Biome rules.

Applied to files:

  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
📚 Learning: 2026-02-26T19:25:44.063Z
Learnt from: gabriellsh
Repo: RocketChat/Rocket.Chat PR: 38778
File: packages/ui-voip/src/providers/useMediaSession.ts:192-192
Timestamp: 2026-02-26T19:25:44.063Z
Learning: In this repository (RocketChat/Rocket.Chat), Biome lint rules are not used even if a biome.json exists. When reviewing TypeScript files (e.g., packages/ui-voip/src/providers/useMediaSession.ts), ensure lint suggestions do not reference Biome-specific rules. Rely on general ESLint/TypeScript lint rules and project conventions instead.

Applied to files:

  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
📚 Learning: 2026-04-14T21:10:31.855Z
Learnt from: dougfabris
Repo: RocketChat/Rocket.Chat PR: 36292
File: apps/meteor/client/hooks/useHasValidLocationHash.ts:7-12
Timestamp: 2026-04-14T21:10:31.855Z
Learning: When reviewing files in apps/meteor/client/hooks/, do not treat JSDoc-style comments on React hooks (especially exported hooks) as a violation of any “avoid code comments in implementation” guideline. It’s acceptable to use JSDoc to document the public API of exported hooks (e.g., parameter/return types, intended usage), as long as it documents behavior/contracts rather than adding narrative implementation comments.

Applied to files:

  • apps/meteor/client/hooks/useFileInput.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
📚 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/hooks/useFileInput.ts
  • apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx
  • apps/meteor/client/lib/normalizeThreadMessage.tsx
  • apps/meteor/client/hooks/useRoomIcon.tsx
  • apps/meteor/client/lib/createSidebarItems.ts
  • apps/meteor/client/hooks/useSingleFileInput.ts
  • apps/meteor/client/lib/appLayout.tsx
📚 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/Sidebar/SidebarNavigationItem.tsx
  • apps/meteor/client/lib/normalizeThreadMessage.tsx
  • apps/meteor/client/hooks/useRoomIcon.tsx
  • apps/meteor/client/lib/appLayout.tsx
🔇 Additional comments (7)
apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx (1)

3-3: LGTM!

Also applies to: 16-16

apps/meteor/client/lib/createSidebarItems.ts (1)

3-3: LGTM!

Also applies to: 16-16

apps/meteor/client/lib/appLayout.tsx (1)

2-2: LGTM!

Also applies to: 13-13, 15-15, 19-22, 24-26, 28-39

apps/meteor/client/hooks/useFileInput.ts (1)

8-8: LGTM!

apps/meteor/client/hooks/useSingleFileInput.ts (1)

11-11: LGTM!

apps/meteor/client/hooks/useRoomIcon.tsx (1)

10-10: LGTM!

apps/meteor/client/lib/normalizeThreadMessage.tsx (1)

8-8: LGTM!


Walkthrough

This PR refactors React type constraints across multiple client-side modules, broadening ReactElement return types to ReactNode, explicitly initializing refs in hooks, and clarifying function return type annotations. No runtime behavior is modified.

Changes

React type and ref initialization refactor

Layer / File(s) Summary
Badge callback type broadening in sidebar
apps/meteor/client/components/Sidebar/SidebarNavigationItem.tsx, apps/meteor/client/lib/createSidebarItems.ts
SidebarNavigationItem component and Item type both update their badge prop from () => ReactElement to () => ReactNode, allowing text nodes and fragments alongside elements.
App layout subscription ReactNode conversion
apps/meteor/client/lib/appLayout.tsx
AppLayoutSubscription methods (getSnapshot, setCurrentValue, render, wrap) switch from ReactElement to ReactNode, removing the AppLayoutDescriptor alias and broadening layout descriptor types.
Hook and function type refinements
apps/meteor/client/hooks/useFileInput.ts, apps/meteor/client/hooks/useSingleFileInput.ts, apps/meteor/client/hooks/useRoomIcon.tsx, apps/meteor/client/lib/normalizeThreadMessage.tsx
File input refs are explicitly initialized with undefined; useRoomIcon return type is parameterized as ReactElement<any>; normalizeThreadMessage removes explicit `ReactElement

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~12 minutes

Possibly related PRs

  • RocketChat/Rocket.Chat#40803: Performs the same React typing refactor—switching UI payload/slot types from ReactElement to ReactNode with no runtime logic changes.
  • RocketChat/Rocket.Chat#40814: Removes or replaces unnecessary ReactElement type annotations with broader ReactNode/looser React types in UI components.
  • RocketChat/Rocket.Chat#40816: Replaces ReactElement type annotations with ReactNode in component/prop/signature typings across multiple files.

Suggested labels

type: chore

Suggested reviewers

  • ggazzo
  • juliajforesti
🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 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 objective of the PR: systematically replacing ReactElement type annotations with ReactNode across multiple files as a preparatory step for React 19 upgrade.
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

@codecov

codecov Bot commented Jun 4, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 70.14%. Comparing base (4588c28) to head (88f489e).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #40817      +/-   ##
===========================================
- Coverage    70.16%   70.14%   -0.03%     
===========================================
  Files         3341     3341              
  Lines       123646   123645       -1     
  Branches     22074    22059      -15     
===========================================
- Hits         86762    86731      -31     
- Misses       33543    33564      +21     
- Partials      3341     3350       +9     
Flag Coverage Δ
e2e 59.38% <100.00%> (-0.02%) ⬇️
e2e-api 46.27% <ø> (-0.83%) ⬇️
unit 70.97% <100.00%> (-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 force-pushed the refactor/prepare-types-for-react-19-15 branch from 5f7f66e to 2c1af2f Compare June 9, 2026 05:52
@tassoevan tassoevan force-pushed the refactor/prepare-types-for-react-19-15 branch from 2c1af2f to 88f489e Compare June 9, 2026 05:55
@tassoevan tassoevan added the stat: QA assured Means it has been tested and approved by a company insider label Jun 9, 2026
@tassoevan tassoevan added this to the 8.6.0 milestone Jun 9, 2026
@tassoevan tassoevan requested a review from a team June 9, 2026 05:55
@tassoevan tassoevan marked this pull request as ready for review June 9, 2026 05:55
@dionisio-bot dionisio-bot Bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 9, 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 7 files

Re-trigger cubic

@ggazzo ggazzo merged commit 021f169 into develop Jun 9, 2026
112 of 122 checks passed
@ggazzo ggazzo deleted the refactor/prepare-types-for-react-19-15 branch June 9, 2026 13:00
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.

3 participants