apps-sdk 1.1.90 → 1.1.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.1.90",
+  "version": "1.1.92",
   "description": "Apps SDK",
   "main": "index.js",
   "author": "ASD",
@@ -39,4 +39,4 @@
     "semver": "^7.6.0"
   },
   "types": "./types/index.d.ts"
-}
+}

package/src/components/AdaptyOnboarding.js

@@ -1,6 +1,6 @@
 import React from 'react';
-import { AdaptyOnboardingView } from 'react-native-adapty/dist/ui';
-import { View } from "react-native";
+import { AdaptyOnboardingView } from 'react-native-adapty';
+import { View, Platform } from "react-native";
 import Adapty from '../libraries/Adapty';
 import * as config from '../../config';
 
@@ -10,6 +10,7 @@ class AdaptyOnboarding extends React.Component {
         this.state = {
             onboarding: null,
             isLoading: true,
+            webViewReady: false,
         };
         this.remoteConfig = null;
         this.currentStep = 0;
@@ -19,28 +20,26 @@ class AdaptyOnboarding extends React.Component {
     componentDidMount() {
         const { preloadedOnboarding, placementID, lang } = this.props;
 
-        // If preloaded onboarding is provided, use it immediately (no loading screen!)
         if (preloadedOnboarding) {
-            config.DEBUG_MODE && console.log('[ONBOARDING] Using preloaded onboarding data - skipping load');
+            config.DEBUG_MODE && console.log('[ONBOARDING] Using preloaded onboarding data');
             this.remoteConfig = preloadedOnboarding.remoteConfig || {};
 
             if (this.props.onRemoteConfigLoaded && this.remoteConfig) {
-                config.DEBUG_MODE && console.log('Remote config loaded from preload:', this.remoteConfig);
                 this.props.onRemoteConfigLoaded(this.remoteConfig);
             }
 
             this.setState({ onboarding: preloadedOnboarding, isLoading: false });
         } else {
-            // Fallback to loading if not preloaded
-            config.DEBUG_MODE && console.log('[ONBOARDING] No preloaded data, loading normally');
             this.loadOnboarding(placementID, lang);
         }
     }
 
     async componentDidUpdate(prevProps) {
         if (this.props.visible && !prevProps.visible) {
-            const { placementID, lang } = this.props;
-            await this.loadOnboarding(placementID, lang);
+            if (!this.state.onboarding) {
+                const { placementID, lang } = this.props;
+                await this.loadOnboarding(placementID, lang);
+            }
         }
         if (!this.props.visible && prevProps.visible) {
             this.handleModalDismiss();
@@ -50,26 +49,24 @@ class AdaptyOnboarding extends React.Component {
     loadOnboarding = async (placementID, lang) => {
         try {
             this.setState({ isLoading: true });
+            
             const onboarding = await Adapty.getOnboardingForPlacement(placementID, lang);
 
             if (onboarding) {
                 this.remoteConfig = onboarding.remoteConfig || {};
 
                 if (this.props.onRemoteConfigLoaded && this.remoteConfig) {
-                    config.DEBUG_MODE && console.log('Remote config loaded:', this.remoteConfig);
                     this.props.onRemoteConfigLoaded(this.remoteConfig);
                 }
 
                 this.setState({ onboarding, isLoading: false });
             } else {
-                console.log('Onboarding not found for placement:', placementID, 'and language:', lang);
                 this.setState({ isLoading: false });
                 if (this.props.onError) {
                     this.props.onError(new Error('Onboarding not found'), this.remoteConfig);
                 }
             }
         } catch (error) {
-            console.log('Error loading onboarding:', error);
             this.setState({ isLoading: false });
             if (this.props.onError) {
                 this.props.onError(error, this.remoteConfig);
@@ -79,33 +76,22 @@ class AdaptyOnboarding extends React.Component {
 
     //  --------------------------------------- Event Handlers ---------------------------------------
     handleCustom = (actionId, meta) => {
-        config.DEBUG_MODE && console.log('Onboarding custom AdaptyOnboarding:', actionId, meta);
-
         if (this.props.onCustom) {
             this.props.onCustom(actionId, meta, this.remoteConfig);
         }
     }
 
     handleClose = (actionId, meta) => {
-        const isLastStep = this.totalSteps > 0 && this.currentStep === this.totalSteps - 1;
-
-        config.DEBUG_MODE && console.log('Onboarding close attempt AdaptyOnboarding:', {actionId, meta, currentStep: this.currentStep, totalSteps: this.totalSteps, isLastStep });
-
         if (this.props.onClose) {
             this.props.onClose(actionId, meta, this.remoteConfig);
         }
-
         return true;
     }
 
     handleModalDismiss = () => {
-        config.DEBUG_MODE && console.log('AdaptyOnboarding Modal fully dismissed');
-
-        // Reset state after modal is fully dismissed
         this.currentStep = 0;
         this.totalSteps = 0;
 
-        // Notify parent that modal is fully closed
         if (this.props.onModalDismissed) {
             this.props.onModalDismissed();
         }
@@ -115,8 +101,6 @@ class AdaptyOnboarding extends React.Component {
         if (meta && typeof meta === 'object') {
             this.currentStep = meta.screen_index ?? this.currentStep;
             this.totalSteps = meta.total_screens ?? this.totalSteps;
-
-            config.DEBUG_MODE && console.log('State updated AdaptyOnboarding:', {action, meta, currentStep: this.currentStep, totalSteps: this.totalSteps});
         }
 
         if (this.props.onStateUpdated) {
@@ -125,15 +109,10 @@ class AdaptyOnboarding extends React.Component {
     }
 
     handleError = (error) => {
-        console.log('Onboarding error:', error);
-
-        // Check if it's a WebResource ORB error (common on Android)
         const isORBError = error?.message?.includes('ERR_BLOCKED_BY_ORB');
 
         if (isORBError) {
-            config.DEBUG_MODE && console.log('WebResource ORB error detected - non-critical, continuing');
-            // Don't propagate ORB errors as they don't break functionality
-            return false; // Continue
+            return false;
         }
 
         if (this.props.onError) {
@@ -143,23 +122,32 @@ class AdaptyOnboarding extends React.Component {
     }
 
     handleAnalytics = (event, data) => {
-        config.DEBUG_MODE && console.log('Onboarding analytics AdaptyOnboarding:', event, data);
-
+        // Available events from Adapty:
+        // - onboarding_started (screenIndex: 0, totalScreens: 4)
+        // - screen_presented (screenIndex: 0-3, totalScreens: 4) - fires for each screen
+        // - screen_completed (screenIndex: 0-2) - fires when leaving a screen
+        // 
+        // To track these events: Access event.name and data.screenIndex in onAnalytics callback
+        // Example: if (event?.name === 'screen_presented') { track(data.screenIndex) }
+        
         if (this.props.onAnalytics) {
             this.props.onAnalytics(event, data, this.remoteConfig);
         }
     }
 
     handlePaywall = (actionId, meta) => {
-        config.DEBUG_MODE && console.log('Onboarding paywall AdaptyOnboarding:', actionId, meta);
-
         if (this.props.onPaywall) {
             this.props.onPaywall(actionId, meta, this.remoteConfig);
         }
     }
 
     handleFinishedLoading = (meta) => {
-        config.DEBUG_MODE && console.log('Onboarding finished loading AdaptyOnboarding:', meta);
+        // Prop: loaderMaskDelay - Delay before showing onboarding content (default: 300ms)
+        const delay = this.props.loaderMaskDelay ?? 300;
+        
+        setTimeout(() => {
+            this.setState({ webViewReady: true });
+        }, delay);
 
         if (this.props.onFinishedLoading) {
             this.props.onFinishedLoading(meta, this.remoteConfig);
@@ -169,39 +157,59 @@ class AdaptyOnboarding extends React.Component {
 
     render() {
         const { visible } = this.props;
-        const { onboarding, isLoading } = this.state;
+        const { onboarding, isLoading, webViewReady } = this.state;
 
         if (!visible) {
             return null;
         }
 
-        const content = (
+        // Prop: loaderMaskColor - Background color for the loader mask (default: '#121212')
+        const maskColor = this.props.loaderMaskColor || '#121212';
+
+        return (
             <View style={styles.container}>
+                {/* Loader mask: Hides WebView white loader without blocking touch events */}
+                {!webViewReady && onboarding && (
+                    <View style={[styles.loaderMask, { backgroundColor: maskColor }]} />
+                )}
+                
                 {!isLoading && onboarding ? (
-                    <AdaptyOnboardingView
-                        onboarding={onboarding}
-                        style={styles.onboardingView}
-                        eventHandlers={{
-                            onAnalytics: this.handleAnalytics,
-                            onClose: this.handleClose,
-                            onCustom: this.handleCustom,
-                            onPaywall: this.handlePaywall,
-                            onStateUpdated: this.handleStateUpdated,
-                            onFinishedLoading: this.handleFinishedLoading,
-                            onError: this.handleError,
-                        }}
-                    />
+                    <View style={styles.onboardingWrapper}>
+                        <AdaptyOnboardingView
+                            onboarding={onboarding}
+                            style={styles.onboardingView}
+                            onAnalytics={this.handleAnalytics}
+                            onClose={this.handleClose}
+                            onCustom={this.handleCustom}
+                            onPaywall={this.handlePaywall}
+                            onStateUpdated={this.handleStateUpdated}
+                            onFinishedLoading={this.handleFinishedLoading}
+                            onError={this.handleError}
+                        />
+                    </View>
                 ) : null}
             </View>
         );
-
-        return content;
     }
 }
 
 const styles = {
     container: {
-        backgroundColor: '#000',
+        backgroundColor: '#121212',
+        flex: 1,
+        width: '100%',
+        height: '100%',
+    },
+    loaderMask: {
+        position: 'absolute',
+        top: 0,
+        left: 0,
+        right: 0,
+        bottom: 0,
+        zIndex: 10,
+    },
+    onboardingWrapper: {
+        flex: 1,
         width: '100%',
         height: '100%',
     },
@@ -210,4 +218,4 @@ const styles = {
     },
 }
 
-export default AdaptyOnboarding;
+export default AdaptyOnboarding;

package/src/libraries/Adapty.js

@@ -245,24 +245,6 @@ class Adapty {
         return onboarding !== null;
     }
 
-    async preloadOnboarding(placementID, lang) {
-        try {
-            const onboarding = await this.getOnboardingForPlacement(placementID, lang);
-            if (onboarding) {
-                const onboardingView = await this.createOnboardingView(onboarding);
-                if (onboardingView) {
-                    return onboardingView;
-                } else {
-                    console.warn('Error preloading onboarding: onboarding view not created for placement', placementID, 'and language', lang);
-                    return null;
-                }
-            } else {
-                console.warn('Error preloading onboarding: onboarding not found for placement', placementID, 'and language', lang);
-            }
-        } catch (error) {
-            console.error('Error preloading onboarding:', error);
-        }
-    }
 
     async closeOnboarding() {
         const onboardingView = await adapty.getCurrentOnboardingView();
@@ -299,4 +281,4 @@ class Adapty {
     }
 }
 
-export default new Adapty();
+export default new Adapty();

package/types/index.d.ts

@@ -228,6 +228,9 @@ declare module 'apps-sdk' {
         visible: boolean;
         placementID: string;
         lang: string;
+        preloadedOnboarding?: any;
+        loaderMaskColor?: string;  // Color of the mask that hides WebView loader (default: '#121212')
+        loaderMaskDelay?: number;  // Delay in ms before showing content (default: 300ms)
         onAnalytics?: (event: any, meta: any, remoteConfig?: any) => void;
         onClose?: (actionId: string, meta: any, remoteConfig?: any) => Promise<boolean> | boolean;
         onCustom?: (actionId: string, meta: any, remoteConfig?: any) => void;
@@ -259,7 +262,6 @@ declare module 'apps-sdk' {
         createOnboardingView(onboarding: any): Promise<any>;
         showOnboarding(placementID: string, lang: string, eventHandlers?: OnboardingEventHandlers): Promise<void>;
         checkOnboardingExists(placementID: string, lang: string): Promise<boolean>;
-        preloadOnboarding(placementID: string, lang: string): Promise<any>;
         closeOnboarding(): Promise<void>;
         showOnboardingPreloaded(onboardingView: any, eventHandlers?: OnboardingEventHandlers): Promise<void>;
         closePaywallFromView(paywallView: any): Promise<void>;