@kontextso/sdk-react-native 2.1.1-rc.0 → 2.1.1-rc.1

package/README.md

@@ -83,5 +83,5 @@ function MessageList({ messages }: { messages: Message[] }) {
 
 ## Additional Resources
 
-* Explore a working [Demo Project featuring SDK integration](https://github.com/kontextso/kontext-react-native-demo).
+* Explore a working [Demo Project featuring SDK integration](https://github.com/kontextso/sdk-react-native-demo).
 * Full documentation: [Kontext React Native SDK](https://docs.kontext.so/sdk/react-native).

package/RNKontext.podspec

@@ -0,0 +1,21 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "RNKontext"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.homepage     = package["homepage"]
+  s.license      = package["license"]
+  s.authors      = package["author"]
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => ".git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
+  s.private_header_files = "ios/**/*.h"
+
+
+  install_modules_dependencies(s)
+end

package/android/build.gradle

@@ -0,0 +1,88 @@
+buildscript {
+  ext.getExtOrDefault = {name ->
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties['RNKontext_' + name]
+  }
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:8.7.2"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
+  }
+}
+
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+apply plugin: "com.facebook.react"
+
+def isNewArchitectureEnabled() {
+  return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["RNKontext_" + name]).toInteger()
+}
+
+android {
+  namespace "so.kontext.react"
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
+    // Expose the new-arch flag to runtime and build-time Kotlin/Java code
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+
+  buildFeatures {
+    buildConfig true
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+    }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+
+  sourceSets {
+    main {
+      java.srcDirs += [
+        "generated/java",
+        "generated/jni"
+      ]
+      if (isNewArchitectureEnabled()) {
+        java.srcDirs += ['src/newarch/java']
+      } else {
+        java.srcDirs += ['src/oldarch/java']
+      }
+    }
+  }
+}
+
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
+dependencies {
+  implementation "com.facebook.react:react-android"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}

package/android/gradle.properties

@@ -0,0 +1,5 @@
+RNKontext_kotlinVersion=2.0.21
+RNKontext_minSdkVersion=24
+RNKontext_targetSdkVersion=34
+RNKontext_compileSdkVersion=35
+RNKontext_ndkVersion=27.1.12297006

package/android/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/android/src/main/java/so/kontext/react/RNKontextModuleImpl.kt

@@ -0,0 +1,21 @@
+package so.kontext.react
+
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import android.content.Context
+import android.media.AudioManager
+
+class RNKontextModuleImpl(private val reactContext: ReactApplicationContext) {
+  fun isSoundOn(promise: Promise?) {
+    val audioManager = reactContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+    val current = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+    val max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+    val volume = if (max > 0) current.toFloat() / max.toFloat() else 0f
+
+    promise?.resolve(volume > MINIMAL_VOLUME_THRESHOLD)
+  }
+
+  companion object {
+    private const val MINIMAL_VOLUME_THRESHOLD = 0.0f
+  }
+}

package/android/src/newarch/java/so/kontext/react/RNKontextModule.kt

@@ -0,0 +1,22 @@
+package so.kontext.react
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.bridge.Promise
+
+@ReactModule(name = RNKontextModule.NAME)
+class RNKontextModule(reactContext: ReactApplicationContext) :
+  NativeRNKontextSpec(reactContext) {
+
+  private val impl = RNKontextModuleImpl(reactContext)
+
+  override fun getName(): String = NAME
+
+  override fun isSoundOn(promise: Promise?) {
+    impl.isSoundOn(promise)
+  }
+
+  companion object {
+    const val NAME = "RNKontext"
+  }
+}

package/android/src/newarch/java/so/kontext/react/RNKontextPackage.kt

@@ -0,0 +1,32 @@
+package so.kontext.react
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNKontextPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == RNKontextModule.NAME) {
+      RNKontextModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      mapOf(
+        RNKontextModule.NAME to ReactModuleInfo(
+          RNKontextModule.NAME,
+          RNKontextModule.NAME,
+          false,  // canOverrideExistingModule
+          false,  // needsEagerInit
+          false,  // isCxxModule
+          true    // isTurboModule
+        )
+      )
+    }
+  }
+}

package/android/src/oldarch/java/so/kontext/react/RNKontextModule.kt

@@ -0,0 +1,25 @@
+package so.kontext.react
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.Promise
+import android.content.Context
+import android.media.AudioManager
+
+class RNKontextModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
+
+  private val impl = RNKontextModuleImpl(reactContext)
+
+  override fun getName(): String = NAME
+
+  @ReactMethod
+  fun isSoundOn(promise: Promise?) {
+    impl.isSoundOn(promise)
+  }
+
+  companion object {
+    const val NAME = "RNKontext"
+  }
+}

