rn-smart-tour 1.0.4 → 1.0.5

package/README.md

@@ -112,6 +112,14 @@ When `autoStart: true` is enabled, the overlay waits **300ms** after registratio
 | `autoStart` | `boolean` | Trigger as soon as the first target mounts. |
 | `steps` | `TourStep[]` | Sequence of highlight steps. |
 
+### DapTarget
+| Property | Type | Description |
+|:---|:---|:---|
+| `name` | `string` | Unique identifier that matches a `targetId` in a tour step. |
+| `children` | `ReactElement` | The UI element to wrap and highlight. |
+| `asChild` | `boolean` | **New!** If true, clones the child to avoid an extra View wrapper. (Crucial for flex/percentage layouts). |
+| `...props` | `ViewProps` | All standard React Native `View` props are forwarded. |
+
 ### TourStep
 | Property | Type | Default | Description |
 |:---|:---|:---|:---|

package/dist/DapOverlay.js

@@ -126,9 +126,9 @@ const DapOverlay = () => {
             </react_native_1.Text>)}
 
           <react_native_1.View style={styles.actions}>
-            <react_native_1.TouchableOpacity onPress={() => stopTour()} style={styles.actionBtn}>
-              <react_native_1.Text style={styles.actionText}>Skip</react_native_1.Text>
-            </react_native_1.TouchableOpacity>
+            {!isLastStep && (<react_native_1.TouchableOpacity onPress={() => stopTour()} style={styles.actionBtn}>
+                <react_native_1.Text style={styles.actionText}>Skip</react_native_1.Text>
+              </react_native_1.TouchableOpacity>)}
 
             {!isFirstStep && (<react_native_1.TouchableOpacity onPress={prevStep} style={styles.actionBtn}>
                 <react_native_1.Text style={styles.actionText}>Back</react_native_1.Text>

package/dist/DapProvider.js

@@ -50,9 +50,15 @@ const DapProvider = ({ children, tours, storageAdapter }) => {
     const [currentStepIndex, setCurrentStepIndex] = (0, react_1.useState)(0);
     const [seenTours, setSeenTours] = (0, react_1.useState)({});
     const [isStorageLoaded, setIsStorageLoaded] = (0, react_1.useState)(!storageAdapter);
-    // Ref to avoid stale closures — always holds the latest activeTourId.
+    // Ref to always hold the latest activeTourId, avoiding stale closures.
     const activeTourIdRef = (0, react_1.useRef)(activeTourId);
     activeTourIdRef.current = activeTourId;
+    /**
+     * Ref to track the ID of a tour that was just manually stopped/skipped.
+     * This prevents the auto-start engine from immediately restarting the same tour
+     * before the 'seenTours' state update has been processed.
+     */
+    const tourIdJustStoppedRef = (0, react_1.useRef)(null);
     // Load seen tours on mount if a storage adapter is provided
     (0, react_1.useEffect)(() => {
         const loadStorage = async () => {
@@ -102,11 +108,14 @@ const DapProvider = ({ children, tours, storageAdapter }) => {
             console.warn(`[rn-dap] Tour with id ${tourId} not found.`);
         }
     }, [tours, seenTours]);
-    // Uses activeTourIdRef to avoid stale closures and prevent cascading re-renders.
     const stopTour = (0, react_1.useCallback)((markAsSeen = true) => {
         const currentTourId = activeTourIdRef.current;
-        if (currentTourId && markAsSeen) {
-            saveSeenTour(currentTourId);
+        if (currentTourId) {
+            if (markAsSeen) {
+                saveSeenTour(currentTourId);
+            }
+            // Block this specific tour from auto-restarting until coordinates or seenTours settle.
+            tourIdJustStoppedRef.current = currentTourId;
         }
         setActiveTourId(null);
         setCurrentStepIndex(0);
@@ -142,7 +151,9 @@ const DapProvider = ({ children, tours, storageAdapter }) => {
         autoStartTimerRef.current = setTimeout(() => {
             for (const tourId of Object.keys(tours)) {
                 const tour = tours[tourId];
-                if (tour.autoStart && !seenTours[tourId] && tour.steps.length > 0) {
+                // Skip if this tour was just manually stopped and haven't confirmed 'seen' yet.
+                const wasJustStopped = tourIdJustStoppedRef.current === tourId;
+                if (tour.autoStart && !seenTours[tourId] && !wasJustStopped && tour.steps.length > 0) {
                     const firstTargetId = tour.steps[0].targetId;
                     // If the first target of an unread, auto-starting tour is mounted
                     if (targets[firstTargetId]) {
@@ -151,6 +162,10 @@ const DapProvider = ({ children, tours, storageAdapter }) => {
                     }
                 }
             }
+            // Cleanup the "just stopped" ref once the seenTours state finally reflects the closure.
+            if (tourIdJustStoppedRef.current && seenTours[tourIdJustStoppedRef.current]) {
+                tourIdJustStoppedRef.current = null;
+            }
         }, AUTO_START_DEBOUNCE_MS);
         return () => {
             if (autoStartTimerRef.current) {

package/dist/DapTarget.d.ts

@@ -3,6 +3,12 @@ import { ViewProps } from 'react-native';
 interface DapTargetProps extends ViewProps {
     name: string;
     children: ReactElement;
+    /**
+     * If true, DapTarget will not wrap your child in a View. Instead, it will
+     * clone the child and inject the ref/onLayout logic directly.
+     * Useful for maintaining flex layouts or percentage widths (e.g. 33%).
+     */
+    asChild?: boolean;
 }
 export declare const DapTarget: React.FC<DapTargetProps>;
 export {};

package/dist/DapTarget.js

@@ -45,7 +45,22 @@ const DapContext_1 = require("./DapContext");
 const MEASUREMENT_DELAYS = [100, 500, 1000];
 /** Threshold in points — ignore sub-pixel drift to avoid unnecessary re-registers. */
 const POSITION_THRESHOLD = 1;
-const DapTarget = ({ name, children, ...props }) => {
+/**
+ * Utility to merge multiple refs into a single callback ref.
+ */
+function setRefs(...refs) {
+    return (value) => {
+        refs.forEach((ref) => {
+            if (typeof ref === 'function') {
+                ref(value);
+            }
+            else if (ref && typeof ref === 'object') {
+                ref.current = value;
+            }
+        });
+    };
+}
+const DapTarget = ({ name, children, asChild, ...props }) => {
     const viewRef = (0, react_1.useRef)(null);
     const context = (0, react_1.useContext)(DapContext_1.DapContext);
     /** Holds all scheduled timer IDs so we can cancel them on re-layout or unmount. */
@@ -116,7 +131,26 @@ const DapTarget = ({ name, children, ...props }) => {
             unregisterTarget?.(name);
         };
     }, [name, unregisterTarget, clearAllTimers]);
-    // collapsable={false} is vital for Android, otherwise it gets optimized away and measure fails
+    // If asChild is enabled, clone the child and inject measurement logic.
+    if (asChild && (0, react_1.isValidElement)(children)) {
+        try {
+            const child = react_1.Children.only(children);
+            return (0, react_1.cloneElement)(child, {
+                ...props,
+                ref: setRefs(viewRef, child.ref),
+                onLayout: (e) => {
+                    handleLayout(e);
+                    child.props.onLayout?.(e);
+                },
+                // collapsable={false} is vital for Android measurement
+                collapsable: false,
+            });
+        }
+        catch (e) {
+            console.warn('[rn-dap] asChild requires a single React element as a child.');
+        }
+    }
+    // Fallback to standard View wrapper
     return (<react_native_1.View ref={viewRef} onLayout={handleLayout} collapsable={false} {...props}>
       {children}
     </react_native_1.View>);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rn-smart-tour",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Enterprise-grade Digital Adoption Platform (DAP) package for React Native. Provides guided walkthroughs, tooltips, and app tours.",
   "author": "Vishwas Gaur",
   "license": "MIT",
@@ -9,14 +9,6 @@
   "files": [
     "dist"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Vishwasgaur0819/rn-smart-tour"
-  },
-  "homepage": "https://github.com/Vishwasgaur0819/rn-smart-tour#readme",
-  "bugs": {
-    "url": "https://github.com/Vishwasgaur0819/rn-smart-tour/issues"
-  },
   "keywords": [
     "react-native",
     "tour",