chore(0.81): backport fixes (#2878, #2879, #2880)#2884
Merged
Saadnajmi merged 8 commits intomicrosoft:0.81-stablefrom Apr 3, 2026
Merged
chore(0.81): backport fixes (#2878, #2879, #2880)#2884Saadnajmi merged 8 commits intomicrosoft:0.81-stablefrom
Saadnajmi merged 8 commits intomicrosoft:0.81-stablefrom
Conversation
…icrosoft#2880) ## Summary - Add a `layoutSubviews` override in `RCTScrollViewComponentView` on macOS that resets the `_containerView` (documentView) frame to `_contentSize` after AppKit's autoresizing corrupts it - This fixes massive horizontal and vertical overflow when Text is nested inside a ScrollView on the first render ## Root Cause On macOS, the `_containerView` serves as the `NSScrollView`'s `documentView`, whose frame **directly determines the scrollable content area** (unlike iOS where `UIScrollView.contentSize` is a separate property). React's layout system explicitly manages `_containerView.frame` via `updateState:` to match the content bounding rect. However, `autoresizingMask` caused AppKit to **also** resize the container whenever the `NSClipView` resized (e.g., during initial `tile` after mounting). This added the clip view's size delta to the container's dimensions, inflating it well beyond the correct content size. The `layoutSubviews` override runs after AppKit's layout pass (which triggers autoresizing), so it reliably corrects the frame back to the React-managed `_contentSize`. The issue self-corrects on window resize because the size change triggers a React re-layout that overwrites the corrupted frame with fresh measurements. ## Test plan | Before (bug) | After (fix) | |---|---| | <img src="https://github.com/user-attachments/assets/6a63357e-6dd3-4f69-b134-2d0f78c5b995" /> | <img src="https://github.com/user-attachments/assets/5678e2ad-bc40-4987-aaa3-5854c809649e" /> | Fixes microsoft#2857 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
…Up` (microsoft#2879) Cherry-pick of open PR microsoft#2879. Adds a JS shim that transforms legacy validKeysDown/validKeysUp props into the new onKeyDown/onKeyUp handler format for backward compatibility.
|
Khalef1
approved these changes
Apr 2, 2026
- Remove verbose comments after [macOS diff tags - Replace effectiveProps pattern with spread destructuring - Use legacyKeyOverrides with direct prop fallbacks in handlers Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Backport of 3 fixes from
mainto0.81-stable:labelColor(fix(fabric): Switch default Text color to labelColor #2878)validKeysDownandvalidKeysUp(fix(fabric): Add back compat layer forvalidKeysDownandvalidKeysUp#2879)Each fix is a separate commit for easy rebasing when upstream PRs are updated.
Conflict resolutions
RCTUIColor(renamed fromRCTPlatformColoron main). Resolved by keepingRCTUIColorwhile applying theblackColor→labelColorchange.validKeysDownandvalidKeysUp#2879 cherry-picked cleanly. fix(fabric): Add back compat layer forvalidKeysDownandvalidKeysUp#2879 (open PR) was squash-cherry-picked into a single commit.Test plan
validKeysDown/validKeysUpprops still work in Fabric🤖 Generated with Claude Code