react-native-klarna-inapp-sdk 2.4.1 → 2.4.3

package/README.md

@@ -27,8 +27,8 @@ This repository also includes a test application that you can use to see how it
 
 ### Documentations
 
-* [Overview](https://docs.klarna.com/mobile-sdk/)
-* [Using the Mobile SDK on React Native](https://docs.klarna.com/mobile-sdk/reactnative/)
+* [Overview](https://docs.klarna.com/payments/mobile-payments/before-you-start/introduction-mobile-integrations/)
+* [Using the Mobile SDK on React Native](https://docs.klarna.com/payments/mobile-payments/integrate-with-mobile-sdk/reactnative/native-view/)
 
 ## Getting started
 

package/android/build.gradle

@@ -109,7 +109,7 @@ dependencies {
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:${getExtOrFallback('reactnativeVersion', '+')}"
 
-    implementation 'com.klarna.mobile:sdk:2.6.28'
+    implementation 'com.klarna.mobile:sdk:2.6.29'
 
     testImplementation "junit:junit:4.13.2"
     testImplementation 'androidx.test:core:1.5.0'

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/checkout/KlarnaCheckoutViewEventHandler.java

@@ -10,15 +10,28 @@ import com.klarna.mobile.sdk.api.component.KlarnaComponent;
 
 public class KlarnaCheckoutViewEventHandler implements KlarnaEventHandler {
 
+    public interface OnLoadListener {
+        void onLoad(KlarnaCheckoutView klarnaCheckoutView);
+    }
+
+    private static final String EVENT_LOAD = "load";
     private final KlarnaCheckoutViewEventSender klarnaCheckoutViewEventSender;
+    private final OnLoadListener onLoadListener;
 
-    public KlarnaCheckoutViewEventHandler(KlarnaCheckoutViewEventSender klarnaCheckoutViewEventSender) {
+    public KlarnaCheckoutViewEventHandler(@NonNull KlarnaCheckoutViewEventSender klarnaCheckoutViewEventSender, OnLoadListener onLoadListener) {
         this.klarnaCheckoutViewEventSender = klarnaCheckoutViewEventSender;
+        this.onLoadListener = onLoadListener;
     }
 
     @Override
     public void onEvent(@NonNull KlarnaComponent klarnaComponent, @NonNull KlarnaProductEvent klarnaProductEvent) {
         if (klarnaComponent instanceof KlarnaCheckoutView) {
+            String eventName = klarnaProductEvent.getAction();
+            if (EVENT_LOAD.equalsIgnoreCase(eventName)) {
+                if (onLoadListener != null) {
+                    onLoadListener.onLoad((KlarnaCheckoutView) klarnaComponent);
+                }
+            }
             klarnaCheckoutViewEventSender.sendKlarnaProductEvent((KlarnaCheckoutView) klarnaComponent, klarnaProductEvent);
         }
     }

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/checkout/KlarnaCheckoutViewEventSender.java

@@ -13,7 +13,6 @@ import com.klarna.mobile.sdk.reactnative.common.event.KlarnaEventHandlerEventsUt
 import com.klarna.mobile.sdk.reactnative.common.ui.ResizeObserverWrapperView;
 import com.klarna.mobile.sdk.reactnative.common.util.ArgumentsUtil;
 
-import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -24,7 +23,7 @@ public class KlarnaCheckoutViewEventSender extends ComponentEventSender<ResizeOb
     private static final String EVENT_NAME_ON_RESIZED = "onResized";
     private static final String EVENT_NAME_ON_CHECKOUT_VIEW_READY = "onCheckoutViewReady";
 
-    KlarnaCheckoutViewEventSender(@NonNull final Map<WeakReference<ResizeObserverWrapperView<KlarnaCheckoutView>>, EventDispatcher> viewToDispatcher) {
+    KlarnaCheckoutViewEventSender(@NonNull final Map<ResizeObserverWrapperView<KlarnaCheckoutView>, EventDispatcher> viewToDispatcher) {
         super(viewToDispatcher);
     }
 

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/checkout/KlarnaCheckoutViewManager.java

@@ -19,38 +19,56 @@ import com.klarna.mobile.sdk.reactnative.common.WebViewResizeObserver;
 import com.klarna.mobile.sdk.reactnative.common.ui.ResizeObserverWrapperView;
 import com.klarna.mobile.sdk.reactnative.spec.RNKlarnaCheckoutViewSpec;
 
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.WeakHashMap;
 
 public class KlarnaCheckoutViewManager extends RNKlarnaCheckoutViewSpec<ResizeObserverWrapperView<KlarnaCheckoutView>> {
 
+    private static final int MAX_SET_SNIPPET_RETRIES = 3;
     public static final String KLARNA_CHECKOUT_VIEW_REACT_CLASS = "RNKlarnaCheckoutView";
-
     // Commands that can be triggered from RN
     public static final String COMMAND_SET_SNIPPET = "setSnippet";
     public static final String COMMAND_SUSPEND = "suspend";
     public static final String COMMAND_RESUME = "resume";
 
     private final ReactApplicationContext reactAppContext;
-
     /**
      * Store a map of views to event dispatchers so we send up events via the right views.
      */
-    private final Map<WeakReference<ResizeObserverWrapperView<KlarnaCheckoutView>>, EventDispatcher> viewToDispatcher;
+    private final Map<ResizeObserverWrapperView<KlarnaCheckoutView>, EventDispatcher> viewToDispatcher;
+    private final Map<KlarnaCheckoutView, ResizeObserverWrapperView<KlarnaCheckoutView>> checkoutViewToResizeObserverWrapperMap = new WeakHashMap<>();
+    private final Map<ResizeObserverWrapperView<KlarnaCheckoutView>, Integer> setSnippetRetriesMap = new WeakHashMap<>();
+    private final Map<ResizeObserverWrapperView<KlarnaCheckoutView>, String> snippetMap = new WeakHashMap<>();
 
     private final KlarnaCheckoutViewEventSender eventSender;
     private final KlarnaCheckoutViewEventHandler eventHandler;
-    private Runnable javascriptInterfaceInjectionRunnable;
     private final Handler handler = new Handler(Looper.getMainLooper());
+    private Runnable javascriptInterfaceInjectionRunnable;
 
     public KlarnaCheckoutViewManager(ReactApplicationContext reactApplicationContext) {
         super();
-        viewToDispatcher = new HashMap<>();
+        viewToDispatcher = new WeakHashMap<>();
         reactAppContext = reactApplicationContext;
         eventSender = new KlarnaCheckoutViewEventSender(viewToDispatcher);
-        eventHandler = new KlarnaCheckoutViewEventHandler(eventSender);
+        eventHandler = new KlarnaCheckoutViewEventHandler(eventSender, klarnaCheckoutView -> {
+            ResizeObserverWrapperView<KlarnaCheckoutView> resizeObserverWrapperView =
+                    checkoutViewToResizeObserverWrapperMap.get(klarnaCheckoutView);
+            if (resizeObserverWrapperView == null) {
+                return;
+            }
+            Integer retries = setSnippetRetriesMap.getOrDefault(resizeObserverWrapperView, 0);
+            if (retries == null || retries >= MAX_SET_SNIPPET_RETRIES) {
+                return;
+            }
+            String snippet = snippetMap.get(resizeObserverWrapperView);
+            handler.postDelayed(() -> {
+                if (klarnaCheckoutView != null && klarnaCheckoutView.getHeight() == 0) {
+                    setSnippet(resizeObserverWrapperView, snippet);
+                    setSnippetRetriesMap.put(resizeObserverWrapperView, retries + 1);
+                }
+            }, 500);
+        });
     }
 
     @NonNull
@@ -65,9 +83,11 @@ public class KlarnaCheckoutViewManager extends RNKlarnaCheckoutViewSpec<ResizeOb
         KlarnaCheckoutView klarnaCheckoutView = new KlarnaCheckoutView(reactAppContext.getCurrentActivity(), null, 0, eventHandler);
         ResizeObserverWrapperView<KlarnaCheckoutView> view = new ResizeObserverWrapperView<>(reactAppContext, null, klarnaCheckoutView);
 
+        checkoutViewToResizeObserverWrapperMap.put(klarnaCheckoutView, view);
+
         // Each view has its own event dispatcher.
         EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag((ReactContext) view.getContext(), view.getId());
-        viewToDispatcher.put(new WeakReference<>(view), eventDispatcher);
+        viewToDispatcher.put(view, eventDispatcher);
 
         view.initiateWebViewResizeObserver(WebViewResizeObserver.TargetElement.CHECKOUT_CONTAINER, (resizeObserverWrapperView, newHeight) -> {
             if (resizeObserverWrapperView == null || eventDispatcher == null) {
@@ -152,6 +172,8 @@ public class KlarnaCheckoutViewManager extends RNKlarnaCheckoutViewSpec<ResizeOb
             return;
         }
 
+        snippetMap.put(view, snippet);
+
         klarnaCheckoutView.setSnippet(snippet);
         view.addJavascriptInterfaceToWebView();
 

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/common/event/ComponentEventSender.java

@@ -12,14 +12,13 @@ import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.klarna.mobile.sdk.reactnative.common.ui.WrapperView;
 
-import java.lang.ref.WeakReference;
 import java.util.Collection;
 import java.util.Map;
 
 public abstract class ComponentEventSender<T extends View> {
-    private final Map<WeakReference<T>, EventDispatcher> viewToDispatcher;
+    private final Map<T, EventDispatcher> viewToDispatcher;
 
-    protected ComponentEventSender(@NonNull final Map<WeakReference<T>, EventDispatcher> viewToDispatcher) {
+    protected ComponentEventSender(@NonNull final Map<T, EventDispatcher> viewToDispatcher) {
         this.viewToDispatcher = viewToDispatcher;
     }
 
@@ -50,15 +49,14 @@ public abstract class ComponentEventSender<T extends View> {
         if (view == null) {
             return null;
         }
-        for (WeakReference<T> reference : viewToDispatcher.keySet()) {
-            T viewReference = reference.get();
-            if (viewReference != null && viewReference == view) {
-                return viewReference;
+        for (T reference : viewToDispatcher.keySet()) {
+            if (reference != null && reference == view) {
+                return reference;
             }
-            if (viewReference instanceof WrapperView) {
-                View wrappedView = ((WrapperView) viewReference).getView();
+            if (reference instanceof WrapperView) {
+                View wrappedView = ((WrapperView) reference).getView();
                 if (wrappedView == view) {
-                    return viewReference;
+                    return reference;
                 }
             }
         }

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/common/ui/ResizeObserverWrapperView.java

@@ -1,7 +1,10 @@
 package com.klarna.mobile.sdk.reactnative.common.ui;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
@@ -23,6 +26,7 @@ public class ResizeObserverWrapperView<T extends ViewGroup> extends WrapperView<
     private WebViewResizeObserver webViewResizeObserver;
     private WebViewResizeObserver.WebViewResizeObserverCallback webViewResizeObserverCallback;
     private OnResizedListener<T> onResizedListener;
+    private final Handler handler = new Handler(Looper.getMainLooper());
 
     public ResizeObserverWrapperView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
@@ -43,12 +47,36 @@ public class ResizeObserverWrapperView<T extends ViewGroup> extends WrapperView<
                 OnResizedListener<T> listener = onResizedListenerWeakReference.get();
                 if (listener != null) {
                     listener.onResized(ResizeObserverWrapperView.this, value);
+                    int height = convertDpToPx(value);
+                    for (int i = 0; i < getChildCount(); i++) {
+                        View view = getChildAt(i);
+                        setViewHeight(view, height);
+                    }
                 }
             }
         };
         this.webViewResizeObserver = new WebViewResizeObserver(webViewResizeObserverCallback, targetElement);
     }
 
+    private void setViewHeight(View view, int heightInPx) {
+        if (view == null || heightInPx < 0) {
+            return;
+        }
+        handler.post(() -> {
+            ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
+            if (layoutParams != null) {
+                layoutParams.height = heightInPx;
+            } else {
+                layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, heightInPx);
+            }
+            view.setLayoutParams(layoutParams);
+        });
+    }
+
+    private int convertDpToPx(int value) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value, getResources().getDisplayMetrics());
+    }
+
     public void addJavascriptInterfaceToWebView() {
         WebView webView = findWebView(getView());
         if (webView != null && webViewResizeObserver != null) {

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/KlarnaMobileSDKPackageTest.java

@@ -7,7 +7,6 @@ import androidx.test.core.app.ApplicationProvider;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
-import com.klarna.mobile.sdk.reactnative.KlarnaMobileSDKPackage;
 import com.klarna.mobile.sdk.reactnative.checkout.KlarnaCheckoutViewManager;
 import com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager;
 import com.klarna.mobile.sdk.reactnative.spec.RNKlarnaSignInModuleSpec;
@@ -17,6 +16,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.List;
@@ -30,7 +30,8 @@ public class KlarnaMobileSDKPackageTest {
     @Before
     public void setup() {
         application = ApplicationProvider.getApplicationContext();
-        reactContext = new ReactApplicationContext(application);
+        reactContext = Mockito.mock(ReactApplicationContext.class);
+        Mockito.when(reactContext.getApplicationContext()).thenAnswer(invocation -> application);
     }
 
     @Test

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/common/event/ComponentEventSenderTest.java

@@ -16,7 +16,6 @@ import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import java.lang.ref.WeakReference;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -30,14 +29,14 @@ public class ComponentEventSenderTest {
     private TestEventSender testEventSender;
     private View view;
     private EventDispatcher eventDispatcher;
-    private Map<WeakReference<View>, EventDispatcher> viewToDispatcher;
+    private Map<View, EventDispatcher> viewToDispatcher;
 
     @Before
     public void setUp() {
         view = Mockito.mock(View.class);
         eventDispatcher = Mockito.mock(EventDispatcher.class);
         viewToDispatcher = new HashMap<>() {{
-            put(new WeakReference<>(view), eventDispatcher);
+            put(view, eventDispatcher);
         }};
         testEventSender = new TestEventSender(viewToDispatcher);
 
@@ -76,7 +75,7 @@ public class ComponentEventSenderTest {
     }
 
     private class TestEventSender extends ComponentEventSender<View> {
-        public TestEventSender(Map<WeakReference<View>, EventDispatcher> viewToDispatcher) {
+        public TestEventSender(Map<View, EventDispatcher> viewToDispatcher) {
             super(viewToDispatcher);
         }
 

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/payments/KlarnaPaymentViewManagerTest.java

@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.Collections;
@@ -42,7 +41,8 @@ public class KlarnaPaymentViewManagerTest {
     @Before
     public void setup() {
         Application application = ApplicationProvider.getApplicationContext();
-        ReactApplicationContext reactContext = new ReactApplicationContext(application);
+        ReactApplicationContext reactContext = Mockito.mock(ReactApplicationContext.class);
+        Mockito.when(reactContext.getApplicationContext()).thenAnswer(invocation -> application);
 
         manager = new KlarnaPaymentViewManager(reactContext);
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-klarna-inapp-sdk",
   "title": "Klarna Mobile SDK React Native",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "This library wraps Klarna Mobile SDK and exposes its functionality as React Native components.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -105,6 +105,13 @@
     "jsSrcsDir": "src/specs",
     "android": {
       "javaPackageName": "com.klarna.mobile.sdk.reactnative"
+    },
+    "ios": {
+      "componentProvider": {
+        "RNKlarnaStandaloneWebView": "KlarnaStandaloneWebViewWrapper",
+        "RNKlarnaCheckoutView": "KlarnaCheckoutViewWrapper",
+        "RNKlarnaPaymentView": "PaymentViewWrapper"
+      }
     }
   }
 }