Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refact: merge Fabric & Paper impls: ScreenStack (2) #1416

Merged
merged 113 commits into from
Apr 27, 2022
Merged
Show file tree
Hide file tree
Changes from 112 commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6f2121a
chore: Set RN_FABRIC_ENABLED compiler flag when fabric is enabled
kkafar Apr 7, 2022
00fc6db
refract: Move RNSScreenComponentView implementation to RNSScreenView &&
kkafar Apr 8, 2022
6dd5347
refract: Rename dependencies to make previous change work
kkafar Apr 8, 2022
9f78cc0
chore: update Cocoapods to .3
kkafar Apr 14, 2022
9b18375
fix: type in RNSScreen.mm
kkafar Apr 14, 2022
4a1c315
fix: add missing space to compiler flags in RNScreens.podspec
kkafar Apr 14, 2022
76efc19
refact: rename all source .m files to .mm
kkafar Apr 15, 2022
947ac3d
chore: update FabricExample's Podfile.lock
kkafar Apr 15, 2022
c2e020d
fix: move reactSetFrame: method to Paper specific section
kkafar Apr 15, 2022
f0c88c2
fix: fix typo in ifdef directive
kkafar Apr 15, 2022
b37a60a
fix: temporary: move setActivityStateOrNil & setPointerEvents methods to
kkafar Apr 15, 2022
6825875
fix: add missing replaceAnimation prop (NOT TESTED)
kkafar Apr 15, 2022
ce01586
fix: move notifyFinishTransitioning method to Paper specific section
kkafar Apr 15, 2022
8a1525c
fix: move notifyDismissCancelledWithDismissCount: method to Paper
kkafar Apr 15, 2022
249d675
fix: move notifyTransitionProgress:closing:goingForward: method to Paper
kkafar Apr 15, 2022
5e89e5b
fix: remove duplication of prop setting
kkafar Apr 15, 2022
d028f87
chore: change handling of unsupported props to noop
kkafar Apr 15, 2022
ebdbafa
fix: move RNSScreenManager impl & def under !RN_FABRIC_ENABLED condition
kkafar Apr 15, 2022
cfd3842
fix: remove duplicated prop update in updateProps method
kkafar Apr 15, 2022
40d438a
fix: temporary: exclude usages of customAnimationOnSwipe from Fabric
kkafar Apr 15, 2022
e79ae5f
fix: make the project compile
kkafar Apr 20, 2022
a7e3012
chore: merge ScreenStack headers
kkafar Apr 20, 2022
4ea96a7
chore: merge imports in ScreenStack impls
kkafar Apr 20, 2022
f9160d4
chore: move initWithFrame: method & add sections
kkafar Apr 20, 2022
22d0484
chore: move navigationController:didShowViewController:animated method
kkafar Apr 20, 2022
60b9d20
chore: merge presentationControllerDidDismiss: method
kkafar Apr 20, 2022
30b3a1e
chore: move {mount,unmount}ChildComponentView:index: methods
kkafar Apr 20, 2022
384df76
chore: move takeSnapshot method
kkafar Apr 20, 2022
228aa31
chore: merge didMoveToWindow methods
kkafar Apr 20, 2022
bdd2c24
chore: move mountingTransactionWillMountWithMetadata: method to
kkafar Apr 20, 2022
c246467
chore: merge maybeAddToParentAndUpdateContainer methods
kkafar Apr 20, 2022
c2c6252
chore: move markChildUpdated & didUpdateChildren methods to Paper
kkafar Apr 20, 2022
c91c43b
chore: move insertReactSubview:atIndex: method to Paper specific section
kkafar Apr 20, 2022
16fe33d
chore: move removeReactSubview: method to paper specific section
kkafar Apr 20, 2022
906ce0d
chore: move didUpdateReactSubviews method to paper specific section
kkafar Apr 20, 2022
8c9585d
chore: merge reactAddControllerToClosestParent: methods
kkafar Apr 20, 2022
34f8cb3
chore: merge setModalViewControllers: methods
kkafar Apr 20, 2022
ee139da
chore: WIP: merge setPushViewControllers
kkafar Apr 20, 2022
ed24d05
chore: merge updateContainer methods
kkafar Apr 20, 2022
8140571
chore: move hitTest:withEvent: method to paper specific section
kkafar Apr 20, 2022
899b285
refact: fix braces in updateContainer method
kkafar Apr 20, 2022
35fd105
chore: move invalidate method to paper specific section
kkafar Apr 20, 2022
bc27beb
chore: merge dismissOnReload methods
kkafar Apr 20, 2022
0c57d95
chore: move isInGestureResponseDistance:topScreen: method to paper
kkafar Apr 20, 2022
844820c
chore: merge cancelTouchesInParent methods
kkafar Apr 20, 2022
fa21ff4
chore: merge gestureRecognizerShouldBegin: methods
kkafar Apr 20, 2022
159e07a
chore: move isScrollViewPanGestureRecognizer: method to paper specific
kkafar Apr 20, 2022
c5a3093
chore: move two gestureRecognizer:... methods to paper specific section
kkafar Apr 20, 2022
f0d45dc
chore: move two interactionController getters to paper specific section
kkafar Apr 20, 2022
396d58e
chore: move prepareForRecycle method to fabric specific section & finish
kkafar Apr 20, 2022
7b66535
fix: add facebook::react namespace to C++ react types
kkafar Apr 20, 2022
8b212d3
chore: remove RNSScreenStackComponentView.{h,mm} files
kkafar Apr 20, 2022
7ea7005
chore: add TODOs
kkafar Apr 20, 2022
c523870
chore: restore NS_ASSUME_NONNULL_{BEGIN,END} macros
kkafar Apr 20, 2022
bd73703
refact: apply linter suggestions
kkafar Apr 20, 2022
a0245cf
fix: restore RNSScreenManager on Fabric
WoLewicki Apr 20, 2022
66adb09
Merge branch '@kkafar/merge-fabric-to-paper' of github.com:software-m…
kkafar Apr 20, 2022
57554c9
refact: apply linter suggestion
kkafar Apr 20, 2022
0e73f8f
fix: remove merge artifact
kkafar Apr 20, 2022
f3c937e
chore: merge in base branch
kkafar Apr 20, 2022
f47cf9a
refact: apply linter suggestions
kkafar Apr 20, 2022
f1e9b9d
fix: add *.mm sources to TestExample project
kkafar Apr 21, 2022
5d2b1fb
fix: restore RNScreenStackmanager for Fabric impl
kkafar Apr 21, 2022
dfade18
Merge branch 'main' into @kkafar/merge-fabric-to-paper
kkafar Apr 21, 2022
8de3dc0
Merge branch '@kkafar/merge-fabric-to-paper' into @kkafar/merge-fabri…
kkafar Apr 21, 2022
953299e
fix: make TestsExample compile
kkafar Apr 21, 2022
d46daff
potentially important: remove RNSScreen *_controller field
kkafar Apr 21, 2022
3fa258d
chore: move setViewToSnapshot & resetViewToScreen methods to Fabric
kkafar Apr 21, 2022
5196876
chore: merge viewWillAppear: methods
kkafar Apr 21, 2022
a7e0329
chore: merge viewWillDisappear methods
kkafar Apr 21, 2022
4f0ff72
chore: merge viewDidAppear methods
kkafar Apr 21, 2022
2bf93c5
chore: merge viewDidDisappear methods
kkafar Apr 21, 2022
55e4e19
chore: merge viewDidLayoutSubviews methods
kkafar Apr 21, 2022
77fe908
chore: move findFirstResponder method to paper specific section
kkafar Apr 21, 2022
5193821
chore: move willMoveToParentViewController method to paper specific
kkafar Apr 21, 2022
834ade9
chore: move hideHeaderIfNecessary method to paper specific section
kkafar Apr 21, 2022
53fd009
chore: move traverseForScrollView: method to paper specific section
kkafar Apr 21, 2022
b946e61
chore: move methods connected to transitioning to paper specific section
kkafar Apr 21, 2022
40b8122
Merge branch '@kkafar/merge-fabric-to-paper' into @kkafar/merge-fabri…
kkafar Apr 21, 2022
c2925e3
refact: apply linter suggestions
kkafar Apr 21, 2022
44368ed
chore: remove leftover comments
kkafar Apr 21, 2022
0ab05f3
refact: rename BASE_VIEW -> RNS_BASE_VIEW
kkafar Apr 21, 2022
15a30cf
refact: apply linter suggestions
kkafar Apr 21, 2022
0afaafd
refact: rename EXPECTED_VIEW -> RNS_EXPECTED_VIEW§
kkafar Apr 21, 2022
d0f128d
chore: restore back initWithBridge method for Fabric
kkafar Apr 22, 2022
d6ccca1
fix: restore back notifyFinishTransitioning method for paper
kkafar Apr 22, 2022
3d8a6a0
Merge branch 'main' into @kkafar/merge-fabric-to-paper
kkafar Apr 22, 2022
d465135
fix: tvOS: exclude props not existion on tv platform
kkafar Apr 22, 2022
f0e42f0
chore: remove unnecessary header guard directives from RNSConvert.h
kkafar Apr 22, 2022
d9bb8a6
chore: remove check if passed view is of class RNSScreenView
kkafar Apr 22, 2022
deee6fb
Merge branch '@kkafar/merge-fabric-to-paper' into @kkafar/merge-fabri…
kkafar Apr 22, 2022
0c09657
chore: remove leftover comments
kkafar Apr 22, 2022
8344823
chore: enable RNSScreenStackView#initWithManager on Fabric
kkafar Apr 22, 2022
b0d4b28
refact: add descriptions for #endif
kkafar Apr 22, 2022
ddee964
fix: surround RNSScreenStackCls with RN_FABRIC_ENABLED directive
kkafar Apr 22, 2022
a30b299
Merge branch 'main' into @kkafar/merge-fabric-to-paper-screen-stack
kkafar Apr 22, 2022
141164e
refact: change #ifndef directives to #ifdef <empty> #else ...
kkafar Apr 22, 2022
d8fec05
chore: unify implementation of updateContainer
kkafar Apr 22, 2022
e1eea0e
chore: move markChildUpdated & didUpdateChildren methods to common
kkafar Apr 22, 2022
72605aa
refact: apply linter suggestion
kkafar Apr 22, 2022
0f1def4
refact: move updateScheduled prop decl. to implementation & make
kkafar Apr 22, 2022
be25966
refact: add method for common initialization
kkafar Apr 22, 2022
4ac0183
chore: move reactViewController getter to common section
kkafar Apr 22, 2022
0384afe
chore: extract call common to both impls in didMoveToWindow
kkafar Apr 22, 2022
8399772
refact: improve merge of setPushViewControllers method
kkafar Apr 22, 2022
fbcdde2
fix: introduce shouldAnimate variable
kkafar Apr 22, 2022
afe0cda
chore: remove unused imports
kkafar Apr 22, 2022
4af10c5
refact: apply linter suggestion
kkafar Apr 22, 2022
ca9a6ec
chore: unify conditions in setPushViewControllers:
kkafar Apr 22, 2022
aad05ee
chore: remove duplicated prop declaration
kkafar Apr 22, 2022
25a2008
refact: minor adjustment
kkafar Apr 22, 2022
e739f8f
chore: unify value for shouldAnimate var
kkafar Apr 22, 2022
e15e071
chore: add didMoveToParentViewController: call in
kkafar Apr 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions ios/RNSScreenStack.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#ifdef RN_FABRIC_ENABLED
#import <React/RCTViewComponentView.h>
#else
#import <React/RCTUIManagerObserverCoordinator.h>
#import <React/RCTViewManager.h>
#endif

#import "RNSScreenContainer.h"

Expand All @@ -9,13 +13,21 @@ NS_ASSUME_NONNULL_BEGIN

@end

@interface RNSScreenStackView : UIView <RNSScreenContainerDelegate, RCTInvalidating>

@property (nonatomic, copy) RCTDirectEventBlock onFinishTransitioning;
@interface RNSScreenStackView :
#ifdef RN_FABRIC_ENABLED
RCTViewComponentView
#else
UIView <RNSScreenContainerDelegate, RCTInvalidating>
#endif

- (void)markChildUpdated;
kkafar marked this conversation as resolved.
Show resolved Hide resolved
- (void)didUpdateChildren;

#ifdef RN_FABRIC_ENABLED
#else
@property (nonatomic, copy) RCTDirectEventBlock onFinishTransitioning;
#endif // RN_FABRIC_ENABLED

@end

@interface RNSScreenStackManager : RCTViewManager <RCTInvalidating>
Expand Down
Loading