calling setSafeAreaInsets in JS after resize

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageView.h

@@ -44,6 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype _Nonnull)initWithMessage:(OSInAppMessageInternal *)inAppMessage withScriptMessageHandler:(id<WKScriptMessageHandler>)messageHandler;
 - (void)resetWebViewToMaxBoundsAndResizeHeight:(void (^) (NSNumber *newHeight)) completion;
+- (void)updateSafeAreaInsets;
 - (void)setupWebViewConstraints;
 - (void)loadReplacementURL:(NSURL *)url;
 - (void)loadedHtmlContent:(NSString *)html withBaseURL:(NSURL *)url;

iOS_SDK/OneSignalSDK/Source/OSInAppMessageView.m

@@ -151,6 +151,28 @@ - (void)resetWebViewToMaxBoundsAndResizeHeight:(void (^) (NSNumber *newHeight))
     }];
 }
 
+- (void)updateSafeAreaInsets {
+    if (@available(iOS 11, *)) {
+        UIWindow *keyWindow = UIApplication.sharedApplication.keyWindow;
+        CGFloat top = keyWindow.safeAreaInsets.top;
+        CGFloat bottom = keyWindow.safeAreaInsets.bottom;
+        CGFloat right = keyWindow.safeAreaInsets.right;
+        CGFloat left = keyWindow.safeAreaInsets.left;
+        NSString *safeAreaInsetsObjectString = [NSString stringWithFormat:OS_JS_SAFE_AREA_INSETS_OBJ,top, bottom, right, left];
+        
+        NSString *setInsetsString = [NSString stringWithFormat:OS_SET_SAFE_AREA_INSETS_METHOD, safeAreaInsetsObjectString];
+        [self.webView evaluateJavaScript:setInsetsString completionHandler:^(NSDictionary *result, NSError * _Nullable error) {
+            if (error) {
+                NSString *errorMessage = [NSString stringWithFormat:@"Javascript Method: %@ Evaluated with Error: %@", OS_SET_SAFE_AREA_INSETS_METHOD, error];
+                [OneSignal onesignal_Log:ONE_S_LL_ERROR message:errorMessage];
+                return;
+            }
+            NSString *successMessage = [NSString stringWithFormat:@"Javascript Method: %@ Evaluated with Success: %@", OS_SET_SAFE_AREA_INSETS_METHOD, result];
+            [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:successMessage];
+        }];
+    }
+}
+
 - (NSNumber *)extractHeightFromMetaDataPayload:(NSDictionary *)result {
     return @([result[@"rect"][@"height"] intValue]);
 }

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m

@@ -279,13 +279,7 @@ - (NSString *)setContentInsetsInHTML:(NSString *)html {
         CGFloat bottom = keyWindow.safeAreaInsets.bottom;
         CGFloat right = keyWindow.safeAreaInsets.right;
         CGFloat left = keyWindow.safeAreaInsets.left;
-        NSString *safeAreaInsetsObjectString = [NSString stringWithFormat:@"{\n\
-                            top: %f,\n\
-                            bottom: %f,\n\
-                            right: %f,\n\
-                            left: %f,\n\
-                        }",top, bottom, right, left];
-        //Script to set the tags for liquid tag substitution
+        NSString *safeAreaInsetsObjectString = [NSString stringWithFormat:OS_JS_SAFE_AREA_INSETS_OBJ,top, bottom, right, left];
         NSString *insetsString = [NSString stringWithFormat:@"\n\n\
                              <script> \
                                 setSafeAreaInsets(%@);\
@@ -706,10 +700,6 @@ - (BOOL)shouldDismissMessageWithPanGestureOffset:(double)offset withVelocity:(do
     }
 }
 
-- (void)updateSafeAreaInsets {
-    
-}
-
 /*
  This delegate function gets called when in-app html is load or action button is tapped
  */
@@ -741,7 +731,7 @@ - (void)jsEventOccurredWithBody:(NSData *)body {
             case OSInAppMessageBridgeEventTypePageResize: {
                 // Unused resize event for IAM during actions like orientation changes and displaying an IAM
                 // self.message.height = event.resize.height;
-                [self updateSafeAreaInsets];
+                [self.messageView updateSafeAreaInsets];
                 break;
             }
             case OSInAppMessageBridgeEventTypeActionTaken: {

iOS_SDK/OneSignalSDK/Source/OSInAppMessagingDefines.h

@@ -92,8 +92,16 @@ typedef NS_ENUM(NSUInteger, OSTriggerOperatorType) {
 // Verify that a string is a valid dynamic trigger
 #define OS_IS_TRIGGER_PROPERTY(kind) [OS_TRIGGER_PROPERTY_STRINGS containsObject:property]
 
+// Javascript object
+#define OS_JS_SAFE_AREA_INSETS_OBJ @"{\n\
+    top: %f,\n\
+    bottom: %f,\n\
+    right: %f,\n\
+    left: %f,\n\
+}"
 // JavaScript method names
 #define OS_JS_GET_PAGE_META_DATA_METHOD @"getPageMetaData()"
+#define OS_SET_SAFE_AREA_INSETS_METHOD @"setSafeAreaInsets(%@)"
 
 #define PREFERRED_VARIANT_ORDER @[@"ios", @"app", @"all"]