apps-sdk 1.1.69 → 1.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.1.69",
+  "version": "1.1.70",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {

package/src/components/AdaptyOnboarding.js

@@ -18,8 +18,24 @@ class AdaptyOnboarding extends React.Component {
     }
 
     componentDidMount() {
-        const { placementID, lang } = this.props;
-        this.loadOnboarding(placementID, lang);
+        const { preloadedOnboarding, placementID, lang } = this.props;
+
+        // If preloaded onboarding is provided, use it immediately (no loading screen!)
+        if (preloadedOnboarding) {
+            console.log('[ONBOARDING] Using preloaded onboarding data - skipping load');
+            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
+            console.log('[ONBOARDING] No preloaded data, loading normally');
+            this.loadOnboarding(placementID, lang);
+        }
     }
 
     async componentDidUpdate(prevProps) {
@@ -27,21 +43,24 @@ class AdaptyOnboarding extends React.Component {
             const { placementID, lang } = this.props;
             await this.loadOnboarding(placementID, lang);
         }
+        if (!this.props.visible && prevProps.visible) {
+            this.handleModalDismiss();
+        }
     }
 
     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);
@@ -82,7 +101,7 @@ class AdaptyOnboarding extends React.Component {
 
     handleModalDismiss = () => {
         config.DEBUG_MODE && console.log('AdaptyOnboarding Modal fully dismissed');
-        
+
         // Reset state after modal is fully dismissed
         this.currentStep = 0;
         this.totalSteps = 0;
@@ -97,10 +116,10 @@ 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) {
             this.props.onStateUpdated(action, meta, this.remoteConfig);
         }
@@ -108,16 +127,16 @@ 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
         }
-        
+
         if (this.props.onError) {
             this.props.onError(error, this.remoteConfig);
         }
@@ -126,7 +145,7 @@ class AdaptyOnboarding extends React.Component {
 
     handleAnalytics = (event, data) => {
         config.DEBUG_MODE && console.log('Onboarding analytics AdaptyOnboarding:', event, data);
-        
+
         if (this.props.onAnalytics) {
             this.props.onAnalytics(event, data, this.remoteConfig);
         }
@@ -134,7 +153,7 @@ class AdaptyOnboarding extends React.Component {
 
     handlePaywall = (actionId, meta) => {
         config.DEBUG_MODE && console.log('Onboarding paywall AdaptyOnboarding:', actionId, meta);
-        
+
         if (this.props.onPaywall) {
             this.props.onPaywall(actionId, meta, this.remoteConfig);
         }
@@ -142,7 +161,7 @@ class AdaptyOnboarding extends React.Component {
 
     handleFinishedLoading = (meta) => {
         config.DEBUG_MODE && console.log('Onboarding finished loading AdaptyOnboarding:', meta);
-        
+
         if (this.props.onFinishedLoading) {
             this.props.onFinishedLoading(meta, this.remoteConfig);
         }
@@ -177,20 +196,7 @@ class AdaptyOnboarding extends React.Component {
             </View>
         );
 
-        return (
-            <Modal
-                visible={visible}
-                animationType="slide"
-                presentationStyle="fullScreen"
-                onRequestClose={() => {
-                    config.DEBUG_MODE && console.log('Modal onRequestClose prevented');
-                    return false;
-                }}
-                onDismiss={this.handleModalDismiss}
-            >
-                {content}
-            </Modal>
-        );
+        return content;
     }
 }