react-native-navigation 7.24.3 → 7.25.0-snapshot.552

package/lib/android/app/src/main/java/com/reactnativenavigation/views/sidemenu/SideMenuRoot.java

@@ -12,6 +12,7 @@ import com.reactnativenavigation.options.SideMenuOptions;
 import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
 import com.reactnativenavigation.views.BehaviourAdapter;
 import com.reactnativenavigation.views.BehaviourDelegate;
+import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 
 import androidx.annotation.RestrictTo;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
@@ -23,9 +24,16 @@ import static com.reactnativenavigation.utils.CoordinatorLayoutUtils.matchParent
 
 public class SideMenuRoot extends CoordinatorLayout {
     private SideMenu sideMenu;
+    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public SideMenuRoot(Context context) {
         super(context);
+        attachedOverlayContainer =  new AttachedOverlayContainer(context);
+        addView(attachedOverlayContainer,LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
+    }
+
+    public AttachedOverlayContainer getAttachedOverlayContainer() {
+        return attachedOverlayContainer;
     }
 
     public void addSideMenu(SideMenu sideMenu, BehaviourAdapter behaviourAdapter) {
@@ -89,4 +97,4 @@ public class SideMenuRoot extends CoordinatorLayout {
     public SideMenu getSideMenu() {
         return sideMenu;
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/StackLayout.java

@@ -9,6 +9,7 @@ import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarController;
 import com.reactnativenavigation.views.component.Component;
 import com.reactnativenavigation.views.component.Renderable;
 import com.reactnativenavigation.views.stack.topbar.ScrollDIsabledBehavior;
+import com.reactnativenavigation.views.overlay.AttachedOverlayContainer;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 
@@ -17,18 +18,27 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 @SuppressLint("ViewConstructor")
 public class StackLayout extends CoordinatorLayout implements Component {
     private String stackId;
+    final private AttachedOverlayContainer attachedOverlayContainer ;
 
     public StackLayout(Context context, TopBarController topBarController, String stackId) {
         super(context);
         this.stackId = stackId;
+        attachedOverlayContainer =  new AttachedOverlayContainer(getContext());
         createLayout(topBarController);
     }
 
+    public AttachedOverlayContainer getAttachedOverlayContainer() {
+        return attachedOverlayContainer;
+    }
+
     private void createLayout(TopBarController topBarController) {
         View topBar = topBarController.createView(getContext(), this);
+
         CoordinatorLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, UiUtils.getTopBarHeight(getContext()));
         lp.setBehavior(new ScrollDIsabledBehavior());
         addView(topBar, lp);
+        addView(attachedOverlayContainer,LayoutParams.MATCH_PARENT,LayoutParams.MATCH_PARENT);
+
     }
 
     public String getStackId() {
@@ -37,8 +47,8 @@ public class StackLayout extends CoordinatorLayout implements Component {
 
     @Override
     public boolean isRendered() {
-        return getChildCount() >= 2 &&
-               getChildAt(1) instanceof Renderable &&
-               ((Renderable) getChildAt(1)).isRendered();
+        return getChildCount() >= 3 &&
+                getChildAt(2) instanceof Renderable &&
+                ((Renderable) getChildAt(2)).isRendered();
     }
-}
+}

package/lib/android/app/src/main/java/com/reactnativenavigation/views/stack/topbar/TopBar.java

@@ -31,7 +31,6 @@ import com.reactnativenavigation.options.params.Number;
 import com.reactnativenavigation.options.params.ThemeColour;
 import com.reactnativenavigation.options.parsers.TypefaceLoader;
 import com.reactnativenavigation.utils.CompatUtils;
-import com.reactnativenavigation.utils.ContextKt;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.TopBarCollapseBehavior;
 import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController;

package/lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsStyleHelper.java

@@ -5,7 +5,6 @@ import android.graphics.Typeface;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.reactnativenavigation.options.params.Colour;
 import com.reactnativenavigation.options.params.Number;
 import com.reactnativenavigation.options.params.ThemeColour;
 import com.reactnativenavigation.utils.Functions.Func1;

package/lib/dist/src/interfaces/Options.d.ts

@@ -133,6 +133,16 @@ export interface OptionsLayout {
      * #### (iOS specific)
      */
     autoHideHomeIndicator?: boolean;
+    /**
+     * Add insets to the top layout
+     */
+    insets?: Insets;
+    /**
+     * Resizes the layout when keyboard is visible
+     * @default true
+     * #### (Android specific)
+     */
+    adjustResize?: boolean;
 }
 export declare enum OptionsModalPresentationStyle {
     formSheet = "formSheet",
@@ -840,6 +850,10 @@ export interface ImageSystemSource {
 }
 export declare type ImageResource = ImageSourcePropType | string | ImageSystemSource;
 export interface OptionsBottomTab {
+    /**
+     * Unique id in order to be found in the view hierarchy
+     */
+    id?: string;
     dotIndicator?: DotIndicatorOptions;
     /**
      * Set the text to display below the icon
@@ -1005,6 +1019,26 @@ export interface OverlayOptions {
      * Set this to true if your Overlay contains a TextInput.
      */
     handleKeyboardEvents?: boolean;
+    /**
+     * Attach overlay to anchor view in a certain layer of layout as a tooltip
+     */
+    attach?: {
+        /**
+         * layout id to look for to add as a layer
+         * which can be componentId or stackId or bottomTabsId.
+         */
+        layoutId: string;
+        anchor?: {
+            /**
+             * Anchor view id, TopBar Button, Title Component, BottomTab.
+             */
+            id: string;
+            /**
+             * The anchor view side that the tooltip will be displayed.
+             */
+            gravity: 'top' | 'left' | 'right' | 'bottom';
+        };
+    };
 }
 export interface ModalOptions {
     /**

package/lib/ios/RNNBasePresenter.m

@@ -58,6 +58,15 @@
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
+    UIViewController *viewController = self.boundViewController;
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    if (withDefault.layout.insets.hasValue) {
+        viewController.topMostViewController.additionalSafeAreaInsets =
+            UIEdgeInsetsMake([withDefault.layout.insets.top withDefault:0],
+                             [withDefault.layout.insets.left withDefault:0],
+                             [withDefault.layout.insets.bottom withDefault:0],
+                             [withDefault.layout.insets.right withDefault:0]);
+    }
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)mergeOptions
@@ -83,6 +92,14 @@
         _prefersHomeIndicatorAutoHidden = mergeOptions.layout.autoHideHomeIndicator.get;
         [self.boundViewController setNeedsUpdateOfHomeIndicatorAutoHidden];
     }
+
+    if (mergeOptions.layout.insets.hasValue) {
+        self.boundViewController.topMostViewController.additionalSafeAreaInsets =
+            UIEdgeInsetsMake([withDefault.layout.insets.top withDefault:0],
+                             [withDefault.layout.insets.left withDefault:0],
+                             [withDefault.layout.insets.bottom withDefault:0],
+                             [withDefault.layout.insets.right withDefault:0]);
+    }
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options

package/lib/ios/RNNBottomTabsController.m

@@ -88,6 +88,7 @@
 }
 
 - (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
     [self.presenter viewDidLayoutSubviews];
     [_dotIndicatorPresenter bottomTabsDidLayoutSubviews:self];
 }

package/lib/ios/RNNBridgeManager.mm

@@ -4,11 +4,11 @@
 #import "RNNComponentViewCreator.h"
 #import "RNNEventEmitter.h"
 #import "RNNLayoutManager.h"
+#import "RNNModalHostViewManagerHandler.h"
 #import "RNNReactComponentRegistry.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNSplashScreen.h"
 #import <React/RCTBridge.h>
-#import <React/RCTModalHostViewManager.h>
 #import <React/RCTUIManager.h>
 
 @interface RNNBridgeManager ()
@@ -19,6 +19,7 @@
 @property(nonatomic, strong, readonly) RNNLayoutManager *layoutManager;
 @property(nonatomic, strong, readonly) RNNOverlayManager *overlayManager;
 @property(nonatomic, strong, readonly) RNNModalManager *modalManager;
+@property(nonatomic, strong, readonly) RNNModalHostViewManagerHandler *modalHostViewHandler;
 
 @end
 
@@ -66,7 +67,8 @@
         [[RNNModalManagerEventHandler alloc] initWithEventEmitter:eventEmitter];
     _modalManager = [[RNNModalManager alloc] initWithBridge:bridge
                                                eventHandler:modalManagerEventHandler];
-
+    _modalHostViewHandler =
+        [[RNNModalHostViewManagerHandler alloc] initWithModalManager:_modalManager];
     _layoutManager = [[RNNLayoutManager alloc] init];
 
     id<RNNComponentViewCreator> rootViewCreator =
@@ -105,7 +107,7 @@
 
 - (void)onJavaScriptLoaded {
     [_commandsHandler setReadyToReceiveCommands:true];
-    [_modalManager
+    [_modalHostViewHandler
         connectModalHostViewManager:[self.bridge moduleForClass:RCTModalHostViewManager.class]];
     [[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
 }

package/lib/ios/RNNComponentViewController.m

@@ -111,6 +111,11 @@
     [self updateReactViewConstraints];
 }
 
+- (void)viewDidLayoutSubviews {
+    [super viewDidLayoutSubviews];
+    [self.presenter applyOptionsOnViewDidLayoutSubviews:self.resolveOptions];
+}
+
 - (void)updateReactViewConstraints {
     if (self.isViewLoaded && self.reactView) {
         [NSLayoutConstraint deactivateConstraints:_reactViewConstraints];

package/lib/ios/RNNLayoutOptions.h

@@ -1,5 +1,5 @@
+#import "RNNInsetsOptions.h"
 #import "RNNOptions.h"
-
 @interface RNNLayoutOptions : RNNOptions
 
 @property(nonatomic, strong) Color *backgroundColor;
@@ -7,6 +7,7 @@
 @property(nonatomic, strong) Text *direction;
 @property(nonatomic, strong) id orientation;
 @property(nonatomic, strong) Bool *autoHideHomeIndicator;
+@property(nonatomic, strong) RNNInsetsOptions *insets;
 
 - (UIInterfaceOrientationMask)supportedOrientations;
 

package/lib/ios/RNNLayoutOptions.m

@@ -11,6 +11,7 @@
     self.direction = [TextParser parse:dict key:@"direction"];
     self.orientation = dict[@"orientation"];
     self.autoHideHomeIndicator = [BoolParser parse:dict key:@"autoHideHomeIndicator"];
+    self.insets = [[RNNInsetsOptions alloc] initWithDict:dict[@"insets"]];
     return self;
 }
 
@@ -25,6 +26,9 @@
         self.orientation = options.orientation;
     if (options.autoHideHomeIndicator)
         self.autoHideHomeIndicator = options.autoHideHomeIndicator;
+    if (options.insets.hasValue) {
+        self.insets = options.insets;
+    }
 }
 
 - (UIInterfaceOrientationMask)supportedOrientations {

package/lib/ios/RNNModalHostViewManagerHandler.h

@@ -0,0 +1,11 @@
+#import "RNNModalManager.h"
+#import <Foundation/Foundation.h>
+#import <React/RCTModalHostViewManager.h>
+
+@interface RNNModalHostViewManagerHandler : NSObject
+
+- (instancetype)initWithModalManager:(RNNModalManager *)modalManager;
+
+- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager;
+
+@end

package/lib/ios/RNNModalHostViewManagerHandler.m

@@ -0,0 +1,40 @@
+#import "RNNModalHostViewManagerHandler.h"
+
+@implementation RNNModalHostViewManagerHandler {
+    RNNModalManager *_modalManager;
+}
+
+- (instancetype)initWithModalManager:(RNNModalManager *)modalManager {
+    self = [super init];
+    _modalManager = modalManager;
+    return self;
+}
+
+- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
+    modalHostViewManager.presentationBlock =
+        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
+          dispatch_block_t completionBlock) {
+          if (reactViewController.presentedViewController != viewController &&
+              [self->_modalManager topPresentedVC] != viewController) {
+              [self->_modalManager showModal:viewController
+                                    animated:animated
+                                  completion:^(NSString *_Nonnull componentId) {
+                                    if (completionBlock)
+                                        completionBlock();
+                                  }];
+          }
+        };
+
+    modalHostViewManager.dismissalBlock =
+        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
+          dispatch_block_t completionBlock) {
+          [self->_modalManager dismissModal:viewController
+                                   animated:animated
+                                 completion:^{
+                                   if (completionBlock)
+                                       completionBlock();
+                                 }];
+        };
+}
+
+@end

package/lib/ios/RNNModalManager.h

@@ -1,7 +1,6 @@
 #import "RNNModalManagerEventHandler.h"
 #import <Foundation/Foundation.h>
 #import <React/RCTBridge.h>
-#import <React/RCTModalHostViewManager.h>
 #import <UIKit/UIKit.h>
 
 typedef void (^RNNTransitionCompletionBlock)(void);
@@ -13,7 +12,6 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
 
 - (instancetype _Nonnull)initWithBridge:(RCTBridge *_Nonnull)bridge
                            eventHandler:(RNNModalManagerEventHandler *_Nonnull)eventHandler;
-- (void)connectModalHostViewManager:(RCTModalHostViewManager *_Nonnull)modalHostViewManager;
 
 - (void)showModal:(UIViewController *_Nonnull)viewController
          animated:(BOOL)animated
@@ -25,4 +23,6 @@ typedef void (^RNNTransitionRejectionBlock)(NSString *_Nonnull code, NSString *_
 
 - (void)reset;
 
+- (UIViewController *)topPresentedVC;
+
 @end

package/lib/ios/RNNModalManager.m

@@ -32,32 +32,6 @@
     return self;
 }
 
-- (void)connectModalHostViewManager:(RCTModalHostViewManager *)modalHostViewManager {
-    modalHostViewManager.presentationBlock =
-        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
-          dispatch_block_t completionBlock) {
-          if (reactViewController.presentedViewController != viewController) {
-              [self showModal:viewController
-                     animated:animated
-                   completion:^(NSString *_Nonnull componentId) {
-                     if (completionBlock)
-                         completionBlock();
-                   }];
-          }
-        };
-
-    modalHostViewManager.dismissalBlock =
-        ^(UIViewController *reactViewController, UIViewController *viewController, BOOL animated,
-          dispatch_block_t completionBlock) {
-          [self dismissModal:viewController
-                    animated:animated
-                  completion:^{
-                    if (completionBlock)
-                        completionBlock();
-                  }];
-        };
-}
-
 - (void)showModal:(UIViewController<RNNLayoutProtocol> *)viewController
          animated:(BOOL)animated
        completion:(RNNTransitionWithComponentIdCompletionBlock)completion {

package/lib/ios/RNNStackPresenter.m

@@ -88,6 +88,7 @@
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
+    [super applyOptionsOnViewDidLayoutSubviews:options];
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
     if (withDefault.topBar.background.component.name.hasValue) {
         [self presentBackgroundComponent];

package/lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -51,6 +51,8 @@
 		4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */; };
 		500623A525B7003A0086AB39 /* RNNShadowOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 500623A325B7003A0086AB39 /* RNNShadowOptions.h */; };
 		500623A625B7003A0086AB39 /* RNNShadowOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 500623A425B7003A0086AB39 /* RNNShadowOptions.m */; };
+		5006E12C27974B8900D106A6 /* RNNModalHostViewManagerHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */; };
+		5006E12D27974B8900D106A6 /* RNNModalHostViewManagerHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */; };
 		5008641223856A2D00A55BE9 /* UITabBar+utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 5008641023856A2C00A55BE9 /* UITabBar+utils.m */; };
 		501214C9217741A000435148 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 501214C8217741A000435148 /* libOCMock.a */; };
 		501223D72173590F000F5F98 /* RNNStackPresenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 501223D52173590F000F5F98 /* RNNStackPresenter.h */; };
