@escapenavigator/hooks 2.1.24 → 2.1.25

package/dist/lead-form/lead-field.js

@@ -1,5 +1,38 @@
 "use strict";
 /* eslint-disable import/no-extraneous-dependencies */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -10,7 +43,7 @@ const PlusM_1 = __importDefault(require("@alphakits/icons/dist/PlusM"));
 const ui_1 = require("@alphakits/ui");
 const lead_field_type_enum_1 = require("@escapenavigator/types/dist/lead/enums/lead-field-type.enum");
 const lead_time_constants_1 = require("@escapenavigator/types/dist/lead/lead-time.constants");
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const input_tel_1 = require("../input-tel");
 const index_module_css_1 = __importDefault(require("./index.module.css"));
 const lib_1 = require("./lib");
@@ -43,6 +76,11 @@ const ChoiceGroup = ({ label, options, isSelected, onToggle, hint, error, }) =>
 const LeadField = ({ field, value, error, language, profileCountry, questrooms, locations, onChange, onPhoneValidChange, }) => {
     var _a, _b;
     const t = (0, use_lead_t_1.useLeadT)();
+    const [textareaExpanded, setTextareaExpanded] = (0, react_1.useState)(Boolean(value || error));
+    (0, react_1.useEffect)(() => {
+        if (value || error)
+            setTextareaExpanded(true);
+    }, [error, value]);
     const title = (0, lib_1.fieldTitle)(field, language);
     const label = field.required ? `${title} *` : title;
     const placeholder = (0, lib_1.fieldText)(field, language, 'placeholder');
@@ -68,7 +106,14 @@ const LeadField = ({ field, value, error, language, profileCountry, questrooms,
                     onPhoneValidChange(payload.isValid);
                 } }));
         case lead_field_type_enum_1.LeadFieldTypeEnum.TEXTAREA:
-            return withHint(react_1.default.createElement(ui_1.Textarea, { block: true, maxLength: 1000, label: label, placeholder: placeholder, value: String(value || ''), error: error, onChange: (_e, payload) => onChange(payload.value) }));
+            if (!textareaExpanded) {
+                return (react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.commentToggle, onClick: () => setTextareaExpanded(true) },
+                    react_1.default.createElement("span", { "aria-hidden": 'true' }, "+"),
+                    title));
+            }
+            return withHint(react_1.default.createElement("div", { className: index_module_css_1.default.commentEditor },
+                react_1.default.createElement(ui_1.Textarea, { block: true, maxLength: 1000, label: label, placeholder: placeholder, value: String(value || ''), error: error, onChange: (_e, payload) => onChange(payload.value) }),
+                !value && !error && (react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.commentCollapse, onClick: () => setTextareaExpanded(false) }, t('lead.collapse')))));
         case lead_field_type_enum_1.LeadFieldTypeEnum.DATE:
             return withHint(react_1.default.createElement(ui_1.CalendarInput, { block: true, label: label, lang: language, value: String(value || ''), error: error, onChange: (_e, payload) => onChange(payload.value) }));
         case lead_field_type_enum_1.LeadFieldTypeEnum.TIME:
@@ -93,14 +138,14 @@ const LeadField = ({ field, value, error, language, profileCountry, questrooms,
         case lead_field_type_enum_1.LeadFieldTypeEnum.GUESTS: {
             const min = (_a = field.min) !== null && _a !== void 0 ? _a : 1;
             const max = (_b = field.max) !== null && _b !== void 0 ? _b : 30;
-            const current = typeof value === 'number' ? value : min;
+            const current = typeof value === 'number' ? value : undefined;
             return (react_1.default.createElement(ui_1.FlexColumns, { columns: 1, gr: 8 },
                 react_1.default.createElement(ui_1.Typography.Text, { view: 'primary-small', weight: 'medium', color: 'primary' }, label),
                 react_1.default.createElement("div", { className: index_module_css_1.default.stepper },
-                    react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": t('lead.guestsMinus'), disabled: current <= min, onClick: () => onChange(Math.max(min, current - 1)) },
+                    react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": t('lead.guestsMinus'), disabled: current === undefined || current <= min, onClick: () => onChange(Math.max(min, (current !== null && current !== void 0 ? current : min + 1) - 1)) },
                         react_1.default.createElement(MinusM_1.default, null)),
-                    react_1.default.createElement("span", { className: index_module_css_1.default.stepperValue }, current),
-                    react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": t('lead.guestsPlus'), disabled: current >= max, onClick: () => onChange(Math.min(max, current + 1)) },
+                    react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperValue, onClick: () => onChange(undefined) }, current !== null && current !== void 0 ? current : t('lead.guestsUnknown')),
+                    react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": t('lead.guestsPlus'), disabled: current !== undefined && current >= max, onClick: () => onChange(Math.min(max, (current !== null && current !== void 0 ? current : min - 1) + 1)) },
                         react_1.default.createElement(PlusM_1.default, null))),
                 hint));
         }

