@digia-engage/core 2.4.0 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digia-engage/core",
-  "version": "2.4.0",
+  "version": "2.5.1",
   "description": "React Native bridge for Digia Engage – renders native Android Compose UI inside React Native apps",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/Digia.ts

@@ -205,7 +205,7 @@ class DigiaClass implements DigiaDelegate {
     // Mirrors DigiaCEPDelegate on Android.
     // Forwards to the native DigiaCEPDelegate via the bridge.
 
-    async onCampaignTriggered(payload: CEPTriggerPayload): Promise<void> {
+    async onCampaignTriggered(payload: CEPTriggerPayload): Promise<boolean> {
         if (!this._nativeBridgeWired) {
             digiaHealthReporter.report(HealthEventType.plugin_not_registered, { campaign_key: payload.campaignKey });
         }
@@ -222,7 +222,7 @@ class DigiaClass implements DigiaDelegate {
             const result = evaluate(policy, state, Date.now());
             if (!result.allow) {
                 this._log(`frequency_capped campaign_key=${campaignKey} reason=${result.reason}`);
-                return;
+                return false;
             }
         }
 
@@ -237,7 +237,7 @@ class DigiaClass implements DigiaDelegate {
                 this._emitSlotWidth(campaign);
             }
             nativeDigiaModule.triggerCampaign(cepCampaignId, bridgeContent, cepMetadata);
-            return;
+            return true;
         }
 
         if (campaign?.campaign_type === 'guide') {
@@ -251,7 +251,7 @@ class DigiaClass implements DigiaDelegate {
                     campaign_key: campaignKey,
                     reason: 'guide_campaign_has_no_steps',
                 });
-                return;
+                return false;
             }
 
             const firstAnchorKey = config.steps[0].anchorKey;
@@ -263,7 +263,7 @@ class DigiaClass implements DigiaDelegate {
                     reason: 'anchor_key_not_registered',
                     anchor_key: firstAnchorKey,
                 });
-                return;
+                return false;
             }
 
             this._activePayloads.set(cepCampaignId, payload);
@@ -275,6 +275,10 @@ class DigiaClass implements DigiaDelegate {
                 variables,
                 config,
                 onExperienceEvent: (event) => this._onGuideLifecycleEvent(event, cepCampaignId, campaignKey, digiaId),
+                // Safety net: release the CEP slot on every guide exit, including
+                // CTA-close / advance-past-end / anchor-drop paths that emit no
+                // terminal lifecycle event. Idempotent with the explicit path below.
+                onEnd: () => this._releaseGuideSlot(cepCampaignId),
             });
 
             this._log(`guide trigger campaign_key=${campaignKey} mounted=${mounted}`);
@@ -284,8 +288,10 @@ class DigiaClass implements DigiaDelegate {
                     campaign_key: campaignKey,
                     payload_id: cepCampaignId,
                 });
+                this._activePayloads.delete(cepCampaignId);
+                return false;
             }
-            return;
+            return true;
         }
 
         if (!campaign) {
@@ -295,11 +301,12 @@ class DigiaClass implements DigiaDelegate {
                 payload_id: cepCampaignId,
                 available_campaign_keys: [...this._campaignsByKey.keys()],
             });
-            return;
+            return false;
         }
 
         this._activePayloads.set(cepCampaignId, payload);
         nativeDigiaModule.triggerCampaign(cepCampaignId, bridgeContent, cepMetadata);