@@ -580,6 +582,8 @@
 		4534E72420CB6724009F8185 /* RNNLargeTitleOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLargeTitleOptions.m; sourceTree = "<group>"; };
 		500623A325B7003A0086AB39 /* RNNShadowOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNShadowOptions.h; sourceTree = "<group>"; };
 		500623A425B7003A0086AB39 /* RNNShadowOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNShadowOptions.m; sourceTree = "<group>"; };
+		5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalHostViewManagerHandler.h; sourceTree = "<group>"; };
+		5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNModalHostViewManagerHandler.m; sourceTree = "<group>"; };
 		5008641023856A2C00A55BE9 /* UITabBar+utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITabBar+utils.m"; sourceTree = "<group>"; };
 		5008641123856A2D00A55BE9 /* UITabBar+utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UITabBar+utils.h"; sourceTree = "<group>"; };
 		501214C8217741A000435148 /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = "<group>"; };
@@ -1092,6 +1096,8 @@
 				390AD476200F499D00A8250D /* RNNSwizzles.m */,
 				506A2B1220973DFD00F43A95 /* RNNErrorHandler.h */,
 				506A2B1320973DFD00F43A95 /* RNNErrorHandler.m */,
+				5006E12A27974B8900D106A6 /* RNNModalHostViewManagerHandler.h */,
+				5006E12B27974B8900D106A6 /* RNNModalHostViewManagerHandler.m */,
 				50644A1E20E11A720026709C /* Constants.h */,
 				50644A1F20E11A720026709C /* Constants.m */,
 				50706E6B20CE7CA5003345C3 /* UIImage+utils.h */,