package/android/src/oldarch/java/so/kontext/react/RNKontextPacakge.kt

@@ -0,0 +1,16 @@
+package so.kontext.react
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+
+class RNKontextPackage : ReactPackage {
+  override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+    return listOf(RNKontextModule(reactContext))
+  }
+
+  override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+    return emptyList()
+  }
+}

package/dist/index.js

@@ -36,8 +36,9 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/formats/Format.tsx
-var import_react2 = require("react");
+var import_react = require("react");
 var import_sdk_react = require("@kontextso/sdk-react");
+var import_react_native_webview = require("react-native-webview");
 var import_react_native = require("react-native");
 
 // ../sdk-common/dist/index.mjs
@@ -58,44 +59,8 @@ function handleIframeMessage(handler, opts) {
   };
 }
 
-// src/frame-webview.tsx
-var import_react = require("react");
-var import_react_native_webview = require("react-native-webview");
-var import_jsx_runtime = require("react/jsx-runtime");
-var FrameWebView = (0, import_react.forwardRef)(
-  ({ iframeUrl, onMessage, style, onError, onLoad }, forwardedRef) => {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      import_react_native_webview.WebView,
-      {
-        ref: forwardedRef,
-        source: {
-          uri: iframeUrl
-        },
-        onMessage,
-        style,
-        allowsInlineMediaPlayback: true,
-        mediaPlaybackRequiresUserAction: false,
-        javaScriptEnabled: true,
-        domStorageEnabled: true,
-        allowsFullscreenVideo: false,
-        injectedJavaScript: `
-          window.addEventListener("message", function(event) {
-            if (window.ReactNativeWebView && event.data) {
-              // ReactNativeWebView.postMessage only supports string data
-              window.ReactNativeWebView.postMessage(JSON.stringify(event.data));
-            }
-          }, false);
-      `,
-        onError,
-        onLoad
-      }
-    );
-  }
-);
-var frame_webview_default = FrameWebView;
-
 // src/formats/Format.tsx
