Fix waitForRender + mergeOptions not working when view controller is in transit #6702
+149
−49
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.
When
waitForRender
is set totrue
, callingNavigation.mergeOptions
early (for example incomponentDidMount
) will lead to the options not being applied as the backing view controller has not yet been placed in the window hierarchy. This PR aims to keep track of any pending view controllers and opens them up to being found via their component id. Thus enablingNavigation.mergeOptions
to work on view controllers in transit.The pending view controllers are now being kept in
RNNLayoutManager
. For that reason, the layout manager was converted to be instantiable.A
NSHashTable
was chosen as the backing storage to support keeping the view controllers as a weak reference.Fixes #6085