react-native-navigation 7.25.1 → 7.25.3

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

@@ -850,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
@@ -862,7 +866,7 @@ export interface OptionsBottomTab {
     /**
      * Set the background color of the badge that is overlayed over the component
      */
-    badgeColor?: string;
+    badgeColor?: Color;
     /**
      * Show the badge with the animation.
      * #### (Android specific)
@@ -1015,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/src/interfaces/Options.ts

@@ -932,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;
 
   /**
@@ -945,7 +950,7 @@ export interface OptionsBottomTab {
   /**
    * Set the background color of the badge that is overlayed over the component
    */
-  badgeColor?: string;
+  badgeColor?: Color;
   /**
    * Show the badge with the animation.
    * #### (Android specific)
@@ -1101,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.25.1",
+  "version": "7.25.3",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,