datakeen-session-react 1.1.199-rc.3 → 1.1.199-rc.4

package/dist/cjs/components/session/UserInputForm/CustomFormFields.js

@@ -13,6 +13,7 @@ var AddressFields = require('./AddressFields.js');
 var listFieldUtils = require('../../../utils/listFieldUtils.js');
 var customFieldValidation = require('../../../utils/customFieldValidation.js');
 var DatePickerField = require('./DatePickerField.js');
+var customFieldLocks = require('../../../utils/customFieldLocks.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -189,15 +190,6 @@ var CustomFormFields = function (_a) {
     // - hard lock (lockedFromApi sans editableIfMissing) → toujours masqué ;
     // - soft lock (editableIfMissing) → masqué uniquement si l'API a fourni une
     //   valeur ; sinon le champ redevient éditable par l'utilisateur final.
-    var isValuePresent = function (value) {
-        if (value === null || value === undefined)
-            return false;
-        if (typeof value === "string")
-            return value.trim().length > 0;
-        if (Array.isArray(value))
-            return value.length > 0;
-        return true;
-    };
     // La décision de visibilité d'un soft lock se fige à l'OUVERTURE du nœud,
     // pas à chaque frappe : on capture une seule fois (au mount, via ref) les
     // soft locks dont l'API n'avait fourni AUCUNE valeur. Ceux-là restent
@@ -210,7 +202,7 @@ var CustomFormFields = function (_a) {
         var ids = new Set();
         for (var _i = 0, customFields_1 = customFields; _i < customFields_1.length; _i++) {
             var f = customFields_1[_i];
-            if (f.lockedFromApi && f.editableIfMissing && !isValuePresent(formData[f.id])) {
+            if (f.lockedFromApi && f.editableIfMissing && !customFieldLocks.isValuePresent(formData[f.id])) {
                 ids.add(f.id);
             }
         }

package/dist/cjs/components/session/UserInputForm.js

@@ -23,7 +23,10 @@ var UserInputForm = function (props) {
     var t = useI18n.useI18n().t;
     var hasListCustomField = props.node.informationType === "custom" &&
         (props.node.customFields || []).some(function (field) { return field.valueType === "list"; });
-    var _b = useUserInputForm.useUserInputForm(props), form = _b.form, errors = _b.errors, informationType = _b.informationType, requestedFields = _b.requestedFields, pageTitle = _b.pageTitle, pageDescription = _b.pageDescription, addressSuggestions = _b.addressSuggestions, showSuggestions = _b.showSuggestions, handleFieldChange = _b.handleFieldChange, handleAddressChange = _b.handleAddressChange, handleAddressFocus = _b.handleAddressFocus, handleAddressBlur = _b.handleAddressBlur, applyAddressSuggestion = _b.applyAddressSuggestion, goOnNextStep = _b.goOnNextStep, goOnPreviousStep = _b.goOnPreviousStep, customFormData = _b.customFormData, customFormErrors = _b.customFormErrors, customFormCellErrors = _b.customFormCellErrors, handleCustomFieldChange = _b.handleCustomFieldChange, customFields = _b.customFields;
+    var _b = useUserInputForm.useUserInputForm(props), form = _b.form, errors = _b.errors, informationType = _b.informationType, requestedFields = _b.requestedFields, pageTitle = _b.pageTitle, pageDescription = _b.pageDescription, addressSuggestions = _b.addressSuggestions, showSuggestions = _b.showSuggestions, handleFieldChange = _b.handleFieldChange, handleAddressChange = _b.handleAddressChange, handleAddressFocus = _b.handleAddressFocus, handleAddressBlur = _b.handleAddressBlur, applyAddressSuggestion = _b.applyAddressSuggestion, goOnNextStep = _b.goOnNextStep, goOnPreviousStep = _b.goOnPreviousStep, customFormData = _b.customFormData, customFormErrors = _b.customFormErrors, customFormCellErrors = _b.customFormCellErrors, handleCustomFieldChange = _b.handleCustomFieldChange, customFields = _b.customFields, isAutoSkipping = _b.isAutoSkipping;
+    // Nœud sauté (tous les champs verrouillés) : rien à afficher pendant la transition.
+    if (isAutoSkipping)
+        return null;
     return (jsxRuntime.jsxs(MobilePageLayout.default, { contentClassName: "overflow-y-auto", footerClassName: "md:sticky md:bottom-0 md:bg-white md:pt-4 md:z-20", footer: jsxRuntime.jsx(PageActions.default, { primary: jsxRuntime.jsx(Button.default, { onClick: goOnNextStep, children: t("user_input_form.buttons.continue") }), secondary: props.stepObject.canGoBack ? (jsxRuntime.jsx(Button.default, { variant: "secondary", onClick: goOnPreviousStep, children: t("user_input_form.buttons.back") })) : undefined }), children: [typeof process !== "undefined" &&
                 ((_a = process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV) === "development" && (jsxRuntime.jsx("div", { className: "fixed right-0 top-0 z-50 bg-green-500 p-2 text-xs text-white", children: "UserInputForm Rendered \u2713" })), jsxRuntime.jsx("div", { className: "px-4 py-6 pt-11 md:px-8 md:py-8", children: jsxRuntime.jsxs("div", { className: "mx-auto w-full space-y-6 ".concat(hasListCustomField
                         ? "max-w-[98vw] md:max-w-[1300px] lg:max-w-[1500px]"

package/dist/cjs/hooks/useStepNavigation.js

@@ -125,6 +125,22 @@ var useStepNavigation = function (sessionId, sessionStatus$1, initialStep, templ
             console.warn("[useStepNavigation] Could not find next step for node ".concat(currentNodeId, ". Staying on current step."));
         }
     };
+    /**
+     * Saute le nœud courant : il est remplacé dans l'historique par le suivant
+     * (pas empilé), donc goBack() revient au nœud d'avant celui sauté.
+     */
+    var skipToNextStep = function (currentNodeId, template, handle) {
+        var nextStepIndex = sessionService.getNextStepIndex(currentNodeId, template, handle);
+        if (nextStepIndex === null) {
+            console.warn("[useStepNavigation] Could not find next step for node ".concat(currentNodeId, ". Staying on current step."));
+            return;
+        }
+        setHistory(function (prev) {
+            var base = prev[prev.length - 1] === step ? prev.slice(0, -1) : prev;
+            return tslib_es6.__spreadArray(tslib_es6.__spreadArray([], base, true), [nextStepIndex], false);
+        });
+        setStep(nextStepIndex, true);
+    };
     /**
      * Navigates through the graph and makes the destination a point of no return.
      * The destination remains persisted by setStep, while prior history is discarded.
@@ -175,6 +191,7 @@ var useStepNavigation = function (sessionId, sessionStatus$1, initialStep, templ
         goBack: goBack,
         goBackToStep: goBackToStep,
         goToNextStep: goToNextStep,
+        skipToNextStep: skipToNextStep,
         goToNextStepCommitted: goToNextStepCommitted,
         step: step,
         canGoBack: history.length > 1,
@@ -185,6 +202,7 @@ var useStepNavigation = function (sessionId, sessionStatus$1, initialStep, templ
         goBack: goBack,
         goBackToStep: goBackToStep,
         goToNextStep: goToNextStep,
+        skipToNextStep: skipToNextStep,
         goToNextStepCommitted: goToNextStepCommitted,
         stepObject: stepObject,
         history: history,

package/dist/cjs/hooks/useUserInputForm.js

@@ -5,6 +5,7 @@ var React = require('react');
 var userInputForm$1 = require('../constants/userInputForm.js');
 var env = require('../config/env.js');
 var customFieldIds = require('../utils/customFieldIds.js');
+var customFieldLocks = require('../utils/customFieldLocks.js');
 var userInputForm = require('../utils/userInputForm.js');
 var listFieldUtils = require('../utils/listFieldUtils.js');
 var customFieldValidation = require('../utils/customFieldValidation.js');
@@ -87,6 +88,16 @@ var useUserInputForm = function (_a) {
         });
         return initial;
     }), customFormData = _d[0], setCustomFormData = _d[1];
+    // Figé à l'ouverture du nœud (le formulaire est remonté par nœud) : sinon la
+    // saisie dans un soft lock vide le ferait passer pour « masqué » en cours de frappe.
+    var isAutoSkippingRef = React.useRef(null);
+    if (isAutoSkippingRef.current === null) {
+        isAutoSkippingRef.current =
+            informationType === "custom" &&
+                customFields.length > 0 &&
+                !customFieldLocks.hasVisibleCustomFields(customFields, customFormData);
+    }
+    var isAutoSkipping = isAutoSkippingRef.current;
     var _e = React.useState({}), customFormErrors = _e[0], setCustomFormErrors = _e[1];
     var _f = React.useState({}), customFormCellErrors = _f[0], setCustomFormCellErrors = _f[1];
     var _g = React.useState([]), addressSuggestions = _g[0], setAddressSuggestions = _g[1];
@@ -668,6 +679,32 @@ var useUserInputForm = function (_a) {
     var goOnPreviousStep = function () {
         goBack();
     };
+    // Aucun champ visible (tous verrouillés depuis l'API) : on n'affiche pas de
+    // page blanche, on reporte les valeurs préremplies puis on saute le nœud.
+    var hasAutoSkippedRef = React.useRef(false);
+    React.useEffect(function () {
+        var _a;
+        if (!isAutoSkipping || hasAutoSkippedRef.current)
+            return;
+        hasAutoSkippedRef.current = true;
+        var topLevelEntries = {};
+        var customFormDataEntries = {};
+        customFields.forEach(function (field) {
+            var _a;
+            topLevelEntries[(_a = field.userInputKey) !== null && _a !== void 0 ? _a : labelToKey.labelToKey(field.label)] =
+                customFormData[field.id];
+            customFormDataEntries[field.id] = customFormData[field.id];
+        });
+        setUserInput(function (prev) {
+            var _a;
+            return (tslib_es6.__assign(tslib_es6.__assign(tslib_es6.__assign({}, prev), topLevelEntries), { customFormData: tslib_es6.__assign(tslib_es6.__assign({}, ((_a = prev.customFormData) !== null && _a !== void 0 ? _a : {})), customFormDataEntries) }));
+        });
+        if (onContinueCallback)
+            onContinueCallback();
+        else
+            ((_a = stepObject.skipToNextStep) !== null && _a !== void 0 ? _a : goToNextStep)(node.id, template);
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- une seule fois, à l'ouverture du nœud
+    }, []);
     var pageTitle = node.pageTitle || formTitles[informationType];
     var pageDescription = node.pageDescription || formDescriptions[informationType];
     return {
@@ -675,6 +712,7 @@ var useUserInputForm = function (_a) {
         errors: errors,
         informationType: informationType,
         customFields: customFields,
+        isAutoSkipping: isAutoSkipping,
         requestedFields: requestedFields,
         pageTitle: pageTitle,
         pageDescription: pageDescription,

package/dist/cjs/utils/customFieldLocks.js

@@ -0,0 +1,27 @@
+'use strict';
+
+var isValuePresent = function (value) {
+    if (value === null || value === undefined)
+        return false;
+    if (typeof value === "string")
+        return value.trim().length > 0;
+    if (Array.isArray(value))
+        return value.length > 0;
+    return true;
+};
+/**
+ * Vrai si au moins un champ sera affiché à l'ouverture du nœud :
+ * - champ libre → affiché ;
+ * - hard lock (lockedFromApi) → jamais affiché ;
+ * - soft lock (lockedFromApi + editableIfMissing) → affiché seulement si l'API
+ *   n'a fourni aucune valeur.
+ * Un nœud sans aucun champ visible doit être sauté (sinon page blanche).
+ */
+var hasVisibleCustomFields = function (fields, values) {
+    return fields.some(function (f) {
+        return !f.lockedFromApi || (f.editableIfMissing && !isValuePresent(values[f.id]));
+    });
+};
+
+exports.hasVisibleCustomFields = hasVisibleCustomFields;
+exports.isValuePresent = isValuePresent;

package/dist/esm/components/session/UserInputForm/CustomFormFields.js

@@ -9,6 +9,7 @@ import AddressFields from './AddressFields.js';
 import { normalizeListColumns, getListFieldMinRows, ensureMinimumListRows, createEmptyListRow } from '../../../utils/listFieldUtils.js';
 import { cellErrorKey } from '../../../utils/customFieldValidation.js';
 import { DatePickerField } from './DatePickerField.js';
+import { isValuePresent } from '../../../utils/customFieldLocks.js';
 
 /**
  * Sous-composant dédié au rendu d'une cellule du tableau dynamique.
@@ -166,15 +167,6 @@ var CustomFormFields = function (_a) {
     // - hard lock (lockedFromApi sans editableIfMissing) → toujours masqué ;
     // - soft lock (editableIfMissing) → masqué uniquement si l'API a fourni une
     //   valeur ; sinon le champ redevient éditable par l'utilisateur final.
-    var isValuePresent = function (value) {
-        if (value === null || value === undefined)
-            return false;
-        if (typeof value === "string")
-            return value.trim().length > 0;
-        if (Array.isArray(value))
-            return value.length > 0;
-        return true;
-    };
     // La décision de visibilité d'un soft lock se fige à l'OUVERTURE du nœud,
     // pas à chaque frappe : on capture une seule fois (au mount, via ref) les
     // soft locks dont l'API n'avait fourni AUCUNE valeur. Ceux-là restent

package/dist/esm/components/session/UserInputForm.js

@@ -19,7 +19,10 @@ var UserInputForm = function (props) {
     var t = useI18n().t;
     var hasListCustomField = props.node.informationType === "custom" &&
         (props.node.customFields || []).some(function (field) { return field.valueType === "list"; });
-    var _b = useUserInputForm(props), form = _b.form, errors = _b.errors, informationType = _b.informationType, requestedFields = _b.requestedFields, pageTitle = _b.pageTitle, pageDescription = _b.pageDescription, addressSuggestions = _b.addressSuggestions, showSuggestions = _b.showSuggestions, handleFieldChange = _b.handleFieldChange, handleAddressChange = _b.handleAddressChange, handleAddressFocus = _b.handleAddressFocus, handleAddressBlur = _b.handleAddressBlur, applyAddressSuggestion = _b.applyAddressSuggestion, goOnNextStep = _b.goOnNextStep, goOnPreviousStep = _b.goOnPreviousStep, customFormData = _b.customFormData, customFormErrors = _b.customFormErrors, customFormCellErrors = _b.customFormCellErrors, handleCustomFieldChange = _b.handleCustomFieldChange, customFields = _b.customFields;
+    var _b = useUserInputForm(props), form = _b.form, errors = _b.errors, informationType = _b.informationType, requestedFields = _b.requestedFields, pageTitle = _b.pageTitle, pageDescription = _b.pageDescription, addressSuggestions = _b.addressSuggestions, showSuggestions = _b.showSuggestions, handleFieldChange = _b.handleFieldChange, handleAddressChange = _b.handleAddressChange, handleAddressFocus = _b.handleAddressFocus, handleAddressBlur = _b.handleAddressBlur, applyAddressSuggestion = _b.applyAddressSuggestion, goOnNextStep = _b.goOnNextStep, goOnPreviousStep = _b.goOnPreviousStep, customFormData = _b.customFormData, customFormErrors = _b.customFormErrors, customFormCellErrors = _b.customFormCellErrors, handleCustomFieldChange = _b.handleCustomFieldChange, customFields = _b.customFields, isAutoSkipping = _b.isAutoSkipping;
+    // Nœud sauté (tous les champs verrouillés) : rien à afficher pendant la transition.
+    if (isAutoSkipping)
+        return null;
     return (jsxs(MobilePageLayout, { contentClassName: "overflow-y-auto", footerClassName: "md:sticky md:bottom-0 md:bg-white md:pt-4 md:z-20", footer: jsx(PageActions, { primary: jsx(Button, { onClick: goOnNextStep, children: t("user_input_form.buttons.continue") }), secondary: props.stepObject.canGoBack ? (jsx(Button, { variant: "secondary", onClick: goOnPreviousStep, children: t("user_input_form.buttons.back") })) : undefined }), children: [typeof process !== "undefined" &&
                 ((_a = process.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV) === "development" && (jsx("div", { className: "fixed right-0 top-0 z-50 bg-green-500 p-2 text-xs text-white", children: "UserInputForm Rendered \u2713" })), jsx("div", { className: "px-4 py-6 pt-11 md:px-8 md:py-8", children: jsxs("div", { className: "mx-auto w-full space-y-6 ".concat(hasListCustomField
                         ? "max-w-[98vw] md:max-w-[1300px] lg:max-w-[1500px]"

package/dist/esm/hooks/useStepNavigation.js

@@ -123,6 +123,22 @@ var useStepNavigation = function (sessionId, sessionStatus, initialStep, templat
             console.warn("[useStepNavigation] Could not find next step for node ".concat(currentNodeId, ". Staying on current step."));
         }
     };
+    /**
+     * Saute le nœud courant : il est remplacé dans l'historique par le suivant
+     * (pas empilé), donc goBack() revient au nœud d'avant celui sauté.
+     */
+    var skipToNextStep = function (currentNodeId, template, handle) {
+        var nextStepIndex = getNextStepIndex(currentNodeId, template, handle);
+        if (nextStepIndex === null) {
+            console.warn("[useStepNavigation] Could not find next step for node ".concat(currentNodeId, ". Staying on current step."));
+            return;
+        }
+        setHistory(function (prev) {
+            var base = prev[prev.length - 1] === step ? prev.slice(0, -1) : prev;
+            return __spreadArray(__spreadArray([], base, true), [nextStepIndex], false);
+        });
+        setStep(nextStepIndex, true);
+    };
     /**
      * Navigates through the graph and makes the destination a point of no return.
      * The destination remains persisted by setStep, while prior history is discarded.
@@ -173,6 +189,7 @@ var useStepNavigation = function (sessionId, sessionStatus, initialStep, templat
         goBack: goBack,
         goBackToStep: goBackToStep,
         goToNextStep: goToNextStep,
+        skipToNextStep: skipToNextStep,
         goToNextStepCommitted: goToNextStepCommitted,
         step: step,
         canGoBack: history.length > 1,
@@ -183,6 +200,7 @@ var useStepNavigation = function (sessionId, sessionStatus, initialStep, templat
         goBack: goBack,
         goBackToStep: goBackToStep,
         goToNextStep: goToNextStep,
+        skipToNextStep: skipToNextStep,
         goToNextStepCommitted: goToNextStepCommitted,
         stepObject: stepObject,
         history: history,

package/dist/esm/hooks/useUserInputForm.js

@@ -3,6 +3,7 @@ import { useMemo, useState, useRef, useEffect } from 'react';
 import { DEFAULT_FIELDS, FALLBACK_ADDRESS_SUGGESTIONS, GEOCODING_AUTOCOMPLETE_ENDPOINT } from '../constants/userInputForm.js';
 import { API_BASE_URL } from '../config/env.js';
 import { dedupeCustomFieldIds } from '../utils/customFieldIds.js';
+import { hasVisibleCustomFields } from '../utils/customFieldLocks.js';
 import { resolveInformationType, parseBirthDate, checkIsMajor } from '../utils/userInputForm.js';
 import { getListFieldMinRows, normalizeListColumns, countNonEmptyListRows } from '../utils/listFieldUtils.js';
 import { cellErrorKey, resolveColumnRegex, isRegexMatch, isDateValid, isEmailValid } from '../utils/customFieldValidation.js';
@@ -85,6 +86,16 @@ var useUserInputForm = function (_a) {
         });
         return initial;
     }), customFormData = _d[0], setCustomFormData = _d[1];
+    // Figé à l'ouverture du nœud (le formulaire est remonté par nœud) : sinon la
+    // saisie dans un soft lock vide le ferait passer pour « masqué » en cours de frappe.
+    var isAutoSkippingRef = useRef(null);
+    if (isAutoSkippingRef.current === null) {
+        isAutoSkippingRef.current =
+            informationType === "custom" &&
+                customFields.length > 0 &&
+                !hasVisibleCustomFields(customFields, customFormData);
+    }
+    var isAutoSkipping = isAutoSkippingRef.current;
     var _e = useState({}), customFormErrors = _e[0], setCustomFormErrors = _e[1];
     var _f = useState({}), customFormCellErrors = _f[0], setCustomFormCellErrors = _f[1];
     var _g = useState([]), addressSuggestions = _g[0], setAddressSuggestions = _g[1];
@@ -666,6 +677,32 @@ var useUserInputForm = function (_a) {
     var goOnPreviousStep = function () {
         goBack();
     };
+    // Aucun champ visible (tous verrouillés depuis l'API) : on n'affiche pas de
+    // page blanche, on reporte les valeurs préremplies puis on saute le nœud.
+    var hasAutoSkippedRef = useRef(false);
+    useEffect(function () {
+        var _a;
+        if (!isAutoSkipping || hasAutoSkippedRef.current)
+            return;
+        hasAutoSkippedRef.current = true;
+        var topLevelEntries = {};
+        var customFormDataEntries = {};
+        customFields.forEach(function (field) {
+            var _a;
+            topLevelEntries[(_a = field.userInputKey) !== null && _a !== void 0 ? _a : labelToKey(field.label)] =
+                customFormData[field.id];
+            customFormDataEntries[field.id] = customFormData[field.id];
+        });
+        setUserInput(function (prev) {
+            var _a;
+            return (__assign(__assign(__assign({}, prev), topLevelEntries), { customFormData: __assign(__assign({}, ((_a = prev.customFormData) !== null && _a !== void 0 ? _a : {})), customFormDataEntries) }));
+        });
+        if (onContinueCallback)
+            onContinueCallback();
+        else
+            ((_a = stepObject.skipToNextStep) !== null && _a !== void 0 ? _a : goToNextStep)(node.id, template);
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- une seule fois, à l'ouverture du nœud
+    }, []);
     var pageTitle = node.pageTitle || formTitles[informationType];
     var pageDescription = node.pageDescription || formDescriptions[informationType];
     return {
@@ -673,6 +710,7 @@ var useUserInputForm = function (_a) {
         errors: errors,
         informationType: informationType,
         customFields: customFields,
+        isAutoSkipping: isAutoSkipping,
         requestedFields: requestedFields,
         pageTitle: pageTitle,
         pageDescription: pageDescription,

package/dist/esm/utils/customFieldLocks.js

@@ -0,0 +1,24 @@
+var isValuePresent = function (value) {
+    if (value === null || value === undefined)
+        return false;
+    if (typeof value === "string")
+        return value.trim().length > 0;
+    if (Array.isArray(value))
+        return value.length > 0;
+    return true;
+};
+/**
+ * Vrai si au moins un champ sera affiché à l'ouverture du nœud :
+ * - champ libre → affiché ;
+ * - hard lock (lockedFromApi) → jamais affiché ;
+ * - soft lock (lockedFromApi + editableIfMissing) → affiché seulement si l'API
+ *   n'a fourni aucune valeur.
+ * Un nœud sans aucun champ visible doit être sauté (sinon page blanche).
+ */
+var hasVisibleCustomFields = function (fields, values) {
+    return fields.some(function (f) {
+        return !f.lockedFromApi || (f.editableIfMissing && !isValuePresent(values[f.id]));
+    });
+};
+
+export { hasVisibleCustomFields, isValuePresent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datakeen-session-react",
-  "version": "1.1.199-rc.3",
+  "version": "1.1.199-rc.4",
   "description": "React SDK component to manage and render Datakeen session experiences easily.",
   "publishConfig": {
     "access": "public",