Update the iOS skeleton code

klarna · Oct 3, 2023 · c9db334 · c9db334
1 parent ad75a83
commit c9db334
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 28 deletions.
diff --git a/ios/Sources/KlarnaPaymentViewManager.mm b/ios/Sources/KlarnaPaymentViewManager.mm
@@ -3,7 +3,6 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTLog.h>
 
-
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "view/newarch/PaymentViewWrapper.h"
 #else

diff --git a/ios/Sources/KlarnaStandaloneWebViewManager.mm b/ios/Sources/KlarnaStandaloneWebViewManager.mm
@@ -3,7 +3,6 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTLog.h>
 
-
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "view/newarch/KlarnaStandaloneWebViewWrapper.h"
 #else
@@ -25,20 +24,4 @@ - (UIView *)view
     return wrapper;
 }
 
-#pragma mark - Exported Methods
-
-RCT_EXPORT_METHOD(initialize:(nonnull NSNumber*)reactTag returnUrl:(NSString*)returnUrl) {
-
-    [self.bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *,UIView *> *viewRegistry) {
-        KlarnaStandaloneWebViewWrapper* view = (KlarnaStandaloneWebViewWrapper*) viewRegistry[reactTag];
-        if (!view || ![view isKindOfClass:KlarnaStandaloneWebViewWrapper.class]) {
-            RCTLogError(@"Can't find KlarnaStandaloneWebViewWrapper with tag #%@", reactTag);
-            return;
-        }
-        [view initializeStandaloneWebViewWithReturnUrl:returnUrl];
-    }];
-
-
-}
-
 @end
diff --git a/ios/Sources/view/newarch/KlarnaStandaloneWebViewWrapper.h b/ios/Sources/view/newarch/KlarnaStandaloneWebViewWrapper.h
@@ -12,11 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) RCTUIManager* uiManager;
 
-- (void)initializeStandaloneWebViewWithReturnUrl:(NSString*)returnUrl;
-
 @end
 
 NS_ASSUME_NONNULL_END
 
 #endif
-
diff --git a/ios/Sources/view/newarch/KlarnaStandaloneWebViewWrapper.mm b/ios/Sources/view/newarch/KlarnaStandaloneWebViewWrapper.mm
@@ -15,12 +15,64 @@
 
 using namespace facebook::react;
 
-@interface KlarnaStandaloneWebViewWrapper ()
+@interface KlarnaStandaloneWebViewWrapper
+
+@property (nonatomic, strong) KlarnaStandaloneWebView* klarnaStandaloneWebView;
 
 @end
 
 @implementation KlarnaStandaloneWebViewWrapper
 
+#pragma mark - React Native Overrides
+
+- (void) initializeKlarnaStandaloneWebView:(NSString*)returnUrl {
+    if (returnUrl.length > 0) {
+        self.klarnaStandaloneWebView = [[KlarnaStandaloneWebView alloc] initWithReturnURL:[NSURL URLWithString:returnUrl]];
+    } else {
+        // TODO what should we do here?
+    }
+    self.klarnaStandaloneWebView.translatesAutoresizingMaskIntoConstraints = NO;
+
+
+    [self addSubview:self.klarnaStandaloneWebView];
+
+    [NSLayoutConstraint activateConstraints:[[NSArray alloc] initWithObjects:
+                                             [self.klarnaStandaloneWebView.topAnchor constraintEqualToAnchor:self.topAnchor],
+                                             [self.klarnaStandaloneWebView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+                                             [self.klarnaStandaloneWebView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+                                             [self.klarnaStandaloneWebView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
+                                            ]];
+}
+
+- (void) layoutSubviews {
+    [super layoutSubviews];
+    self.klarnaStandaloneWebView.frame = self.bounds;
+    [self.klarnaStandaloneWebView layoutSubviews];
+}
+
+#pragma mark - Standalone Web View Methods
+
+- (instancetype) initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        static const auto defaultProps = std::make_shared<const RNKlarnaStandaloneWebViewProps>();
+        _props = defaultProps;
+    }
+
+    return self;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNKlarnaStandaloneWebViewComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> RNKlarnaStandaloneWebViewCls(void)
+{
+  return KlarnaStandaloneWebViewWrapper.class;
+}
+
 @end
 
 #endif

diff --git a/ios/Sources/view/oldarch/KlarnaStandaloneWebViewWrapper.h b/ios/Sources/view/oldarch/KlarnaStandaloneWebViewWrapper.h
@@ -15,13 +15,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - React Native Overrides
 
-@property (nonatomic, weak) RCTUIManager* uiManager;
+- (void) initializeKlarnaStandaloneWebView;
 
-- (void)initializeStandaloneWebViewWithReturnUrl:(NSString*)returnUrl;
+@property (nonatomic, weak) RCTUIManager* uiManager;
 
 @end
 
 NS_ASSUME_NONNULL_END
 
 #endif
 
+
diff --git a/ios/Sources/view/oldarch/KlarnaStandaloneWebViewWrapper.mm b/ios/Sources/view/oldarch/KlarnaStandaloneWebViewWrapper.mm
@@ -3,7 +3,6 @@
 #import "KlarnaStandaloneWebViewWrapper.h"
 
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
-#import <React/RCTLog.h>
 
 @interface KlarnaStandaloneWebViewWrapper ()
 
@@ -18,11 +17,35 @@ @implementation KlarnaStandaloneWebViewWrapper
 - (void) setReturnUrl:(NSString *)returnUrl {
     _returnUrl = returnUrl;
     if (returnUrl.length > 0) {
-        self.klarnaStandaloneWebView.returnUrl = [NSURL URLWithString:self.returnUrl];
+        self.klarnaStandaloneWebView.returnURL = [NSURL URLWithString:self.returnUrl];
     }
 }
 
+- (void) initializeKlarnaStandaloneWebView {
+    if (self.returnUrl != nil && self.returnUrl.length > 0) {
+        self.klarnaStandaloneWebView = [[KlarnaStandaloneWebView alloc] initWithReturnURL:[NSURL URLWithString:self.returnUrl]];
+        [self.klarnaStandaloneWebView loadURL:[NSURL URLWithString:@"https://google.com"]];
+    } else {
+        // TODO what should we do here?
+    }
+    self.klarnaStandaloneWebView.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [self addSubview:self.klarnaStandaloneWebView];
+
+    [NSLayoutConstraint activateConstraints:[[NSArray alloc] initWithObjects:
+                                             [self.klarnaStandaloneWebView.topAnchor constraintEqualToAnchor:self.topAnchor],
+                                             [self.klarnaStandaloneWebView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+                                             [self.klarnaStandaloneWebView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+                                             [self.klarnaStandaloneWebView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
+                                            ]];
+}
+
+- (void) layoutSubviews {
+    [super layoutSubviews];
+    self.klarnaStandaloneWebView.frame = self.bounds;
+    [self.klarnaStandaloneWebView layoutSubviews];
+}
+
 @end
 
 #endif
-
diff --git a/ios/Sources/view/oldarch/PaymentViewWrapper.mm b/ios/Sources/view/oldarch/PaymentViewWrapper.mm
@@ -9,7 +9,6 @@ @interface PaymentViewWrapper () <KlarnaPaymentEventListener>
 
 @property (nonatomic, strong) KlarnaPaymentView* actualPaymentView;
 
-
 @end
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,6 @@ @interface PaymentViewWrapper () <KlarnaPaymentEventListener>

		@property (nonatomic, strong) KlarnaPaymentView* actualPaymentView;


		@end


Expand Down