uilib-native 3.0.5 → 3.0.6

package/components/Keyboard/KeyboardInput/KeyboardAccessoryView.tsx

@@ -113,6 +113,12 @@ export type KeyboardAccessoryViewProps = {
    * default: true
    */
   useSafeArea?: boolean;
+  /**
+   * iOS only.
+   * Whether or not to include bottom tab bat inset
+   * default: true
+   */
+  usesBottomTabs?: boolean;
 
   children?: React.ReactChild;
 };
@@ -252,7 +258,8 @@ class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps> {
       kbComponent,
       onItemSelected,
       onRequestShowKeyboard,
-      useSafeArea
+      useSafeArea,
+      usesBottomTabs
     } = this.props;
 
     return (
@@ -267,6 +274,7 @@ class KeyboardAccessoryView extends Component<KeyboardAccessoryViewProps> {
         requiresSameParentToManageScrollView={requiresSameParentToManageScrollView}
         addBottomView={addBottomView}
         allowHitsOutsideBounds={allowHitsOutsideBounds}
+        usesBottomTabs={usesBottomTabs}
       >
         <>
           {renderContent?.()}

package/components/Keyboard/KeyboardTracking/KeyboardTrackingView/index.tsx

@@ -20,6 +20,10 @@ export type KeyboardTrackingViewProps = ViewProps & {
     * Allow control safe area
     */
    useSafeArea?: boolean;
+   /**
+    * Whether or not to include bottom tab bar inset
+    */
+   usesBottomTabs?: boolean;
 
    scrollToFocusedInput?: boolean;
    scrollBehavior?: number;

package/ios/reactnativeuilib/keyboardtrackingview/KeyboardTrackingViewTempManager.m

@@ -51,6 +51,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
 @property (nonatomic) KeyboardTrackingScrollBehavior scrollBehavior;
 @property (nonatomic) BOOL addBottomView;
 @property (nonatomic) BOOL useSafeArea;
+@property (nonatomic) BOOL usesBottomTabs;
 @property (nonatomic) BOOL scrollToFocusedInput;
 @property (nonatomic) BOOL allowHitsOutsideBounds;
 
@@ -82,6 +83,7 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
         
         self.addBottomView = NO;
         self.scrollToFocusedInput = NO;
+        self.usesBottomTabs = NO;
         
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(rctContentDidAppearNotification:) name:RCTContentDidAppearNotification object:nil];
     }
@@ -503,14 +505,35 @@ typedef NS_ENUM(NSUInteger, KeyboardTrackingScrollBehavior) {
     });
 }
 
+#pragma mark - root view controller and presenting style
+
+
+- (BOOL)isModal {
+    UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
+    UIViewController *presentedViewController = window.rootViewController.presentedViewController;
+
+    if (presentedViewController != nil) {
+        if ([presentedViewController isKindOfClass:[UINavigationController class]]) {
+            UINavigationController *presented = (UINavigationController*)presentedViewController;
+            if (presented.visibleViewController) {
+                return YES;
+            }
+        }
+    }
+    return NO;
+}
+
+#pragma mark - TabBarController
+
 -(CGFloat)getTabBarHeight
 {
     if (@available(iOS 11.0, *)) {
-        UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
-        if ([window.rootViewController isKindOfClass:[UITabBarController class]])
+        NSLog(@"INBAL usesBottomTabs: %d", self.usesBottomTabs);
+        if (self.usesBottomTabs == YES)
         {
             UITabBarController *tabBarController = [UITabBarController new];
             CGFloat tabBarHeight = tabBarController.tabBar.frame.size.height;
+            UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
             CGFloat bottomPadding = window.safeAreaInsets.bottom;
             return tabBarHeight + bottomPadding;
         }
@@ -650,6 +673,7 @@ RCT_REMAP_VIEW_PROPERTY(manageScrollView, manageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(requiresSameParentToManageScrollView, requiresSameParentToManageScrollView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(addBottomView, addBottomView, BOOL)
 RCT_REMAP_VIEW_PROPERTY(useSafeArea, useSafeArea, BOOL)
+RCT_REMAP_VIEW_PROPERTY(usesBottomTabs, usesBottomTabs, BOOL)
 RCT_REMAP_VIEW_PROPERTY(scrollToFocusedInput, scrollToFocusedInput, BOOL)
 RCT_REMAP_VIEW_PROPERTY(allowHitsOutsideBounds, allowHitsOutsideBounds, BOOL)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uilib-native",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "homepage": "https://github.com/wix/react-native-ui-lib",
   "description": "uilib native components (separated from js components)",
   "main": "components/index.js",