@product7/product7-js 0.4.8 → 0.5.0

package/dist/product7-js.js

@@ -964,9 +964,8 @@
 			const contact = this.api.getContactIdentity?.() || null;
 
 			const payload = {
-				rating: responseData.rating,
-				feedback: responseData.feedback || '',
-				answers: responseData.answers || {},
+				answers: Array.isArray(responseData.answers) ? responseData.answers : [],
+				...(responseData.feedback && { feedback: responseData.feedback }),
 				...(respondent.respondent_id && {
 					respondent_id: respondent.respondent_id,
 				}),
@@ -13314,28 +13313,18 @@
 			this._setSubmitLoading(true);
 
 			const respondent = this._getRespondentContext();
-			const normalizedPageAnswers = this._normalizePageAnswersForSubmit();
-			const mergedAnswers = {
-				...this.surveyState.customAnswers,
-				...(Object.keys(normalizedPageAnswers).length > 0 && {
-					page_answers: normalizedPageAnswers,
-				}),
-			};
 
 			const responseData = {
-				rating: this._getSubmissionRating(),
-				feedback: this.surveyState.feedback,
-				answers: mergedAnswers,
+				answers: this._normalizePageAnswersForSubmit(),
+				...(this.surveyState.feedback && { feedback: this.surveyState.feedback }),
 				...(respondent.respondentId && { respondentId: respondent.respondentId }),
 				...(respondent.email && { email: respondent.email }),
 			};
 
 			const response = {
 				type: type,
-				score: this._getSubmissionRating(),
+				answers: responseData.answers,
 				feedback: this.surveyState.feedback,
-				customAnswers: mergedAnswers,
-				pageAnswers: normalizedPageAnswers,
 				timestamp: new Date().toISOString(),
 			};
 
@@ -13345,11 +13334,11 @@
 				await this.apiService.submitSurveyResponse(surveyId, responseData);
 
 				this.sdk.eventBus.emit('survey:submitted', { widget: this, response });
-				this._showThankYouScreen();
-
-				if (this.surveyOptions.onSubmit) {
-					this.surveyOptions.onSubmit(response);
-				}
+				this._showThankYouScreen(() => {
+					if (this.surveyOptions.onSubmit) {
+						this.surveyOptions.onSubmit(response);
+					}
+				});
 			} catch (error) {
 				console.error('[SurveyWidget] Failed to submit survey:', error);
 				this._showError('Something went wrong. Please try again.');
@@ -13519,27 +13508,58 @@
 		}
 
 		_normalizePageAnswersForSubmit() {
-			const output = {};
-			for (const [pageId, answer] of Object.entries(
-				this.surveyState.pageAnswers
-			)) {
-				if (answer == null) continue;
-				if (Array.isArray(answer.values) && answer.values.length > 0) {
-					output[pageId] = answer.values;
-					continue;
-				}
-				if (answer.value != null && answer.value !== '') {
-					output[pageId] = answer.value;
-					continue;
+			// Single-rating surveys (NPS / CSAT / CES / star / emoji) have no pages
+			if (!this._isMultiPageSurvey()) {
+				if (typeof this.surveyState.score === 'number') {
+					return [{ page_id: 'p1', value: this.surveyState.score }];
 				}
-				if (typeof answer.rating === 'number') {
-					output[pageId] = answer.rating;
-					continue;
+				return [];
+			}
+
+			const output = [];
+
+			for (const page of this.surveyOptions.pages) {
+				const pageId =
+					page.id || `page_${this.surveyOptions.pages.indexOf(page)}`;
+				const answer = this.surveyState.pageAnswers[pageId];
+				if (answer == null) continue;
+
+				let value = null;
+
+				if (page.type === 'rating' && typeof answer.rating === 'number') {
+					value = answer.rating;
+				} else if (page.type === 'multiple_choice') {
+					const config =
+						page.multipleChoiceConfig || page.multiple_choice_config || {};
+					const allowMultiple =
+						config.allow_multiple === true ||
+						config.multiple === true ||
+						config.allow_multiple_selection === true;
+
+					if (
+						allowMultiple &&
+						Array.isArray(answer.values) &&
+						answer.values.length > 0
+					) {
+						value = answer.values;
+					} else if (answer.value != null && answer.value !== '') {
+						value = answer.value;
+					}
+				} else if (
+					page.type === 'text' &&
+					typeof answer.text === 'string' &&
+					answer.text.trim()
+				) {
+					value = answer.text.trim();
+				} else if (page.type === 'link' && typeof answer.clicked === 'boolean') {
+					value = answer.clicked;
 				}
-				if (typeof answer.text === 'string' && answer.text.trim()) {
-					output[pageId] = answer.text.trim();
+
+				if (value !== null) {
+					output.push({ page_id: pageId, value });
 				}
 			}
+
 			return output;
 		}
 
@@ -13599,7 +13619,7 @@
 			setTimeout(() => error.remove(), 3000);
 		}
 
-		_showThankYouScreen() {
+		_showThankYouScreen(onAfterClose) {
 			if (!this.surveyElement) return;
 
 			const config = this.surveyOptions.thankYouConfig || {};
@@ -13635,6 +13655,7 @@
 			setTimeout(
 				() => {
 					if (this.surveyElement) this._closeSurvey();
+					if (onAfterClose) onAfterClose();
 				},
 				buttonText ? 6000 : 3500
 			);