@amazon-devices/react-native-screens 2.0.1759135970 → 3.0.9000000000

package/ios/RNSScreenContainer.mm

@@ -1,4 +1,5 @@
 #import "RNSScreenContainer.h"
+#import "RNSDefines.h"
 #import "RNSScreen.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -60,7 +61,7 @@ namespace react = facebook::react;
 
 - (instancetype)init
 {
-  if (self = [super init]) {
+  if (self = [super initWithFrame:CGRectZero]) {
 #ifdef RCT_NEW_ARCH_ENABLED
     static const auto defaultProps = std::make_shared<const react::RNSScreenContainerProps>();
     _props = defaultProps;
@@ -89,6 +90,9 @@ namespace react = facebook::react;
   [self updateContainer];
 }
 
+RNS_IGNORE_SUPER_CALL_BEGIN
+// We do not call super as we do not want to update UIKit model. It will
+// be updated after we receive all mutations.
 - (void)insertReactSubview:(RNSScreenView *)subview atIndex:(NSInteger)atIndex
 {
   subview.reactSuperview = self;
@@ -106,6 +110,7 @@ namespace react = facebook::react;
 {
   return _reactSubviews;
 }
+RNS_IGNORE_SUPER_CALL_END
 
 - (UIViewController *)reactViewController
 {
@@ -251,6 +256,12 @@ namespace react = facebook::react;
 #pragma mark-- Fabric specific
 #ifdef RCT_NEW_ARCH_ENABLED
 
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
 {
   if (![childComponentView isKindOfClass:[RNSScreenView class]]) {

package/ios/RNSScreenContentWrapper.h

@@ -0,0 +1,44 @@
+#import <React/RCTViewManager.h>
+#import <UIKit/UIKit.h>
+
+#if RCT_NEW_ARCH_ENABLED
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTViewComponentView.h>
+#else
+#import <React/RCTView.h>
+#endif // RCT_NEW_ARCH_ENABLED
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class RNSScreenContentWrapper;
+
+@protocol RNSScreenContentWrapperDelegate <NSObject>
+
+/**
+ * This method is called by the content wrapper on a delegate when React Native updates the layout.
+ */
+- (void)reactDidSetFrame:(CGRect)reactFrame forContentWrapper:(RNSScreenContentWrapper *)contentWrapepr;
+
+@end
+
+@interface RNSScreenContentWrapper :
+#ifdef RCT_NEW_ARCH_ENABLED
+    RCTViewComponentView
+#else
+    RCTView
+#endif
+
+/**
+ * Call this method to notify delegate with most recent frame set by React.
+ */
+- (void)triggerDelegateUpdate;
+
+@property (nonatomic, nullable, weak) id<RNSScreenContentWrapperDelegate> delegate;
+
+@end
+
+@interface RNSScreenContentWrapperManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNSScreenContentWrapper.mm

@@ -0,0 +1,67 @@
+#import "RNSScreenContentWrapper.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTConversions.h>
+#import <react/renderer/components/rnscreens/ComponentDescriptors.h>
+#import <react/renderer/components/rnscreens/EventEmitters.h>
+#import <react/renderer/components/rnscreens/Props.h>
+#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+
+namespace react = facebook::react;
+#endif // RCT_NEW_ARCH_ENABLED
+
+@implementation RNSScreenContentWrapper
+
+- (void)reactSetFrame:(CGRect)frame
+{
+  [super reactSetFrame:frame];
+  if (self.delegate != nil) {
+    [self.delegate reactDidSetFrame:frame forContentWrapper:self];
+  }
+}
+
+- (void)triggerDelegateUpdate
+{
+  [self.delegate reactDidSetFrame:self.frame forContentWrapper:self];
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics
+{
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+  if (self.delegate != nil) {
+    [self.delegate reactDidSetFrame:RCTCGRectFromRect(layoutMetrics.frame) forContentWrapper:self];
+  }
+}
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return react::concreteComponentDescriptorProvider<react::RNSScreenContentWrapperComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> RNSScreenContentWrapperCls(void)
+{
+  return RNSScreenContentWrapper.class;
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
+@end
+
+@implementation RNSScreenContentWrapperManager
+
+RCT_EXPORT_MODULE()
+
+- (UIView *)view
+{
+  return [RNSScreenContentWrapper new];
+}
+
+@end

package/ios/RNSScreenFooter.h

@@ -0,0 +1,30 @@
+#import <React/RCTViewManager.h>
+#import <UIKit/UIKit.h>
+
+#if RCT_NEW_ARCH_ENABLED
+#import <React/RCTFabricComponentsPlugins.h>
+#import <React/RCTViewComponentView.h>
+#else
+#import <React/RCTView.h>
+#endif // RCT_NEW_ARCH_ENABLED
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^OnLayoutCallback)(CGRect frame);
+
+@interface RNSScreenFooter :
+#ifdef RCT_NEW_ARCH_ENABLED
+    RCTViewComponentView
+#else
+    RCTView
+#endif
+
+@property (nonatomic, copy, nullable) OnLayoutCallback onLayout;
+
+@end
+
+@interface RNSScreenFooterManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNSScreenFooter.mm

@@ -0,0 +1,142 @@
+#import "RNSScreenFooter.h"
+#import "RNSScreen.h"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <react/renderer/components/rnscreens/ComponentDescriptors.h>
+#import <react/renderer/components/rnscreens/EventEmitters.h>
+#import <react/renderer/components/rnscreens/Props.h>
+#import <react/renderer/components/rnscreens/RCTComponentViewHelpers.h>
+
+#endif // RCT_NEW_ARCH_ENABLED
+
+@implementation RNSScreenFooter {
+  RNSScreenView *_parent;
+}
+
+- (instancetype)init
+{
+  if (self = [super init]) {
+    self.translatesAutoresizingMaskIntoConstraints = false;
+    _parent = nil;
+  }
+  return self;
+}
+
+- (void)willMoveToSuperview:(UIView *)newSuperview
+{
+  [super willMoveToSuperview:newSuperview];
+  //  if ([newSuperview isKindOfClass:RNSScreenView.class]) {
+  //    RNSScreenView *screen = (RNSScreenView *)newSuperview;
+  //    _parent = (RNSScreenView *)newSuperview;
+
+  //    [NSLayoutConstraint activateConstraints:@[
+  //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeBottom
+  //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeBottom multiplier:1.0
+  //      constant:0.0], [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeLeft
+  //      relatedBy:NSLayoutRelationEqual toItem:screen attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0],
+  //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual
+  //      toItem:screen attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint
+  //      constraintWithItem:self attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:screen
+  //      attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0.0], [NSLayoutConstraint
+  //      constraintWithItem:screen attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self
+  //      attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0], [NSLayoutConstraint constraintWithItem:screen
+  //      attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop
+  //      multiplier:1.0 constant:0.0],
+  //    ]];
+  //    [self setNeedsLayout];
+  //  }
+}
+
+- (void)didMoveToSuperview
+{
+  if (_parent != nil) {
+    //    [NSLayoutConstraint activateConstraints:@[
+    //      [NSLayoutConstraint constraintWithItem:self
+    //                                   attribute:NSLayoutAttributeBottom
+    //                                   relatedBy:NSLayoutRelationEqual
+    //                                      toItem:_parent
+    //                                   attribute:NSLayoutAttributeBottom
+    //                                  multiplier:1.0
+    //                                    constant:0.0],
+    //      [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeLeft
+    //      relatedBy:NSLayoutRelationEqual toItem:_parent attribute:NSLayoutAttributeLeft multiplier:1.0
+    //      constant:0.0], [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeRight
+    //      relatedBy:NSLayoutRelationEqual toItem:_parent attribute:NSLayoutAttributeRight multiplier:1.0
+    //      constant:0.0], [NSLayoutConstraint constraintWithItem:self attribute:NSLayoutAttributeTop
+    //      relatedBy:NSLayoutRelationEqual toItem:_parent attribute:NSLayoutAttributeTop multiplier:1.0
+    //      constant:0.0], [NSLayoutConstraint constraintWithItem:_parent attribute:NSLayoutAttributeBottom
+    //      relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeBottom multiplier:1.0
+    //      constant:0.0], [NSLayoutConstraint constraintWithItem:_parent attribute:NSLayoutAttributeLeft
+    //      relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0.0],
+    //      [NSLayoutConstraint constraintWithItem:_parent attribute:NSLayoutAttributeRight
+    //      relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeRight multiplier:1.0 constant:0.0],
+    //      [NSLayoutConstraint constraintWithItem:_parent attribute:NSLayoutAttributeTop
+    //      relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0],
+    //    ]];
+    //    [self setNeedsLayout];
+  }
+}
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+  if (self.onLayout != nil) {
+    self.onLayout(self.frame);
+  }
+  //
+  //  if (self.subviews.count > 0) {
+  //    CGSize childsSize = self.subviews[0].frame.size;
+  //
+  //  }
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#pragma Fabric specific
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
++ (react::ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return react::concreteComponentDescriptorProvider<react::RNSScreenFooterComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> RNSScreenFooterCls(void)
+{
+  return RNSScreenFooter.class;
+}
+
+#else
+
+#pragma Paper specific
+
+- (void)reactSetFrame:(CGRect)frame
+{
+  // ignore frame from react
+  // this view should be layouted by it's parent screen
+  //  [super reactSetFrame:frame];
+}
+
+#endif // RCT_NEW_ARCH_ENABLED
+
+@end
+
+@implementation RNSScreenFooterManager
+
+RCT_EXPORT_MODULE()
+
+- (UIView *)view
+{
+  return [RNSScreenFooter new];
+}
+
+@end

package/ios/RNSScreenNavigationContainer.mm

@@ -43,6 +43,13 @@ namespace react = facebook::react;
 {
   return react::concreteComponentDescriptorProvider<react::RNSScreenNavigationContainerComponentDescriptor>();
 }
+
+// Needed because of this: https://github.com/facebook/react-native/pull/37274
++ (void)load
+{
+  [super load];
+}
+
 #endif
 
 @end

package/ios/RNSScreenStack.h

@@ -22,6 +22,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)markChildUpdated;
 - (void)didUpdateChildren;
+- (void)startScreenTransition;
+- (void)updateScreenTransition:(double)progress;
+- (void)finishScreenTransition:(BOOL)canceled;
+
+@property (nonatomic) BOOL customAnimation;
+@property (nonatomic) BOOL disableSwipeBack;
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #else