add activity as context for standalone webview

klarna · Jul 4, 2024 · 7a6d1c3 · 7a6d1c3
1 parent b4d14e8
commit 7a6d1c3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/TestApp/src/standalonewebview/StandaloneWebViewScreen.tsx b/TestApp/src/standalonewebview/StandaloneWebViewScreen.tsx
@@ -1,4 +1,4 @@
-import {Keyboard, TextInput, View} from 'react-native';
+import {Keyboard, Text, TextInput, View} from 'react-native';
 import styles from '../common/ui/Styles';
 import React, {useRef, useState} from 'react';
 import {
@@ -10,13 +10,16 @@ import {
  KlarnaWebViewRenderProcessGoneEvent,
 } from 'react-native-klarna-inapp-sdk';
 import Button from '../common/ui/view/Button';
+import testProps from '../common/util/TestProps.tsx';
 
 export default function StandaloneWebViewScreen() {
  const klarnaStandaloneWebViewRef = useRef<KlarnaStandaloneWebView>(null);
  const [url, setUrl] = useState('');
+ const [eventState, setEventState] = useState<string>();
 
  const logEvent = (...params: Array<string>) => {
  console.log('onEvent', params);
+ setEventState(params.join(', '));
  };
 
  const renderUrlTextInput = () => {
@@ -113,6 +116,7 @@ export default function StandaloneWebViewScreen() {
  {renderGoBackButton()}
  {renderGoForwardButton()}
  </View>
+ <Text {...testProps('state_events')}>{eventState}</Text>
  <KlarnaStandaloneWebView
  ref={klarnaStandaloneWebViewRef}
  /* eslint-disable-next-line react-native/no-inline-styles */

diff --git a/...id/src/main/java/com/klarna/mobile/sdk/reactnative/payments/KlarnaPaymentViewManager.java b/...id/src/main/java/com/klarna/mobile/sdk/reactnative/payments/KlarnaPaymentViewManager.java
@@ -215,7 +215,7 @@ private void postEventForView(String eventName, WritableMap additionalParams, Kl
  private void postEventForView(String eventName, WritableMap additionalParams, PaymentViewWrapper wrapper) {
  if (wrapper != null) {
  KlarnaPaymentEvent event = new KlarnaPaymentEvent(wrapper.getId(), eventName, additionalParams);
- EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag((ReactContext) wrapper.getContext(), wrapper.getId());
+ EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactAppContext, wrapper.getId());
  if (eventDispatcher != null) {
  eventDispatcher.dispatchEvent(event);
  }

diff --git a/...m/klarna/mobile/sdk/reactnative/standalonewebview/KlarnaStandaloneWebViewEventSender.java b/...m/klarna/mobile/sdk/reactnative/standalonewebview/KlarnaStandaloneWebViewEventSender.java
@@ -40,9 +40,11 @@ public class KlarnaStandaloneWebViewEventSender {
  private static final String PARAM_NAME_DID_CRASH = "didCrash";
 
  private final Gson gson = new Gson();
+ private final WeakReference<ReactContext> reactContextWeakReference;
  private final Map<WeakReference<KlarnaStandaloneWebView>, EventDispatcher> viewToDispatcher;
 
- KlarnaStandaloneWebViewEventSender(@NonNull final Map<WeakReference<KlarnaStandaloneWebView>, EventDispatcher> viewToDispatcher) {
+ KlarnaStandaloneWebViewEventSender(@NonNull ReactContext reactContext, @NonNull final Map<WeakReference<KlarnaStandaloneWebView>, EventDispatcher> viewToDispatcher) {
+ this.reactContextWeakReference = new WeakReference<>(reactContext);
  this.viewToDispatcher = viewToDispatcher;
  }
 
@@ -110,7 +112,7 @@ public void sendRenderProcessGoneEvent(@Nullable KlarnaStandaloneWebView view, b
  private void postEventForView(KlarnaStandaloneWebViewEvent.Event event, WritableMap additionalParams, @Nullable KlarnaStandaloneWebView view) {
  KlarnaStandaloneWebView klarnaStandaloneWebView = getKlarnaStandaloneWebView(view);
  if (klarnaStandaloneWebView != null) {
- EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag((ReactContext) klarnaStandaloneWebView.getContext(), klarnaStandaloneWebView.getId());
+ EventDispatcher eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContextWeakReference.get(), klarnaStandaloneWebView.getId());
  if (eventDispatcher != null) {
  KlarnaStandaloneWebViewEvent e = new KlarnaStandaloneWebViewEvent(klarnaStandaloneWebView.getId(), event.name, additionalParams);
  eventDispatcher.dispatchEvent(e);

diff --git a/...a/com/klarna/mobile/sdk/reactnative/standalonewebview/KlarnaStandaloneWebViewManager.java b/...a/com/klarna/mobile/sdk/reactnative/standalonewebview/KlarnaStandaloneWebViewManager.java
@@ -105,7 +105,7 @@ public KlarnaStandaloneWebViewManager(ReactApplicationContext reactContext) {
  super();
  this.reactAppContext = reactContext;
  viewToDispatcher = new HashMap<>();
- klarnaStandaloneWebViewEventSender = new KlarnaStandaloneWebViewEventSender(viewToDispatcher);
+ klarnaStandaloneWebViewEventSender = new KlarnaStandaloneWebViewEventSender(reactContext, viewToDispatcher);
  }
 
  @ReactProp(name = "returnUrl")
@@ -224,7 +224,7 @@ public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
  @Override
  protected KlarnaStandaloneWebView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
  KlarnaStandaloneWebView klarnaStandaloneWebView = new KlarnaStandaloneWebView(
- /* context */ reactAppContext,
+ /* context */ reactAppContext.getCurrentActivity(), // needs to be activity for SDK dialogs to work
  /* attrs */ null,
  /* defStyleAttr */ 0,
  /* webViewClient */ klarnaStandaloneWebViewClient,
@@ -235,7 +235,7 @@ protected KlarnaStandaloneWebView createViewInstance(@NonNull ThemedReactContext
  /* resourceEndpoint */ null,
  /* returnURL */ null);
  // Each view has its own event dispatcher.
- EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag((ReactContext) klarnaStandaloneWebView.getContext(), klarnaStandaloneWebView.getId());
+ EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactAppContext, klarnaStandaloneWebView.getId());
  viewToDispatcher.put(new WeakReference<>(klarnaStandaloneWebView), dispatcher);
  return klarnaStandaloneWebView;
  }