README.md

@@ -10,6 +10,8 @@ React Native Toast component for both Android and iOS. It just lets iOS users ha
 
 ✅ renders on top of `Modal`s and `Alert`s
 
+✅ avoids keyboard
+
 ✅ customizable styling
 
 ## Screenshots

ios/RNSimpleToast.mm

@@ -108,7 +108,9 @@ - (void)_show:(NSString *)msg
     dispatch_async(dispatch_get_main_queue(), ^{
         RNToastViewController *controller = [RNToastViewController new];
         [controller show];
-        UIView *view = [self getToastView:controller];
+        BOOL kbdAvoidEnabled = [CSToastPositionBottom isEqualToString:positionString];
+        UIView *view = [[RNToastView alloc] initWithFrame:controller.toastWindow.bounds kbdHeight:self->_kbdHeight kbdAvoidEnabled:kbdAvoidEnabled];
+        [controller.toastWindow addSubview:view];
         UIView __weak *weakView = view;
 
         UIView *toast = [view toastViewForMessage:msg title:nil image:nil style:style];
@@ -162,16 +164,6 @@ - (CGPoint)rnToast_centerPointForPosition:(NSString *)gravity withToast:(UIView
     return CGPointMake(view.bounds.size.width / 2.0, (view.bounds.size.height - (toast.frame.size.height / 2.0)) - bottomPadding);
 }
 
-- (UIView *)getToastView:(RNToastViewController *)ctrl {
-    UIView *rootView = ctrl.toastWindow;
-    CGRect bounds = rootView.bounds;
-    bounds.size.height -= _kbdHeight;
-
-    UIView *view = [[RNToastView alloc] initWithFrame:bounds];
-    [rootView addSubview:view];
-    return view;
-}
-
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
         (const facebook::react::ObjCTurboModule::InitParams &)params {

ios/RNToastView.h

@@ -2,4 +2,6 @@
 
 @interface RNToastView : UIView
 
+- (instancetype)initWithFrame:(CGRect)frame kbdHeight:(CGFloat)kbdHeight kbdAvoidEnabled:(BOOL) kbdAvoidEnabled;
+
 @end

ios/RNToastView.m

@@ -1,11 +1,55 @@
 #import "RNToastView.h"
 
-@implementation RNToastView
+@implementation RNToastView {
+    CGRect originalFrame;
+}
 
 - (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
   id hitView = [super hitTest:point withEvent:event];
   if (hitView == self) return nil;
   else return hitView;
 }
 
+- (instancetype)initWithFrame:(CGRect)frame kbdHeight: (CGFloat)kbdHeight kbdAvoidEnabled: (BOOL)kbdAvoidEnabled {
+    originalFrame = frame;
+    if (kbdAvoidEnabled) {
+        frame.size.height -= kbdHeight;
+    }
+    if (self = [super initWithFrame:frame]) {
+        if (kbdAvoidEnabled) {
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(keyboardWillShow:)
+                                                         name:UIKeyboardWillShowNotification
+                                                       object:nil];
+            [[NSNotificationCenter defaultCenter] addObserver:self
+                                                     selector:@selector(keyboardWillHide:)
+                                                         name:UIKeyboardWillHideNotification
+                                                       object:nil];
+        }
+    }
+    return self;
+}
+
+- (void)keyboardWillShow:(NSNotification *)notification {
+    CGSize keyboardSize = [notification.userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue].size;
+    CGFloat height = keyboardSize.height;
+    CGRect frame = originalFrame;
+    frame.size.height -= height;
+    [self setFrame: frame];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification {
+    [self setFrame: originalFrame];
+}
+
+
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                        name:UIKeyboardWillShowNotification
+                                                      object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIKeyboardWillHideNotification
+                                                  object:nil];
+}
+
 @end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-toast",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",