package/dist/lead-form/lead-form.d.ts

@@ -46,6 +46,10 @@ type Props = {
     policyUrl?: string;
     /** Документ согласия на обработку ПДн (галочка есть только в РФ). */
     pdConsentUrl?: string;
+    /** Модалка управляет шагом, чтобы использовать свою кнопку «Назад». */
+    currentStep?: 1 | 2;
+    onStepChange?: (step: 1 | 2) => void;
+    showBackButton?: boolean;
 };
 export declare const LeadForm: React.FC<Props>;
 export {};

package/dist/lead-form/lead-form.js

@@ -65,15 +65,29 @@ const PLANNING_FIELD_TYPES = new Set([
     lead_field_type_enum_1.LeadFieldTypeEnum.CHECKBOX,
     lead_field_type_enum_1.LeadFieldTypeEnum.QUESTROOM,
     lead_field_type_enum_1.LeadFieldTypeEnum.LOCATION,
-    lead_field_type_enum_1.LeadFieldTypeEnum.GUESTS,
-    lead_field_type_enum_1.LeadFieldTypeEnum.NUMBER,
 ]);
-const LeadForm = ({ form, source, language, profileCountry, submit, prefill, contextNote, withHeader = true, onDone, doneLabel, onSuccess, policyUrl, pdConsentUrl, }) => {
+const PLANNING_FIELD_IDS = new Set(['f_children_age']);
+const CONTACT_FIELD_ORDER = {
+    [lead_field_type_enum_1.LeadFieldTypeEnum.PHONE]: 0,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.NAME]: 1,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.DATE]: 2,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.TIME]: 3,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.GUESTS]: 4,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.TEXTAREA]: 5,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.EMAIL]: 6,
+    [lead_field_type_enum_1.LeadFieldTypeEnum.CONSENT]: 7,
+};
+const LeadForm = ({ form, source, language, profileCountry, submit, prefill, contextNote, withHeader = true, onDone, doneLabel, onSuccess, policyUrl, pdConsentUrl, currentStep, onStepChange, showBackButton = true, }) => {
     const t = (0, use_lead_t_1.useLeadT)();
     const consentRequired = (0, personal_data_consent_1.requiresPersonalDataConsent)(profileCountry);
     const [consent, setConsent] = (0, react_1.useState)(false);
     const [showConsentError, setShowConsentError] = (0, react_1.useState)(false);
-    const [step, setStep] = (0, react_1.useState)(1);
+    const [internalStep, setInternalStep] = (0, react_1.useState)(1);
+    const step = currentStep !== null && currentStep !== void 0 ? currentStep : internalStep;
+    const setStep = (nextStep) => {
+        setInternalStep(nextStep);
+        onStepChange === null || onStepChange === void 0 ? void 0 : onStepChange(nextStep);
+    };
     const [values, setValues] = (0, react_1.useState)(() => (0, lib_1.buildInitialValues)(form, prefill));
     const [errors, setErrors] = (0, react_1.useState)({});
     const [formError, setFormError] = (0, react_1.useState)();
@@ -88,8 +102,14 @@ const LeadForm = ({ form, source, language, profileCountry, submit, prefill, con
         setFormError(undefined);
     };
     const visibleFields = form.fields.filter((field) => (0, lib_1.isVisible)(field, values));
-    const planningFields = visibleFields.filter((field) => PLANNING_FIELD_TYPES.has(field.type));
-    const contactFields = visibleFields.filter((field) => !PLANNING_FIELD_TYPES.has(field.type));
+    const planningFields = visibleFields.filter((field) => PLANNING_FIELD_IDS.has(field.id) || PLANNING_FIELD_TYPES.has(field.type));
+    const contactFields = visibleFields
+        .filter((field) => !PLANNING_FIELD_IDS.has(field.id) && !PLANNING_FIELD_TYPES.has(field.type))
+        .sort((left, right) => {
+        var _a, _b;
+        return ((_a = CONTACT_FIELD_ORDER[left.type]) !== null && _a !== void 0 ? _a : 10) - ((_b = CONTACT_FIELD_ORDER[right.type]) !== null && _b !== void 0 ? _b : 10) ||
+            left.order - right.order;
+    });
     const hasTwoSteps = planningFields.length > 0 && contactFields.length > 0;
     const activeFields = !hasTwoSteps ? visibleFields : step === 1 ? planningFields : contactFields;
     const planningFieldIds = new Set(planningFields.map((field) => field.id));
@@ -190,13 +210,13 @@ const LeadForm = ({ form, source, language, profileCountry, submit, prefill, con
     const title = (0, lib_1.localized)(form.clientTitle, language) || t('lead.title');
     const description = (0, lib_1.localized)(form.description, language);
     const stepLabel = step === 1 ? t('lead.stepPlanning') : t('lead.stepContacts');
-    const headerTitle = hasTwoSteps && step === 2 ? t('lead.stepContactsTitle') : title;
+    const headerTitle = hasTwoSteps && step === 2 ? t('lead.stepQuestMatchTitle') : title;
     const headerDescription = hasTwoSteps && step === 2 ? t('lead.stepContactsHint') : description;
     return (react_1.default.createElement("div", { className: index_module_css_1.default.form },
         withHeader && (react_1.default.createElement("div", { className: index_module_css_1.default.header },
             hasTwoSteps ? (react_1.default.createElement(react_1.default.Fragment, null,
                 react_1.default.createElement("div", { className: index_module_css_1.default.stepMeta },
-                    step === 2 ? (react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.backButton, onClick: () => setStep(1) },
+                    step === 2 && showBackButton ? (react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.backButton, onClick: () => setStep(1) },
                         react_1.default.createElement(ArrowLeft, null),
                         t('lead.back'))) : (react_1.default.createElement("span", null)),
                     react_1.default.createElement("span", null, t('lead.stepCounter', {

package/dist/lead-form/lib.js

@@ -46,20 +46,26 @@ exports.isMultiple = isMultiple;
  * «уточните какой квест» блокировала бы отправку у всех остальных.
  */
 const isVisible = (field, values) => {
+    var _a;
     const condition = field.conditional;
     if (!(condition === null || condition === void 0 ? void 0 : condition.fieldId))
         return true;
     const parentValue = values[condition.fieldId];
-    if (!condition.optionId) {
+    const optionIds = ((_a = condition.optionIds) === null || _a === void 0 ? void 0 : _a.length)
+        ? condition.optionIds
+        : condition.optionId
+            ? [condition.optionId]
+            : [];
+    if (!optionIds.length) {
         return Array.isArray(parentValue) ? parentValue.length > 0 : !!parentValue;
     }
-    if (Array.isArray(parentValue))
-        return parentValue.includes(condition.optionId);
-    return parentValue === condition.optionId;
+    if (Array.isArray(parentValue)) {
+        return parentValue.some((value) => optionIds.includes(value));
+    }
+    return typeof parentValue === 'string' && optionIds.includes(parentValue);
 };
 exports.isVisible = isVisible;
 const buildInitialValues = (form, prefill) => {
-    var _a;
     const values = {};
     for (const field of form.fields) {
         const prefilled = field.mapsTo ? prefill === null || prefill === void 0 ? void 0 : prefill[field.mapsTo] : undefined;
@@ -75,10 +81,10 @@ const buildInitialValues = (form, prefill) => {
             values[field.id] = [];
             continue;
         }
-        // У степпера гостей всегда есть значение: пустое поле «сколько вас»
-        // клиент чаще пропускает, чем заполняет.
+        // Пустое значение у степпера означает «пока не знаю». Первый клик
+        // по плюсу начнёт счёт с минимального значения.
         if (field.type === lead_field_type_enum_1.LeadFieldTypeEnum.GUESTS) {
-            values[field.id] = (_a = field.min) !== null && _a !== void 0 ? _a : 2;
+            values[field.id] = '';
             continue;
         }
         values[field.id] = '';

package/dist/lead-form/lib.spec.js

@@ -38,4 +38,32 @@ describe('lead form step validation', () => {
             formError: undefined,
         });
     });
+    it('shows children age for children and mixed groups', () => {
+        const ageField = {
+            id: 'age',
+            conditional: {
+                fieldId: 'audience',
+                optionIds: ['children', 'mixed'],
+            },
+        };
+        expect((0, lib_1.isVisible)(ageField, { audience: 'children' })).toBe(true);
+        expect((0, lib_1.isVisible)(ageField, { audience: 'mixed' })).toBe(true);
+        expect((0, lib_1.isVisible)(ageField, { audience: 'adults' })).toBe(false);
+    });
+    it('starts an optional guest stepper in the unknown state', () => {
+        const guestsForm = {
+            fields: [
+                {
+                    id: 'guests',
+                    type: lead_field_type_enum_1.LeadFieldTypeEnum.GUESTS,
+                    required: false,
+                    enabled: true,
+                    order: 0,
+                    min: 1,
+                    i18n: {},
+                },
+            ],
+        };
+        expect((0, lib_1.buildInitialValues)(guestsForm)).toEqual({ guests: '' });
+    });
 });

package/dist/lead-form/use-lead-t.js

@@ -25,16 +25,19 @@ const DEFAULTS = {
     'lead.unavailable': 'The request form is not available right now',
     'lead.guestsMinus': 'One guest less',
     'lead.guestsPlus': 'One guest more',
+    'lead.guestsUnknown': 'Not sure yet',
     'lead.timeUndecided': 'Not sure about the time yet',
     'lead.stepPlanning': 'Your preferences',
     'lead.stepContacts': 'Contacts',
     'lead.stepCounter': 'Step {{current}} of 2 · {{label}}',
-    'lead.stepContactsTitle': 'How can we contact you?',
+    'lead.stepContactsTitle': 'We will help you choose a quest',
+    'lead.stepQuestMatchTitle': 'We will help you choose a quest',
     'lead.stepContactsHint': 'Leave your contacts and preferred date — we will confirm the details.',
     'lead.next': 'Next — contacts',
     'lead.back': 'Back',
     'lead.selection': 'Your choices',
     'lead.edit': 'Edit',
+    'lead.collapse': 'Collapse',
     'lead.close': 'Close',
     'lead.another': 'Send another request',
     'lead.footnote': 'We will contact you and suggest options. A request is not a booking yet.',
@@ -50,15 +53,18 @@ const DEFAULTS = {
 const RU_DEFAULTS = {
     'lead.footnote': 'Менеджер свяжется с вами и предложит варианты. Заявка пока не бронирует игру.',
     'lead.timeUndecided': 'Пока не определился со временем',
+    'lead.guestsUnknown': 'Не знаю',
     'lead.stepPlanning': 'Ваши пожелания',
     'lead.stepContacts': 'Контакты',
     'lead.stepCounter': 'Шаг {{current}} из 2 · {{label}}',
-    'lead.stepContactsTitle': 'Как с вами связаться?',
+    'lead.stepContactsTitle': 'Поможем выбрать ваш квест',
+    'lead.stepQuestMatchTitle': 'Поможем выбрать ваш квест',
     'lead.stepContactsHint': 'Оставьте контакты, желаемую дату и время — мы уточним детали.',
     'lead.next': 'Далее — контакты',
     'lead.back': 'Назад',
     'lead.selection': 'Вы выбрали',
     'lead.edit': 'Изменить',
+    'lead.collapse': 'Свернуть',
 };
 const useLeadT = () => {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/hooks",
-  "version": "2.1.24",
+  "version": "2.1.25",
   "publishConfig": {
     "access": "public"
   },
@@ -14,9 +14,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/services": "^2.1.24",
-    "@escapenavigator/types": "^2.1.24",
-    "@escapenavigator/utils": "^2.1.24",
+    "@escapenavigator/services": "^2.1.25",
+    "@escapenavigator/types": "^2.1.25",
+    "@escapenavigator/utils": "^2.1.25",
     "libphonenumber-js": "^1.12.24",
     "react": "19.2.6",
     "react-phone-input-2": "^2.15.1"
@@ -32,5 +32,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "153992d51e958b46acefa16ab49c9a0c1f727150"
+  "gitHead": "561bdff886f82b428de45a54fc63ce6f71500015"
 }