-var import_jsx_runtime2 = require("react/jsx-runtime");
+var import_jsx_runtime = require("react/jsx-runtime");
 var sendMessage = (webViewRef, type, code, data) => {
   const message = makeIframeMessage(type, {
     data,
@@ -108,22 +73,16 @@ var sendMessage = (webViewRef, type, code, data) => {
   `);
 };
 var Format = ({ code, messageId, wrapper, ...otherParams }) => {
-  const context = (0, import_react2.useContext)(import_sdk_react.AdsContext);
+  const context = (0, import_react.useContext)(import_sdk_react.AdsContext);
   const bid = (0, import_sdk_react.useBid)({ code, messageId });
-  const [height, setHeight] = (0, import_react2.useState)(0);
-  const iframeUrl = (0, import_sdk_react.useIframeUrl)(context, bid, code, messageId, "sdk-react-native", otherParams.theme);
-  const modalUrl = iframeUrl.replace("/api/frame/", "/api/modal/");
-  const [showIframe, setShowIframe] = (0, import_react2.useState)(false);
-  const [iframeLoaded, setIframeLoaded] = (0, import_react2.useState)(false);
-  const [modalOpen, setModalOpen] = (0, import_react2.useState)(false);
-  const [modalShown, setModalShown] = (0, import_react2.useState)(false);
-  const [modalLoaded, setModalLoaded] = (0, import_react2.useState)(false);
-  const [containerStyles, setContainerStyles] = (0, import_react2.useState)({});
-  const [iframeStyles, setIframeStyles] = (0, import_react2.useState)({});
-  const containerRef = (0, import_react2.useRef)(null);
-  const webViewRef = (0, import_react2.useRef)(null);
-  const modalWebViewRef = (0, import_react2.useRef)(null);
-  const modalInitTimeoutRef = (0, import_react2.useRef)(null);
+  const [height, setHeight] = (0, import_react.useState)(0);
+  const iframeUrl = (0, import_sdk_react.useIframeUrl)(context, bid, code, messageId);
+  const [showIframe, setShowIframe] = (0, import_react.useState)(false);
+  const [iframeLoaded, setIframeLoaded] = (0, import_react.useState)(false);
+  const [containerStyles, setContainerStyles] = (0, import_react.useState)({});
+  const [iframeStyles, setIframeStyles] = (0, import_react.useState)({});
+  const containerRef = (0, import_react.useRef)(null);
+  const webViewRef = (0, import_react.useRef)(null);
   const { height: windowHeight, width: windowWidth } = (0, import_react_native.useWindowDimensions)();
   const reset = () => {
     setHeight(0);
@@ -131,19 +90,9 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
     setContainerStyles({});
     setIframeStyles({});
     setIframeLoaded(false);
-    resetModal();
     context?.resetAll();
     context?.captureError(new Error("Processing iframe error"));
   };
-  const resetModal = () => {
-    if (modalInitTimeoutRef.current) {
-      clearTimeout(modalInitTimeoutRef.current);
-      modalInitTimeoutRef.current = null;
-    }
-    setModalOpen(false);
-    setModalLoaded(false);
-    setModalShown(false);
-  };
   const debug = (name, data = {}) => {
     context?.onDebugEventInternal?.(name, {
       code,
@@ -159,19 +108,6 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
       ...data
     });
   };
-  const debugModal = (name, data = {}) => {
-    context?.onDebugEventInternal?.(name, {
-      code,
-      messageId,
-      otherParams,
-      bid,
-      modalUrl,
-      modalOpen,
-      modalShown,
-      modalLoaded,
-      ...data
-    });
-  };
   debug("format-update-state");
   const onMessage = (event) => {
     try {
@@ -219,10 +155,6 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
               setContainerStyles(message.data.containerStyles);
               setIframeStyles(message.data.iframeStyles);
               break;
-            case "open-component-iframe":
-              setModalOpen(true);
-              modalInitTimeoutRef.current = setTimeout(resetModal, message.data.timeout ?? 5e3);
-              break;
           }
         },
         {
@@ -238,55 +170,8 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
       reset();
     }
   };
-  const onModalMessage = (event) => {
-    try {
-      const data = JSON.parse(event.nativeEvent.data);
-      debugModal("modal-iframe-message", {
-        message: data
-      });
-      const messageHandler = handleIframeMessage(
-        (message) => {
-          switch (message.type) {
-            case "close-component-iframe":
-              resetModal();
-              break;
-            case "init-component-iframe":
-              if (modalInitTimeoutRef.current) {
-                clearTimeout(modalInitTimeoutRef.current);
-                modalInitTimeoutRef.current = null;
-              }
-              setModalShown(true);
-              break;
-            case "error-component-iframe":
-            case "error-iframe":
-              resetModal();
-              break;
-            case "click-iframe":
-              if (message.data.url) {
-                import_react_native.Linking.openURL(`${context?.adServerUrl}${message.data.url}`).catch(
-                  (err) => console.error("error opening url", err)
-                );
-              }
-              context?.onAdClickInternal(message.data);
-              break;
-          }
-        },
-        {
-          code,
-          component: "modal"
-        }
-      );
-      messageHandler({ data });
-    } catch (e) {
-      debugModal("modal-iframe-message-error", {
-        error: e
-      });
-      console.error("error parsing message from webview", e);
-      resetModal();
-    }
-  };
   const paramsString = (0, import_sdk_react.convertParamsToString)(otherParams);
-  (0, import_react2.useEffect)(() => {
+  (0, import_react.useEffect)(() => {
     if (!iframeLoaded || !context?.adServerUrl || !bid || !webViewRef.current) {
       return;
     }
@@ -309,7 +194,7 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
       });
     });
   };
-  (0, import_react2.useEffect)(() => {
+  (0, import_react.useEffect)(() => {
     const interval = setInterval(() => {
       checkIfInViewport();
     }, 250);
@@ -330,80 +215,71 @@ var Format = ({ code, messageId, wrapper, ...otherParams }) => {
     }
     return 0;
   };
-  const content = /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(import_jsx_runtime2.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_react_native.Modal, { visible: modalOpen, transparent: true, onRequestClose: resetModal, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-      import_react_native.View,
-      {
-        style: {
-          flex: 1,
-          // Don't show the modal until the modal page is loaded and sends 'init-component-iframe' message back to SDK
-          ...modalShown ? { opacity: 1, pointerEvents: "auto" } : { opacity: 0, pointerEvents: "none" }
-        },
-        children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          frame_webview_default,
-          {
-            ref: modalWebViewRef,
-            iframeUrl: modalUrl,
-            onMessage: onModalMessage,
-            style: {
-              backgroundColor: "transparent",
-              height: "100%",
-              width: "100%",
-              borderWidth: 0
-            },
-            onError: () => {
-              debug("modal-error");
-              resetModal();
-            },
-            onLoad: () => {
-              debug("modal-load");
-              setModalLoaded(true);
-            }
+  const content = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native.View, { style: containerStyles, ref: containerRef, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+    import_react_native_webview.WebView,
+    {
+      ref: webViewRef,
+      source: {
+        uri: iframeUrl
+      },
+      onMessage,
+      style: {
+        height: getHeight(),
+        width: getWidth(),
+        ...iframeStyles
+      },
+      allowsInlineMediaPlayback: true,
+      mediaPlaybackRequiresUserAction: false,
+      javaScriptEnabled: true,
+      domStorageEnabled: true,
+      allowsFullscreenVideo: false,
+      injectedJavaScript: `
+          function sendToLog(data) {
+            window.ReactNativeWebView.postMessage(JSON.stringify({
+              type: 'log-iframe',
+              data: data
+            }));
           }
-        )
-      }
-    ) }),
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_react_native.View, { style: containerStyles, ref: containerRef, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-      frame_webview_default,
-      {
-        ref: webViewRef,
-        iframeUrl,
-        onMessage,
-        style: {
-          height: getHeight(),
-          width: getWidth(),
-          background: "transparent",
-          borderWidth: 0,
-          ...iframeStyles
-        },
-        onError: () => {
-          debug("iframe-error");
-          reset();
-        },
-        onLoad: () => {
-          debug("iframe-load");
-        }
+
+          window.addEventListener("message", function(event) {
+            if (window.ReactNativeWebView && event.data) {
+              // ReactNativeWebView.postMessage only supports string data
+              window.ReactNativeWebView.postMessage(JSON.stringify(event.data));
+            }
+          }, false);
+      `,
+      onError: () => {
+        debug("iframe-error");
+        reset();
+      },
+      onLoad: () => {
+        debug("iframe-load");
       }
-    ) })
-  ] });
+    }
+  ) });
   return wrapper ? wrapper(content) : content;
 };
-var FormatWithErrorBoundary = (props) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_sdk_react.ErrorBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Format, { ...props }) });
+var FormatWithErrorBoundary = (props) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_sdk_react.ErrorBoundary, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Format, { ...props }) });
 var Format_default = FormatWithErrorBoundary;
 
 // src/formats/InlineAd.tsx
-var import_jsx_runtime3 = require("react/jsx-runtime");
+var import_jsx_runtime2 = require("react/jsx-runtime");
 var InlineAd = ({ code, messageId, wrapper, ...props }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Format_default, { code, messageId, wrapper, ...props });
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Format_default, { code, messageId, wrapper, ...props });
 };
 var InlineAd_default = InlineAd;
 
 // src/context/AdsProvider.tsx
 var import_sdk_react2 = require("@kontextso/sdk-react");
-var import_react_native2 = require("react-native");
+var import_react_native3 = require("react-native");
 var import_react_native_device_info = __toESM(require("react-native-device-info"));
-var import_soundon = require("@kontextso/soundon");
-var import_jsx_runtime4 = require("react/jsx-runtime");
+
+// src/NativeRNKontext.ts
+var import_react_native2 = require("react-native");
+var NativeRNKontext_default = import_react_native2.TurboModuleRegistry.getEnforcing("RNKontext");
+
+// src/context/AdsProvider.tsx
+var import_jsx_runtime3 = require("react/jsx-runtime");
 ErrorUtils.setGlobalHandler((error, isFatal) => {
   if (!isFatal) {
     import_sdk_react2.log.warn(error);
@@ -413,7 +289,7 @@ ErrorUtils.setGlobalHandler((error, isFatal) => {
 });
 var getDevice = async () => {
   try {
-    const os = import_react_native2.Platform.OS;
+    const os = import_react_native3.Platform.OS;
     const systemVersion = import_react_native_device_info.default.getSystemVersion();
     const model = import_react_native_device_info.default.getModel();
     const brand = import_react_native_device_info.default.getBrand();
@@ -423,11 +299,11 @@ var getDevice = async () => {
     const appVersion = import_react_native_device_info.default.getVersion();
     let soundOn = false;
     try {
-      soundOn = await (0, import_soundon.isSoundOn)();
+      soundOn = await NativeRNKontext_default.isSoundOn();
     } catch (error) {
       import_sdk_react2.log.warn("Failed to read output volume", error);
     }
-    const rnv = import_react_native2.Platform.constants.reactNativeVersion;
+    const rnv = import_react_native3.Platform.constants.reactNativeVersion;
     const reactNativeVersion = `${rnv.major}.${rnv.minor}.${rnv.patch}`;
     return {
       os,
@@ -447,7 +323,7 @@ var getDevice = async () => {
   return {};
 };
 var AdsProvider = (props) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_sdk_react2.AdsProviderInternal, { ...props, getDevice });
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_sdk_react2.AdsProviderInternal, { ...props, getDevice });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {