Fix Text running flattenStyle multiple times #14041
Merged
Conversation
This file contains 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
TatianaKapos
changed the title
microsoft-github-policy-service
bot
added
Area: Paper
Area: Text
Area: Text Style Props
chrisglein
approved these changes
Oct 30, 2024
| @@ -144,25 +146,32 @@ const Text: React.AbstractComponent<TextProps, TextForwardRef> = | |||
|
|
|||
| let _selectable = selectable; | |||
|
|
|||
| const processedStyle = flattenStyle(_style); | |||
| let processedStyle = flattenStyle<TextStyleProp>(_style); | |||
There was a problem hiding this comment.
Why moving to let instead of const? It seems like the variable isn't reassigned.
There was a problem hiding this comment.
Good question, this is actually an upstream file: https://github.com/facebook/react-native/pull/45340/files, so this change comes from Meta!
TatianaKapos
added a commit
to TatianaKapos/react-native-windows
that referenced
this pull request
Oct 30, 2024
* integrate rn #45340 and #45345 * Change files * remove dead windows code
TatianaKapos
added a commit
that referenced
this pull request
Oct 30, 2024
|
Thanks @TatianaKapos ! |
acoates-ms
pushed a commit
to acoates-ms/react-native-windows
that referenced
this pull request
Dec 6, 2024
* integrate rn #45340 and #45345 * Change files * remove dead windows code
acoates-ms
added a commit
that referenced
this pull request
Dec 9, 2024
* Fix issue with prop cloning with custom native props (#14061) * Fix issue with prop cloning with custom native props * format * prettier * Change files --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * Export MS.RN.Color ctor in Office dll (#14082) * Export MS.RN.Color ctor in Office dll * Change files * Implement TxScreenToClient and TxClientToScreen * format --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * TextInput caret becomes visible on non-focused TextInputs on resize (#14091) * TextInput caret becomes visible on non-focused TextInputs on resize * Change files --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * [Fabric] Introducing autocapitalize prop in TextInput - Take 2 (#13343) * New implementation of autocapitalize! * Change files * Fixed bug for sentences scenario * Just keep characters mode for now * Revert "Just keep characters mode for now" This reverts commit 60ca1ce. * Re-apply changes minus packages.json.lock * The original js file was deleted, re-applying changes * Fixed snapshot and lint errors * Fix override mismatch, added comments * Remove stale test check * Minor changes * Update obsolete snapshot * Add very basic box-shadow support (#14028) * Add very basic box-shadow support * Change files * Focus should notify island host when tab loop wraps to give host oportunity to take focus (#14026) * Focus should notify island host when tab loop wraps to give host oportunity to take focus * Change files * Default scroll to bring a component into view should have padding around the viewport (#14018) * Default scroll to bring a component into view should have padding around the viewport * Change files * Update focus visuals to use cornerRadius and inner/outer strokes (#14008) * Update focus visuals to use cornerRadius and inner/outer strokes. * Change files * Format * lint fix * Scale focus border for scaleFactor * Fix Text running flattenStyle multiple times (#14041) * integrate rn #45340 and #45345 * Change files * remove dead windows code * Fixing text components not rendering a border with Paper (#14054) ## Description Text components rendered in Paper need to have check if the style they are rendering contains border style props. This bug occurs when the passed in style is an array. From what I can tell, this bug has existed for a long time, possibly forever. [4 Years Ago](946ba7f) This PR fixed borders not rendering for text, but did not address text components with an array of styles. [3 Years Ago](ee4d83d#diff-5beb08e50a61de475cd20c6e68588ac3a5cd687a971883167fe75fc97a0dbdea) This PR changes naming, but not the logic. This PR switches the style that is checked for border props from the one that is passed in to the one that is flattened. This is the type of JSX that is broken. The text does not render a border. ```tsx <Text style={[{ borderColor: "red", borderWidth: 3 }]}>{"hello world"}</Text> ``` ### Type of Change - Bug fix (non-breaking change which fixes an issue) ### Why This reenables borders for Paper text components. ### What Swapped a variable in text.window.js that is used to check for border style props. ## Screenshots Add any relevant screen captures here from before or after your changes. ## Testing Local tests. ## Changelog Fixing text components not rendering a border with Paper --------- Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Jon Thysell <[email protected]> * [Fabric] Get Modal to host RN components in new hwnd (#13500) * save state * add example * build but blank page still :( * clean up comments * visuals show up in new hwnd! * clean up code * better naming and unfork Modal examples * testing save state * Make the RN island a Modal member var * Failed attempt at skipping root view in CEH, leaving it for learning purposes * you can click on UI! * clean up code * Change files * save state * remove hardcoded rootTag * add width/height to example * add test * revert simple.tsx * remove test * update snapshot * feedback part 1: make Modal a RootComponentView * feedback part2: simplify MountChildren * fix deleting modal * feedback round2 * remove comment * remove imports * feedback part 3 * fix overrides * add simple layout - still has issues with padding/flex * feedback part4 * lint * update overrides * Change files * feedback --------- Co-authored-by: Daniel Ayala <[email protected]> * Support accessibilityState 'checked' (#13962) * Implement accessibilityState checked * Change files * Add Testing * Format and Update Snapshots * Adjust Guardrails * Merge * Format * Format * Lint * Change files * Fix Merge Error * Fix focus visuals being obscured by adjacent views (#14093) * Fix focus visuals being obscured by adjacent views * Change files * update snapshots * Fix uimplemented view * review feedback --------- Co-authored-by: React-Native-Windows Bot <[email protected]> * [Fabric] Fix Modal position, disable input to parent hwnd, and add onShow event (#14109) * default to Modal opening in middle of app * add onShow event * Change files * disable input to parent hwnd * fix changefile * Implement cursor property (#14141) * Implement cursor property * Change files * Disable failing UT (#14153) * Disable failing UT * Change files * [Fabric] Implement onDismiss for Modal and remove titlebar (#14126) * add onDismiss event * remove title bar * Change files * fix lint and snapshots * add option for titlebar * upgrade override * Views with keyUpEvents/keyDownEvents set on them should form a stacking context (#14090) * Key and mouse events require a stacking context * Change files * We dont need a stacking context to bubble JS events - but we do to modify the native handling of the events * fix * Fix change files * build fix * fixes * fix * format --------- Co-authored-by: React-Native-Windows Bot <[email protected]> Co-authored-by: Daniel Ayala <[email protected]> Co-authored-by: Tatiana Kapos <[email protected]> Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Sam Walker <[email protected]> Co-authored-by: Jon Thysell <[email protected]> Co-authored-by: Chiara Mooney <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Resolved #14038, seems that I missed some PRs while implementing the new optimized Text and left in some dead Windows code that no longer gets used. This PR integrates https://github.com/facebook/react-native/pull/45340/files and https://github.com/facebook/react-native/pull/45345/files and removes an extra flattenStyle being used.
Will need to backport this to 0.76 before the release!
Type of Change
Why
Resolves #14038
Testing
Tested the borders still work on Paper in rntester
Changelog
no