react-native-my-survey-sdk 2.2.20 → 2.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-my-survey-sdk",
-  "version": "2.2.20",
+  "version": "2.2.22",
   "description": "Xebo survey collection SDK for React Native",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/components/XeboSurveyModal.tsx

@@ -8,6 +8,7 @@ import {
   StyleSheet,
   Dimensions,
   Platform,
+  useWindowDimensions,
 } from 'react-native';
 import RNModal from 'react-native-modal';
 import { XeboSurveyManager, XEBO_EVENTS } from '../core/XeboSurveyManager';
@@ -30,47 +31,37 @@ import { XeboMultiNPSView } from './XeboMultiNPSView';
 import { XeboRatingView } from './XeboRatingView';
 import { XeboMultiRatingView } from './XeboMultiRatingView';
 
-// 'window' excludes the Android navigation bar; 'screen' includes it.
-// Using window height so sheets are sized relative to the usable area.
-const SCREEN_HEIGHT = Dimensions.get('window').height;
-
-// Android navigation bar height = difference between screen and window.
-// Used as bottomInset so content isn't hidden behind the nav bar.
-const _androidNavBar = Platform.OS === 'android'
-  ? Math.max(0, Dimensions.get('screen').height - Dimensions.get('window').height)
-  : 0;
-
-function computeSheetHeight(question: XeboQuestion | null, screen: ModalScreen): number {
-  if (screen === 'thankYou') return SCREEN_HEIGHT * 0.30;
-  if (screen === 'intro')    return SCREEN_HEIGHT * 0.35;
-  if (!question) return SCREEN_HEIGHT * 0.42;
+function computeSheetHeight(question: XeboQuestion | null, screen: ModalScreen, sh: number): number {
+  if (screen === 'thankYou') return sh * 0.30;
+  if (screen === 'intro')    return sh * 0.38;
+  if (!question) return sh * 0.45;
   switch (question.type) {
     case XeboQuestionType.multiNps:
     case XeboQuestionType.multiRating: {
       const rowCount = question.options?.length ?? 3;
-      return Math.min(SCREEN_HEIGHT * 0.70, SCREEN_HEIGHT * (0.22 + rowCount * 0.13));
+      return Math.min(sh * 0.75, sh * (0.25 + rowCount * 0.13));
     }
     case XeboQuestionType.nps:
       return (question.conditionalFollowUps?.length ?? 0) > 0
-        ? SCREEN_HEIGHT * 0.55
-        : SCREEN_HEIGHT * 0.34;
+        ? sh * 0.60
+        : sh * 0.38;
     case XeboQuestionType.rating:
-      return question.followUpQuestion ? SCREEN_HEIGHT * 0.50 : SCREEN_HEIGHT * 0.34;
+      return question.followUpQuestion ? sh * 0.55 : sh * 0.38;
     case XeboQuestionType.singleTextBox:
-      return SCREEN_HEIGHT * 0.35;
+      return sh * 0.38;
     case XeboQuestionType.multipleTextBox: {
       const fieldCount = question.options?.length ?? 1;
-      return Math.min(SCREEN_HEIGHT * 0.65, SCREEN_HEIGHT * (0.26 + fieldCount * 0.10));
+      return Math.min(sh * 0.70, sh * (0.28 + fieldCount * 0.10));
     }
     case XeboQuestionType.dropdown:
-      return SCREEN_HEIGHT * 0.55;
+      return sh * 0.62;
     case XeboQuestionType.singleChoice:
     case XeboQuestionType.multipleChoice: {
       const optCount = question.options?.length ?? 0;
-      return Math.min(SCREEN_HEIGHT * 0.72, SCREEN_HEIGHT * (0.24 + optCount * 0.075));
+      return Math.min(sh * 0.75, sh * (0.26 + optCount * 0.08));
     }
     default:
-      return SCREEN_HEIGHT * 0.42;
+      return sh * 0.45;
   }
 }
 
@@ -78,14 +69,16 @@ type ModalScreen = 'intro' | 'question' | 'thankYou';
 
 export const XeboSurveyModal: React.FC = () => {
   const theme = getTheme();
-  // Bottom inset: iOS home indicator (34) or Android nav bar height (min 16)
-  const bottomInset = Platform.OS === 'ios' ? 34 : Math.max(16, _androidNavBar);
+  // Always get the live window dimensions — fixes stale height on Android first open
+  const { height: windowHeight } = useWindowDimensions();
+  const screenDims = Dimensions.get('screen');
+  const androidNavBar = Platform.OS === 'android'
+    ? Math.max(0, screenDims.height - windowHeight)
+    : 0;
+  const bottomInset = Platform.OS === 'ios' ? 34 : Math.max(34, androidNavBar);
 
   // Slides the sheet above the keyboard when any TextInput is focused.
-  // Using translateY keeps the layout stable — no height re-calculation needed.
   const shiftAnim = useRef(new Animated.Value(0)).current;
-  // Ref so the keyboard listener can always read the latest sheetHeight without
-  // being re-registered every time the question changes.
   const sheetHeightRef = useRef(0);
 
   const [visible, setVisible] = useState(false);
@@ -94,10 +87,9 @@ export const XeboSurveyModal: React.FC = () => {
   const [questionIndex, setQuestionIndex] = useState(0);
 
   const sheetHeight = useMemo(
-    () => computeSheetHeight(survey?.questions[questionIndex] ?? null, screen),
-    [survey, questionIndex, screen]
+    () => computeSheetHeight(survey?.questions[questionIndex] ?? null, screen, windowHeight),
+    [survey, questionIndex, screen, windowHeight]
   );
-  // Keep ref in sync so keyboard listener always has the latest height
   sheetHeightRef.current = sheetHeight;
 
   // ─── Keyboard: slide sheet above keyboard when any TextInput focuses ──────
@@ -108,8 +100,7 @@ export const XeboSurveyModal: React.FC = () => {
 
     const onShow = (e: { endCoordinates: { height: number } }) => {
       const kh = e.endCoordinates.height;
-      // Cap so the sheet never slides above a 24px top margin
-      const maxShift = Math.max(0, SCREEN_HEIGHT - sheetHeightRef.current - 24);
+      const maxShift = Math.max(0, windowHeight - sheetHeightRef.current);
       Animated.timing(shiftAnim, {
         toValue: -Math.min(kh, maxShift),
         duration: Platform.OS === 'ios' ? 250 : 0,

package/src/core/XeboNetworkService.ts

@@ -7,6 +7,9 @@ import {
   XeboAnswer,
   XeboEnvironment,
   XeboUserData,
+  XeboQualityFlags,
+  XeboDeviceInfo,
+  XeboGeolocation,
 } from '../models/XeboModels';
 import {
   APICollectorResponse,
@@ -334,6 +337,9 @@ export interface SubmitMeta {
   osVersion?: string;
   startTime?: string;
   endTime?: string;
+  qualityFlags?: XeboQualityFlags;
+  deviceInfo?: XeboDeviceInfo;
+  geolocation?: XeboGeolocation;
 }
 
 export async function submitResponse(
@@ -355,7 +361,7 @@ export async function submitResponse(
     if (meta.userData.name)     customVariables.fName     = meta.userData.name;
     if (meta.userData.email)    customVariables.email     = meta.userData.email;
     if (meta.userData.phone)    customVariables.mobile    = meta.userData.phone;
-    if (meta.userData.uniqueId) customVariables.unique_id = meta.userData.uniqueId;
+    if (meta.userData.uniqueId) customVariables.unique_id  = meta.userData.uniqueId;
     if (meta.userData.country)  customVariables.country   = meta.userData.country;
     if (meta.userData.city)     customVariables.city      = meta.userData.city;
   }
@@ -374,6 +380,9 @@ export async function submitResponse(
             text: v.text || null,
           })),
         })),
+        ...(meta?.qualityFlags  && { qualityFlags: meta.qualityFlags }),
+        ...(meta?.deviceInfo    && { deviceInfo: meta.deviceInfo }),
+        ...(meta?.geolocation   && { geolocation: meta.geolocation }),
       },
     ],
   };

package/src/core/XeboSurveyManager.ts

@@ -39,6 +39,9 @@ import {
   XeboEnvironment,
   XeboQueuedResponse,
   XeboUserData,
+  XeboQualityFlags,
+  XeboDeviceInfo,
+  XeboGeolocation,
 } from '../models/XeboModels';
 import {
   resolveZoneAndEnv,
@@ -85,6 +88,12 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
   resolvedCollectorMongoId = '';
   surveyVisible = false;
 
+  // Timing / quality
+  private surveyStartEpoch = 0;
+  private questionStartEpoch = 0;
+  private timePerQues: Record<string, number> = {};
+  private backTrackCount = 0;
+
   // Network monitoring unsubscribe handle
   private netInfoUnsubscribe: (() => void) | null = null;
 
@@ -169,6 +178,10 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
         this.currentAnswers = [];
         this.currentQuestionIndex = 0;
         this.surveyStartTime = new Date().toISOString();
+        this.surveyStartEpoch = Date.now();
+        this.questionStartEpoch = Date.now();
+        this.timePerQues = {};
+        this.backTrackCount = 0;
         this.emit(XEBO_EVENTS.SURVEY_LOADED, this.survey);
         this._setVisible(true);
         return;
@@ -186,6 +199,10 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
       this.currentAnswers = [];
       this.currentQuestionIndex = 0;
       this.surveyStartTime = new Date().toISOString();
+      this.surveyStartEpoch = Date.now();
+      this.questionStartEpoch = Date.now();
+      this.timePerQues = {};
+      this.backTrackCount = 0;
 
       this.emit(XEBO_EVENTS.SURVEY_LOADED, survey);
       this._setVisible(true);
@@ -209,9 +226,17 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
 
   nextQuestion(): void {
     if (!this.survey) return;
+
+    // Record time spent on the current question before advancing
+    const currentQ = this.survey.questions[this.currentQuestionIndex];
+    if (currentQ && currentQ.id !== 'thank_you_auto') {
+      this.timePerQues[currentQ.id] = (Date.now() - this.questionStartEpoch) / 1000;
+    }
+
     const next = this.currentQuestionIndex + 1;
     if (next < this.survey.questions.length) {
       this.currentQuestionIndex = next;
+      this.questionStartEpoch = Date.now();
       this.emit(XEBO_EVENTS.QUESTION_CHANGED, this.currentQuestionIndex);
 
       // If this is the thank-you question, submit in the background
@@ -224,6 +249,46 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
 
   // ─── Submission ────────────────────────────────────────────────────────────
 
+  private _buildQualityFlags(): XeboQualityFlags {
+    const endEpoch = Date.now();
+    const totalMinutes = (endEpoch - this.surveyStartEpoch) / 60000;
+    const now = new Date();
+    const curTime = `${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}`;
+    return {
+      data: {
+        timePerQues: Object.fromEntries(
+          Object.entries(this.timePerQues).map(([qId, secs]) => [qId, { timeOnQues: secs }])
+        ),
+        survey: {
+          totalTimeDuration: totalMinutes,
+          netTimeDuration: totalMinutes,
+          curTime,
+          startTime: this.surveyStartEpoch,
+          backTrackCount: this.backTrackCount,
+        },
+      },
+      straightLining: { questionList: [] },
+    };
+  }
+
+  private _buildDeviceInfo(): XeboDeviceInfo {
+    return {
+      type: 'mobile',
+      os: Platform.OS,
+      browser: 'app',
+    };
+  }
+
+  private _buildGeolocation(): XeboGeolocation {
+    return {
+      type: 'point',
+      coordinates: [null, null],
+      country: this.userData?.country ?? null,
+      city: this.userData?.city ?? null,
+      region: this.userData?.region ?? null,
+    };
+  }
+
   private async _submitCurrentSession(): Promise<void> {
     if (!this.survey) return;
 
@@ -243,6 +308,9 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
           osVersion: this.osVersion,
           startTime: this.surveyStartTime,
           endTime,
+          qualityFlags: this._buildQualityFlags(),
+          deviceInfo: this._buildDeviceInfo(),
+          geolocation: this._buildGeolocation(),
         },
       );
 
@@ -277,6 +345,9 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
       deviceModel: this.deviceModel,
       platform: Platform.OS,
       osVersion: this.osVersion,
+      qualityFlags: this._buildQualityFlags(),
+      deviceInfo: this._buildDeviceInfo(),
+      geolocation: this._buildGeolocation(),
     };
 
     await XeboOfflineQueue.enqueue(queued);
@@ -308,6 +379,9 @@ class XeboSurveyManagerClass extends SimpleEventEmitter {
             osVersion: queued.osVersion,
             startTime: queued.startTime,
             endTime: queued.endTime,
+            qualityFlags: queued.qualityFlags,
+            deviceInfo: queued.deviceInfo,
+            geolocation: queued.geolocation,
           },
         );
         if (!result.ok) throw new Error(`HTTP ${result.status}`);

package/src/models/XeboModels.ts

@@ -102,6 +102,35 @@ export interface XeboUserData {
   uniqueId?: string;
   country?: string;
   city?: string;
+  region?: string;
+}
+
+export interface XeboQualityFlags {
+  data: {
+    timePerQues: Record<string, { timeOnQues: number }>;
+    survey: {
+      totalTimeDuration: number;
+      netTimeDuration: number;
+      curTime: string;
+      startTime: number;
+      backTrackCount: number;
+    };
+  };
+  straightLining: { questionList: string[] };
+}
+
+export interface XeboDeviceInfo {
+  type: string;
+  os: string;
+  browser: string;
+}
+
+export interface XeboGeolocation {
+  type: string;
+  coordinates: [number | null, number | null];
+  country: string | null;
+  city: string | null;
+  region: string | null;
 }
 
 // ─── Offline Queue ────────────────────────────────────────────────────────────
@@ -119,6 +148,9 @@ export interface XeboQueuedResponse {
   deviceModel?: string;
   platform?: string;
   osVersion?: string;
+  qualityFlags?: XeboQualityFlags;
+  deviceInfo?: XeboDeviceInfo;
+  geolocation?: XeboGeolocation;
 }
 
 // ─── Config ───────────────────────────────────────────────────────────────────