@@ -1818,6 +1824,7 @@
 			files = (
 				506BF6622600AE7600A22755 /* BoundsTransition.h in Headers */,
 				91CB34C9250ED50C000C132B /* RNNSearchBarOptions.h in Headers */,
+				5006E12C27974B8900D106A6 /* RNNModalHostViewManagerHandler.h in Headers */,
 				5060DE73219DAD7E00D0C052 /* ReactNativeNavigation.h in Headers */,
 				506BF7CE26067B0500A22755 /* AnimatedUIImageView.h in Headers */,
 				5022EDBD2405237100852BA6 /* BottomTabPresenterCreator.h in Headers */,
@@ -2337,6 +2344,7 @@
 				5017D9EF239D2FAF00B74047 /* BottomTabsAfterInitialTabAttacher.m in Sources */,
 				5008641223856A2D00A55BE9 /* UITabBar+utils.m in Sources */,
 				9FDA2ABE24F2A42C005678CC /* RCTConvert+UIFontWeight.m in Sources */,
+				5006E12D27974B8900D106A6 /* RNNModalHostViewManagerHandler.m in Sources */,
 				9FDA2AC024F2A43B005678CC /* RCTConvert+SideMenuOpenGestureMode.m in Sources */,
 				50BCB27223F1650800D6C8E5 /* SharedElementTransition.m in Sources */,
 				E5F6C3A822DB4D0F0093C2CE /* UIView+Utils.m in Sources */,

package/lib/src/interfaces/Options.ts

@@ -180,6 +180,18 @@ export interface OptionsLayout {
    * #### (iOS specific)
    */
   autoHideHomeIndicator?: boolean;
+
+  /**
+   * Add insets to the top layout
+   */
+  insets?: Insets;
+
+  /**
+   * Resizes the layout when keyboard is visible
+   * @default true
+   * #### (Android specific)
+   */
+  adjustResize?: boolean;
 }
 
 export enum OptionsModalPresentationStyle {
@@ -920,6 +932,11 @@ export interface ImageSystemSource {
 export type ImageResource = ImageSourcePropType | string | ImageSystemSource;
 
 export interface OptionsBottomTab {
+  /**
+   * Unique id in order to be found in the view hierarchy
+   */
+  id?: string;
+
   dotIndicator?: DotIndicatorOptions;
 
   /**
@@ -1089,6 +1106,27 @@ export interface OverlayOptions {
    * Set this to true if your Overlay contains a TextInput.
    */
   handleKeyboardEvents?: boolean;
+
+  /**
+   * Attach overlay to anchor view in a certain layer of layout as a tooltip
+   */
+  attach?: {
+    /**
+     * layout id to look for to add as a layer
+     * which can be componentId or stackId or bottomTabsId.
+     */
+    layoutId: string;
+    anchor?: {
+      /**
+       * Anchor view id, TopBar Button, Title Component, BottomTab.
+       */
+      id: string;
+      /**
+       * The anchor view side that the tooltip will be displayed.
+       */
+      gravity: 'top' | 'left' | 'right' | 'bottom';
+    };
+  };
 }
 
 export interface ModalOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.24.3",
+  "version": "7.25.0-snapshot.552",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,
@@ -66,6 +66,8 @@
     "tslib": "1.9.3"
   },
   "devDependencies": {
+    "pixelmatch": "^5.2.1",
+    "pngjs": "^6.0.0",
     "@babel/plugin-proposal-export-default-from": "7.10.1",
     "@babel/plugin-proposal-export-namespace-from": "7.10.1",
     "@babel/types": "7.15.6",

package/.buildkite/pipeline.yml

@@ -1,59 +0,0 @@
-steps:
-  - block: ":rocket: Release!"
-    prompt: "Fill out the details for release"
-    if: 'build.message =~ /^release\$/i'
-    fields:
-      - text: "VERSION"
-        key: "version"
-      - text: "NPM_TAG"
-        key: "npm-tag"
-        default: 'null'
-        required: false
-      - text: "BUILD_DOCUMENTATION_VERSION"
-        key: "build-documentation-version"
-        default: 'null'
-        hint: 'Leave NULL if no version is specified'
-      - text: "REMOVE_DOCUMENTATION_VERSION"
-        key: "remove-documentation-version"
-        default: 'null'
-        hint: 'Leave NULL if no version is specified'
-  
-  - label: ":android: Android"
-    command:
-    - "nvm install"
-    - "npm install"
-    - "npm run test-js"
-    - "npm run test-unit-android -- --release"
-    - "npm run test-e2e-android-multi -- --release --headless --verbose --ci"
-    key: "android_build"
-    timeout_in_minutes: 90
-
-  - label: ":ios: iOS - Unit"
-    command:
-    - "nvm install"
-    - "npm install"
-    - "npm run test-unit-ios -- --release"
-    key: "ios_unit"
-    timeout_in_minutes: 90
-
-  - label: ":ios: iOS - E2E"
-    command:
-    - "nvm install"
-    - "npm install"
-    - "npm run test-snapshot-ios -- --release"
-    - "npm run test-e2e-ios -- --release --multi --ci"
-    key: "ios_e2e"
-    timeout_in_minutes: 90
-
-  - label: ":package: Publish"
-    env:
-    if: "build.pull_request.id == null"
-    command:
-    - "nvm install"
-    - "npm install"
-    - "npm run release"
-    depends_on:
-    - "android_build"
-    - "ios_unit"
-    - "ios_e2e"
-    timeout_in_minutes: 90

package/lib/android/app/src/main/java/com/reactnativenavigation/options/LayoutOptions.java

@@ -1,48 +0,0 @@
-package com.reactnativenavigation.options;
-
-import android.content.Context;
-
-import com.reactnativenavigation.options.params.NullNumber;
-import com.reactnativenavigation.options.params.Number;
-import com.reactnativenavigation.options.params.ThemeColour;
-import com.reactnativenavigation.options.params.NullThemeColour;
-import com.reactnativenavigation.options.parsers.NumberParser;
-
-import org.json.JSONObject;
-
-public class LayoutOptions {
-    public static LayoutOptions parse(Context context, JSONObject json) {
-        LayoutOptions result = new LayoutOptions();
-        if (json == null) return result;
-
-        result.backgroundColor = ThemeColour.parse(context, json.optJSONObject("backgroundColor"));
-        result.componentBackgroundColor = ThemeColour.parse(context, json.optJSONObject("componentBackgroundColor"));
-        result.topMargin = NumberParser.parse(json, "topMargin");
-        result.orientation = OrientationOptions.parse(json);
-        result.direction = LayoutDirection.fromString(json.optString("direction", ""));
-
-        return result;
-    }
-
-    public ThemeColour backgroundColor = new NullThemeColour();
-    public ThemeColour componentBackgroundColor = new NullThemeColour();
-    public Number topMargin = new NullNumber();
-    public OrientationOptions orientation = new OrientationOptions();
-    public LayoutDirection direction = LayoutDirection.DEFAULT;
-
-    public void mergeWith(LayoutOptions other) {
-        if (other.backgroundColor.hasValue()) backgroundColor = other.backgroundColor;
-        if (other.componentBackgroundColor.hasValue()) componentBackgroundColor = other.componentBackgroundColor;
-        if (other.topMargin.hasValue()) topMargin = other.topMargin;
-        if (other.orientation.hasValue()) orientation = other.orientation;
-        if (other.direction.hasValue()) direction = other.direction;
-    }
-
-    public void mergeWithDefault(LayoutOptions defaultOptions) {
-        if (!backgroundColor.hasValue()) backgroundColor = defaultOptions.backgroundColor;
-        if (!componentBackgroundColor.hasValue()) componentBackgroundColor = defaultOptions.componentBackgroundColor;
-        if (!topMargin.hasValue()) topMargin = defaultOptions.topMargin;
-        if (!orientation.hasValue()) orientation = defaultOptions.orientation;
-        if (!direction.hasValue()) direction = defaultOptions.direction;
-    }
-}