react-native-navigation 7.24.3-snapshot.492 → 7.25.0-snapshot.543

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/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/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/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-snapshot.492",
+  "version": "7.25.0-snapshot.543",
   "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/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;
-    }
-}