+        return true;
     }
 
     onCampaignInvalidated(campaignId: string): void {
@@ -404,14 +411,18 @@ class DigiaClass implements DigiaDelegate {
 
         // Notify plugins of CEP lifecycle termination (template cleanup) on exit events.
         if (event.type === 'dismissed' || event.type === 'completed') {
-            const storedPayload = this._activePayloads.get(payloadId);
-            if (storedPayload) {
-                this._plugins.forEach((p) => p.notifyEvent({ type: 'dismissed' }, storedPayload));
-                this._activePayloads.delete(payloadId);
-            }
+            this._releaseGuideSlot(payloadId);
         }
     }
 
+    /** Releases the CEP in-app slot for a guide payload. Idempotent. */
+    private _releaseGuideSlot(payloadId: string): void {
+        const storedPayload = this._activePayloads.get(payloadId);
+        if (!storedPayload) return;
+        this._plugins.forEach((p) => p.notifyEvent({ type: 'dismissed' }, storedPayload));
+        this._activePayloads.delete(payloadId);
+    }
+
     private _guideEventName(type: GuideLifecycleEvent['type']): string {
         switch (type) {
             case 'viewed': return 'Digia Experience Viewed';

package/src/DigiaGuideController.ts

@@ -5,11 +5,11 @@ import type { VariableMap } from './interpolate';
 export interface DigiaGuideRequest {
     payloadId: string;
     campaignKey: string;
-    /** Digia backend UUID for this campaign (from the campaign store _id field). */
     campaignId: string;
     variables?: VariableMap;
     config: TemplateConfig;
     onExperienceEvent: (event: GuideLifecycleEvent) => void;
+    onEnd?: () => void;
 }
 
 type DigiaGuideControllerEvent =
@@ -46,8 +46,10 @@ class DigiaGuideController {
     cancel(payloadId: string): void {
         this._queue = this._queue.filter(r => r.payloadId !== payloadId);
         if (this._activeRequest?.payloadId === payloadId) {
+            const ended = this._activeRequest;
             this._listener?.({ type: 'cancel', payloadId });
             this._activeRequest = null;
+            ended.onEnd?.();
             this._dispatchNext();
         }
     }

package/src/DigiaProvider.tsx

@@ -8,16 +8,9 @@ import {
     StyleSheet,
     Text,
     View,
-    requireNativeComponent,
     useWindowDimensions,
 } from 'react-native';
 
-// Native view that hosts Digia's Compose overlay (dialogs / bottom sheets).
-// pointerEvents="none" ensures it never intercepts touches.
-const NativeDigiaHostView =
-    Platform.OS === 'android' || Platform.OS === 'ios'
-        ? requireNativeComponent<{ style?: object; pointerEvents?: string }>('DigiaHostView')
-        : null;
 import { computePosition, flip, offset, shift } from '@floating-ui/core';
 import Svg, { Path } from 'react-native-svg';
 import { Digia } from './Digia';
@@ -857,37 +850,25 @@ function DigiaGuideRuntime() {
 // Place once at the app root. Accepts optional children (wrap mode) or can be
 // used standalone (<DigiaHost />) as a sibling alongside other root elements.
 //
-// Renders two overlays, both non-interactive (pointerEvents="none"):
-//   1. JS guide / tooltip / spotlight renderer (DigiaGuideRuntime)
-//   2. Native Compose overlay for dialogs / bottom sheets (DigiaHostView)
+// Renders ONLY the JS guide / tooltip / spotlight runtime (DigiaGuideRuntime).
+// Native overlays (nudges, dialogs, bottom sheets, surveys) render through the
+// single native overlay host that DigiaModule mounts imperatively after
+// Digia.initialize() — that host owns its own touch handling and claims touches
+// only while an overlay is active. Mounting a native host here as well would
+// render every overlay twice (one stacked behind the other), and a
+// React-tree host is not reliably touch-correct under the New Architecture.
 
 export function DigiaHost({ children }: { children?: React.ReactNode }) {
-    const overlay = (
-        <>
-            <DigiaGuideRuntime />
-            {NativeDigiaHostView && (
-                // The outer View with pointerEvents="none" is critical: RN's touch
-                // dispatch respects pointerEvents on plain Views even in bridgeless
-                // mode. Applying it directly on requireNativeComponent views is
-                // unreliable in New Architecture. The Compose dialogs/sheets inside
-                // render in their own Android PhoneWindow so they stay interactive.
-                <View style={StyleSheet.absoluteFillObject} pointerEvents="none">
-                    <NativeDigiaHostView style={StyleSheet.absoluteFillObject} />
-                </View>
-            )}
-        </>
-    );
-
     if (children != null) {
         return (
             <>
                 {children}
-                {overlay}
+                <DigiaGuideRuntime />
             </>
         );
     }
 
-    return overlay;
+    return <DigiaGuideRuntime />;
 }
 
 // ─── Styles ───────────────────────────────────────────────────────────────────

package/src/types.ts

@@ -73,8 +73,13 @@ export type GuideLifecycleEvent =
  * Call these instead of touching Digia directly from inside a plugin.
  */
 export interface DigiaDelegate {
-    /** Deliver a campaign payload into the Digia rendering engine. */
-    onCampaignTriggered(payload: CEPTriggerPayload): void | Promise<void>;
+    /**
+     * Deliver a campaign payload into the Digia rendering engine.
+     * @returns `true` if accepted for display, `false` if dropped (frequency cap,
+     *   missing anchor, unknown key, …). Plugins holding a display lock must
+     *   release it on `false`.
+     */
+    onCampaignTriggered(payload: CEPTriggerPayload): boolean | Promise<boolean>;
     /** Invalidate / dismiss a campaign by its ID. */
     onCampaignInvalidated(campaignId: string): void;
 }