refact: merge Fabric & Paper impls: ScreenView & ScreenController (1) #1415
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
RNSScreenController to RNSScreen
It caused RN_FABRIC_ENABLED flag to be invalid (as it merged with
previous flag from the list...)
Otherwise C++ standard headers are not visible from .m files -> project fails to build. e.g. Whem=n A.m includes B.h & B.h imports memory header: "#include <memory>" -- memory header is not visible & compilation fails
paper specific section
1. move the prop to implemented section in JS 2. move the prop to "common" section in RNSScreenView interface
specific section
specific section Aim: to ake project compile
most likely some kind of merging artifact
most likely some kind of merge artifact
temporary solution until customAnimationOnSwipe is not added to RNSScreenView on Fabric
these directives should be removed once implementations ale fully merged
…ansion/react-native-screens into @kkafar/merge-fabric-to-paper
8 tasks
Notice change of RNSScreenView#controller type from UIViewController to RNSScreen
from RNSScreenView implementation
temporary solution until it is not migrated
kkafar
changed the title
Fabric implementation does not need it, but RNSScreenManager is required
WoLewicki
reviewed
Apr 22, 2022
mccoyplayer
pushed a commit
to mccoyplayer/reactScreen
that referenced
this pull request
Feb 9, 2024
… (#1415)
* chore: Set RN_FABRIC_ENABLED compiler flag when fabric is enabled
* refract: Move RNSScreenComponentView implementation to RNSScreenView &&
RNSScreenController to RNSScreen
* refract: Rename dependencies to make previous change work
* chore: update Cocoapods to .3
* fix: type in RNSScreen.mm
* fix: add missing space to compiler flags in RNScreens.podspec
It caused RN_FABRIC_ENABLED flag to be invalid (as it merged with
previous flag from the list...)
* refact: rename all source .m files to .mm
Otherwise C++ standard headers are not visible from .m files -> project
fails to build.
e.g. Whem=n A.m includes B.h & B.h imports memory header: "#include
<memory>" -- memory header is not visible & compilation fails
* chore: update FabricExample's Podfile.lock
* fix: move reactSetFrame: method to Paper specific section
* fix: fix typo in ifdef directive
* fix: temporary: move setActivityStateOrNil & setPointerEvents methods to
paper specific section
* fix: add missing replaceAnimation prop (NOT TESTED)
1. move the prop to implemented section in JS
2. move the prop to "common" section in RNSScreenView interface
* fix: move notifyFinishTransitioning method to Paper specific section
* fix: move notifyDismissCancelledWithDismissCount: method to Paper
specific section
* fix: move notifyTransitionProgress:closing:goingForward: method to Paper
specific section
Aim: to ake project compile
* fix: remove duplication of prop setting
most likely some kind of merging artifact
* chore: change handling of unsupported props to noop
* fix: move RNSScreenManager impl & def under !RN_FABRIC_ENABLED condition
* fix: remove duplicated prop update in updateProps method
most likely some kind of merge artifact
* fix: temporary: exclude usages of customAnimationOnSwipe from Fabric
temporary solution until customAnimationOnSwipe is not added to
RNSScreenView on Fabric
* fix: make the project compile
these directives should be removed once implementations ale fully merged
* chore: restore NS_ASSUME_NONNULL_{BEGIN,END} macros
* refact: apply linter suggestions
* fix: restore RNSScreenManager on Fabric
* refact: apply linter suggestion
* fix: remove merge artifact
* fix: add *.mm sources to TestExample project
* fix: make TestsExample compile
Notice change of RNSScreenView#controller type from UIViewController to
RNSScreen
* potentially important: remove RNSScreen *_controller field
from RNSScreenView implementation
* chore: move setViewToSnapshot & resetViewToScreen methods to Fabric
specific section
* chore: merge viewWillAppear: methods
* chore: merge viewWillDisappear methods
* chore: merge viewDidAppear methods
* chore: merge viewDidDisappear methods
* chore: merge viewDidLayoutSubviews methods
* chore: move findFirstResponder method to paper specific section
* chore: move willMoveToParentViewController method to paper specific
section
* chore: move hideHeaderIfNecessary method to paper specific section
* chore: move traverseForScrollView: method to paper specific section
* chore: move methods connected to transitioning to paper specific section
temporary solution until it is not migrated
* chore: remove leftover comments
* refact: rename BASE_VIEW -> RNS_BASE_VIEW
* refact: apply linter suggestions
* refact: rename EXPECTED_VIEW -> RNS_EXPECTED_VIEW§
* chore: restore back initWithBridge method for Fabric
Fabric implementation does not need it, but RNSScreenManager is required
* fix: restore back notifyFinishTransitioning method for paper
* fix: tvOS: exclude props not existion on tv platform
* chore: remove unnecessary header guard directives from RNSConvert.h
* chore: remove check if passed view is of class RNSScreenView
see: software-mansion/react-native-screens#1415 (comment)
Co-authored-by: Wojciech Lewicki <wojciech.lewicki@swmansion.com>
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
PRs mentioned just above aim to merge new Fabric components implementation to Paper.
They should be merged in ascending order (each PR has a order number associated).
Test code and steps to reproduce
Checklist