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.

Sign up for GitHub

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

Jump to bottom

refact: merge Fabric & Paper impls: ScreenStackHeaderSubview (4) #1418

Merged
merged 177 commits into from
Apr 28, 2022
Merged

refact: merge Fabric & Paper impls: ScreenStackHeaderSubview (4) #1418

merged 177 commits into from
Apr 28, 2022

Conversation

kkafar
Copy link
Member

@kkafar kkafar commented Apr 21, 2022 •
edited
Loading

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

kkafar and others added 30 commits April 8, 2022 11:38
@kkafar
chore: Set RN_FABRIC_ENABLED compiler flag when fabric is enabled
6f2121a
@kkafar
refract: Move RNSScreenComponentView implementation to RNSScreenView &&
00fc6db 
RNSScreenController to RNSScreen
@kkafar
refract: Rename dependencies to make previous change work
6dd5347
@kkafar
chore: update Cocoapods to .3
9f78cc0
@kkafar
fix: type in RNSScreen.mm
9b18375
@kkafar
fix: add missing space to compiler flags in RNScreens.podspec
4a1c315 
It caused RN_FABRIC_ENABLED flag to be invalid (as it merged with
    previous flag from the list...)
@kkafar
refact: rename all source .m files to .mm
76efc19 
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
@kkafar
chore: update FabricExample's Podfile.lock
947ac3d
@kkafar
fix: move reactSetFrame: method to Paper specific section
c2e020d
@kkafar
fix: fix typo in ifdef directive
f0c88c2
@kkafar
fix: temporary: move setActivityStateOrNil & setPointerEvents methods to
b37a60a 
paper specific section
@kkafar
fix: add missing replaceAnimation prop (NOT TESTED)
6825875 
1. move the prop to implemented section in JS
2. move the prop to "common" section in RNSScreenView interface
@kkafar
fix: move notifyFinishTransitioning method to Paper specific section
ce01586
@kkafar
fix: move notifyDismissCancelledWithDismissCount: method to Paper
8a1525c 
specific section
@kkafar
fix: move notifyTransitionProgress:closing:goingForward: method to Paper
249d675 
specific section

Aim: to ake project compile
@kkafar
fix: remove duplication of prop setting
5e89e5b 
most likely some kind of merging artifact
@kkafar
chore: change handling of unsupported props to noop
d028f87
@kkafar
fix: move RNSScreenManager impl & def under !RN_FABRIC_ENABLED condition
ebdbafa
@kkafar
fix: remove duplicated prop update in updateProps method
cfd3842 
most likely some kind of merge artifact
@kkafar
fix: temporary: exclude usages of customAnimationOnSwipe from Fabric
40d438a 
temporary solution until customAnimationOnSwipe is not added to
RNSScreenView on Fabric
@kkafar
fix: make the project compile
e79ae5f 
these directives should be removed once implementations ale fully merged
@kkafar
chore: merge ScreenStack headers
a7e3012
@kkafar
chore: merge imports in ScreenStack impls
4ea96a7
@kkafar
chore: move initWithFrame: method & add sections
f9160d4
@kkafar
chore: move navigationController:didShowViewController:animated method
22d0484 
to Paper specific section

This method is not present in RNSScreenStackComponentView, therefore I
conclude it is not necessary at least for now
@kkafar
chore: merge presentationControllerDidDismiss: method
60b9d20
@kkafar
chore: move {mount,unmount}ChildComponentView:index: methods
30b3a1e
@kkafar
chore: move takeSnapshot method
384df76
@kkafar
chore: merge didMoveToWindow methods
228aa31
@kkafar
chore: move mountingTransactionWillMountWithMetadata: method to
bdd2c24 
Fabric specific section
@kkafar kkafar marked this pull request as ready for review April 28, 2022 08:14
@kkafar kkafar requested a review from WoLewicki April 28, 2022 08:14
WoLewicki
WoLewicki reviewed Apr 28, 2022
View reviewed changes
Copy link
Member

@WoLewicki WoLewicki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I added some comments.

ios/RNSScreenStackHeaderSubview.mm Outdated Show resolved Hide resolved
ios/RNSScreenStackHeaderSubview.h Outdated Show resolved Hide resolved
ios/RNSScreenStackHeaderConfig.mm Outdated Show resolved Hide resolved
ios/RNSScreenStackHeaderConfig.h Outdated Show resolved Hide resolved
Base automatically changed from @kkafar/merge-fabric-to-paper-screen-stack-header-config to main April 28, 2022 10:28
@kkafar
Merge branch '@kkafar/merge-fabric-to-paper-screen-stack-header-confi…
3e4dce0 
…g' into @kkafar/merge-fabric-to-paper-screen-stack-header-subview
@kkafar
Merge branch 'main' into @kkafar/merge-fabric-to-paper-screen-stack-h…
5dd7c08 
…eader-subview
@kkafar
refact: remove duplicated for loop
b59a975 
This was already done in previous commit, but it somehow came back after
merging base branches.
@kkafar
chore: merge RNSScreenStackHeaderConfig#hitTest:withEvent: method
ad5e7d4 
This was already done in 076be98
(076be98)

Merging base branches bringed it back.
@kkafar
refact: cleanup
29a5f9f
@kkafar kkafar merged commit 568e588 into main Apr 28, 2022
@kkafar kkafar deleted the @kkafar/merge-fabric-to-paper-screen-stack-header-subview branch April 28, 2022 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WoLewicki WoLewicki WoLewicki left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kkafar @WoLewicki