@escapenavigator/hooks 2.0.47 → 2.0.49

package/dist/players-and-variation-picker/index.js

@@ -56,6 +56,7 @@ const reduced_price_1 = require("@escapenavigator/utils/dist/reduced-price");
 const react_1 = __importStar(require("react"));
 const react_i18next_1 = require("react-i18next");
 const use_players_and_variation_picker_1 = require("../use-players-and-variation-picker");
+const ticket_row_1 = require("./ticket-row");
 /**
  * Single shared component that renders the "Variation + Players" picker used
  * by the admin order modals, the widget order flow and the orders package.
@@ -240,26 +241,23 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
     const reducedTitle = (_b = (_a = reducedOverride === null || reducedOverride === void 0 ? void 0 : reducedOverride.reducedTitle) !== null && _a !== void 0 ? _a : selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.reducedTitle) !== null && _b !== void 0 ? _b : '';
     const reducedDescription = ((_d = (_c = reducedOverride === null || reducedOverride === void 0 ? void 0 : reducedOverride.reducedPriceDescription) !== null && _c !== void 0 ? _c : selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.reducedPriceDescription) !== null && _d !== void 0 ? _d : '').trim();
     const hasReducedRate = !!reducedConfig.reducedRateMode && !!reducedConfig.reducedRate;
-    // Лимит льготных мест не приходит с бэка числом: он выводится из
-    // минимальной стоимости игры той же формулой, которой бэк посчитает цену.
-    const maxReduced = (0, react_1.useMemo)(() => hasReducedRate
-        ? (0, reduced_price_1.getMaxReducedPlayers)(Object.assign({ price: tariff, players: _players }, reducedConfig))
-        : 0, [hasReducedRate, tariff, _players, reducedConfig]);
-    const reducedCounts = (0, react_1.useMemo)(() => Array.from({ length: maxReduced + 1 }, (_, index) => index), [maxReduced]);
+    // Льготных мест не больше, чем людей в составе. Пол выручки режет сумму,
+    // а не выбор: три школьника на четверых можно отметить всегда.
+    const maxReduced = hasReducedRate ? _players : 0;
     const handleChangeReduced = (value) => {
         setReduced(value);
         onReducedChange === null || onReducedChange === void 0 ? void 0 : onReducedChange(value);
     };
-    // Состав уменьшился (или сменилась вариация) — вчерашние 3 льготных места
-    // могут больше не влезать в минимум. Подтягиваем вниз, иначе бэк отдал бы
-    // `reducedPlayersLimitExceeded` уже на сохранении.
+    // Состав уменьшился — вчерашние 3 льготных места могут стать больше
+    // группы. Подтягиваем к числу гостей, иначе бэк отдаст ошибку.
     // biome-ignore lint/correctness/useExhaustiveDependencies: односторонний clamp
     (0, react_1.useEffect)(() => {
         if (_reduced > maxReduced)
             handleChangeReduced(maxReduced);
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [maxReduced, _reduced]);
-    const teamPriceBase = (0, get_players_price_1.getPlayersPrice)(Object.assign({ players: _players, children: _children, price: tariff, reducedPlayers: Math.min(_reduced, maxReduced) }, reducedConfig));
+    const appliedReduced = Math.min(_reduced, maxReduced);
+    const teamPriceBase = (0, get_players_price_1.getPlayersPrice)(Object.assign({ players: _players, children: _children, price: tariff, reducedPlayers: appliedReduced }, reducedConfig));
     const teamPrice = teamPriceBase -
         (0, get_slot_discount_amount_1.getSlotDiscountAmount)({
             price: teamPriceBase,
@@ -269,15 +267,18 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
         });
     const totalHeads = _players + (_children || 0);
     const personPrice = totalHeads > 0 ? Math.round(teamPrice / totalHeads / 100) * 100 : 0;
-    // Описание цены за детей показываем только когда дети реально выбраны.
-    const childDescription = _children
-        ? (_e = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.childPriceDescription) === null || _e === void 0 ? void 0 : _e.trim()
-        : undefined;
+    const seatDiscount = hasReducedRate
+        ? (0, reduced_price_1.getReducedSeatDiscount)(Object.assign({ price: tariff, players: _players }, reducedConfig))
+        : 0;
+    const priceWithoutReduced = (0, get_players_price_1.getPlayersPrice)(Object.assign({ players: _players, children: _children, price: tariff, reducedPlayers: 0 }, reducedConfig));
+    const floorReached = appliedReduced > 0 && appliedReduced * seatDiscount > priceWithoutReduced - teamPriceBase;
+    const minAmountLabel = (0, format_amount_1.formatAmount)((0, reduced_price_1.getMinGameAmount)(reducedConfig), currency);
+    const maxChildren = Math.max(0, effectiveMax - _players);
     const showVariations = pickerOptions.length > 1;
     // Клиентское описание показываем только для вариаций — у стандартного
     // (default) тарифа описание не выводим.
     const variationDescription = selectedVariation && !selectedVariation.isDefault
-        ? ((_f = selectedVariation.description) !== null && _f !== void 0 ? _f : null)
+        ? ((_e = selectedVariation.description) !== null && _e !== void 0 ? _e : null)
         : null;
     const handleVariationClick = (optionId, isFree) => {
         if (!isFree)
@@ -318,7 +319,10 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
         react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
             react_1.default.createElement(flex_1.Flex, { gap: 'sm', align: 'center', justify: 'between' },
                 react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, tariff.child ? t('prices:adults') : t('prices:choosePlayersAmount')),
-                !flexSelected && !!_children && !!_players && tariff[_players] != null && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (0, format_amount_1.formatAmount)(tariff[_players], currency)))),
+                !flexSelected && !!_players && tariff[_players] != null && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (0, format_amount_1.formatAmount)(tariff[_players], currency)))),
+            (hasReducedRate || !!childrenOptions.length) && (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:groupFromTariff', {
+                defaultValue: 'Цена группы по тарифу на этот состав',
+            }))),
             react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' },
                 !!flexPlayersOption && (react_1.default.createElement(tag_1.Tag, { key: 'flex-players', text: flexPlayersOption.label, onClick: handleSelectFlex, view: flexSelected ? 'primary-inverted' : 'primary' })),
                 playersOptions
@@ -329,47 +333,38 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
                     .map((p) => (react_1.default.createElement(tag_1.Tag, { key: `adult-${p.key}`, text: `${p.key}`, onClick: () => handleChangePlayers(p.key), view: !flexSelected && _players === p.key
                         ? 'primary-inverted'
                         : 'primary' }))))),
-        !flexSelected && !!childrenOptions.length && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(flex_1.Flex, { gap: 'sm', align: 'center', justify: 'between' },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, t('prices:kids')),
-                !!_children && tariff.child != null && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (0, format_amount_1.formatAmount)(_children * tariff.child, currency)))),
-            !hidePriceHints && !!childDescription && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, childDescription))),
-            react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, childrenOptions
-                .filter((count) => _players + count <= effectiveMax)
-                .map((count) => {
-                const isActive = _children === count;
-                return (react_1.default.createElement(tag_1.Tag, { key: `child-${count}`, text: count === 0 ? t('prices:noKids') : `${count}`, onClick: () => handleChangeChildren(isActive ? 0 : count), view: isActive ? 'primary-inverted' : 'primary' }));
-            })))),
-        !flexSelected && hasReducedRate && !!_players && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(flex_1.Flex, { gap: 'sm', align: 'center', justify: 'between' },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, reducedTitle ||
-                    t('prices:reducedPlayers', { defaultValue: 'Льготные места' })),
-                !!_reduced && (react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, `− ${(0, format_amount_1.formatAmount)(Math.min(_reduced, maxReduced) *
-                    (0, reduced_price_1.getReducedSeatDiscount)(Object.assign({ price: tariff, players: _players }, reducedConfig)), currency)}`))),
-            maxReduced > 0 ? (react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, reducedCounts.map((count) => {
-                const isActive = Math.min(_reduced, maxReduced) === count;
-                return (react_1.default.createElement(tag_1.Tag, { key: `reduced-${count}`, text: count === 0
-                        ? t('prices:noReducedPlayers', {
-                            defaultValue: 'Нет',
-                        })
-                        : `${count}`, onClick: () => handleChangeReduced(isActive ? 0 : count), view: isActive ? 'primary-inverted' : 'primary' }));
-            }))) : (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:reducedNotAvailable', {
-                players: _players,
-                minAmount: (0, format_amount_1.formatAmount)(reducedConfig.minGameAmount || 0, currency),
-                defaultValue: 'На такой состав льготных мест нет: игра не может стоить меньше {{minAmount}}.',
-            }))),
-            !hidePriceHints && !!reducedDescription && !!_reduced && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, reducedDescription))))),
-        !hidePriceHints && !flexSelected && !!totalHeads && (react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
-            react_1.default.createElement(InfoMarkS_1.default, { style: { fill: 'var(--color-text-secondary)' } }),
-            react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:totalPriceDescription', {
-                teamPrice: (0, format_amount_1.formatAmount)(teamPrice, currency),
-                personPrice: (0, format_amount_1.formatAmount)(personPrice, currency),
-            })))),
-        hidePriceHints &&
-            !flexSelected &&
-            (!!totalHeads || !!childDescription || (!!_reduced && !!reducedDescription)) && (react_1.default.createElement("div", { style: {
+        !flexSelected && hasReducedRate && !!_players && (react_1.default.createElement(ticket_row_1.TicketRow, { title: reducedTitle ||
+                t('prices:reducedPlayers', { defaultValue: 'Льготные места' }), priceHint: seatDiscount
+                ? t('prices:reducedFromGroup', {
+                    amount: (0, format_amount_1.formatAmount)(seatDiscount, currency),
+                    defaultValue: '− {{amount}} от цены группы по тарифу, с человека',
+                })
+                : t('prices:reducedAlreadyInTariff', {
+                    defaultValue: 'Уже заложено в цену группы на этот состав',
+                }), description: !hidePriceHints ? reducedDescription || undefined : undefined, value: appliedReduced, min: 0, max: maxReduced, minusLabel: t('prices:minus', { defaultValue: 'На одного меньше' }), plusLabel: t('prices:plus', { defaultValue: 'На одного больше' }), onChange: handleChangeReduced })),
+        !flexSelected && !!childrenOptions.length && (react_1.default.createElement(ticket_row_1.TicketRow, { title: t('prices:kids'), priceHint: t('prices:childOnTop', {
+                amount: (0, format_amount_1.formatAmount)(tariff.child || 0, currency),
+                defaultValue: '+ {{amount}} за ребёнка, сверху к цене группы',
+            }), description: !hidePriceHints
+                ? ((_f = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.childPriceDescription) === null || _f === void 0 ? void 0 : _f.trim()) || undefined
+                : undefined, value: _children, min: 0, max: maxChildren, minusLabel: t('prices:minus', { defaultValue: 'На одного меньше' }), plusLabel: t('prices:plus', { defaultValue: 'На одного больше' }), onChange: handleChangeChildren })),
+        !hidePriceHints && !flexSelected && !!totalHeads && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 4, gc: 0 },
+            react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
+                react_1.default.createElement(InfoMarkS_1.default, { style: { fill: 'var(--color-text-secondary)' } }),
+                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:totalPriceDescription', {
+                    teamPrice: (0, format_amount_1.formatAmount)(teamPrice, currency),
+                    personPrice: (0, format_amount_1.formatAmount)(personPrice, currency),
+                }))),
+            (0, reduced_price_1.getMinGameAmount)(reducedConfig) > 0 && (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, floorReached
+                ? t('prices:floorReached', {
+                    minAmount: minAmountLabel,
+                    defaultValue: 'Уже минимум {{minAmount}} — лишние льготные места цену не снижают',
+                })
+                : t('prices:floorHint', {
+                    minAmount: minAmountLabel,
+                    defaultValue: 'Игра не стоит меньше {{minAmount}}',
+                }))))),
+        hidePriceHints && !flexSelected && !!totalHeads && (react_1.default.createElement("div", { style: {
                 display: 'flex',
                 flexDirection: 'column',
                 gap: 6,
@@ -378,21 +373,26 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
                 borderRadius: 'calc(var(--widget-radius, 12px) * 0.75)',
                 boxSizing: 'border-box',
             } },
-            !!totalHeads && (react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
+            react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
                 react_1.default.createElement(InfoMarkS_1.default, { style: { fill: 'var(--color-text-secondary)' } }),
                 react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, t('prices:totalPriceDescription', {
                     teamPrice: (0, format_amount_1.formatAmount)(teamPrice, currency),
                     personPrice: (0, format_amount_1.formatAmount)(personPrice, currency),
-                })))),
-            !!childDescription && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, childDescription))),
-            !!_reduced && !!reducedDescription && (react_1.default.createElement("div", { style: { whiteSpace: 'pre-line' } },
-                react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, reducedDescription))))),
+                }))),
+            (0, reduced_price_1.getMinGameAmount)(reducedConfig) > 0 && (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, floorReached
+                ? t('prices:floorReached', {
+                    minAmount: minAmountLabel,
+                    defaultValue: 'Уже минимум {{minAmount}} — лишние льготные места цену не снижают',
+                })
+                : t('prices:floorHint', {
+                    minAmount: minAmountLabel,
+                    defaultValue: 'Игра не стоит меньше {{minAmount}}',
+                }))))),
         !!error && (react_1.default.createElement(toast_plate_1.ToastPlate, { view: 'negative' }, error || t('prices:playersError', { minPlayers, maxPlayers: effectiveMax }))),
         !!onSave && (react_1.default.createElement(button_1.Button, { onClick: () => onSave({
                 players: _players,
                 children: _children,
-                reducedPlayers: Math.min(_reduced, maxReduced),
+                reducedPlayers: appliedReduced,
             }), view: 'primary', size: 'xs' }, t('common:save')))));
 };
 exports.PlayersAndVariationPicker = PlayersAndVariationPicker;

package/dist/players-and-variation-picker/ticket-row.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+type Props = {
+    title: string;
+    priceHint: string;
+    description?: string;
+    value: number;
+    min: number;
+    max: number;
+    minusLabel: string;
+    plusLabel: string;
+    onChange: (value: number) => void;
+};
+/**
+ * Строка спеццены: слева что это за места и сколько они снимают
+ * с группового тарифа, справа сколько таких мест в брони.
+ */
+export declare const TicketRow: React.FC<Props>;
+export {};

package/dist/players-and-variation-picker/ticket-row.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TicketRow = void 0;
+const MinusM_1 = __importDefault(require("@alphakits/icons/dist/MinusM"));
+const PlusM_1 = __importDefault(require("@alphakits/icons/dist/PlusM"));
+const typography_1 = require("@alphakits/ui/dist/typography");
+const react_1 = __importDefault(require("react"));
+const index_module_css_1 = __importDefault(require("./index.module.css"));
+/**
+ * Строка спеццены: слева что это за места и сколько они снимают
+ * с группового тарифа, справа сколько таких мест в брони.
+ */
+const TicketRow = ({ title, priceHint, description, value, min, max, minusLabel, plusLabel, onChange, }) => {
+    const active = value > min;
+    return (react_1.default.createElement("div", { className: active ? `${index_module_css_1.default.ticket} ${index_module_css_1.default.ticketActive}` : index_module_css_1.default.ticket },
+        react_1.default.createElement("div", { className: index_module_css_1.default.body },
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'primary-small', weight: 'medium' }, title),
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, priceHint),
+            !!description && (react_1.default.createElement(typography_1.Typography.Text, { view: 'caps', color: 'secondary' }, description))),
+        react_1.default.createElement("div", { className: index_module_css_1.default.stub },
+            react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": minusLabel, disabled: value <= min, onClick: () => onChange(Math.max(min, value - 1)) },
+                react_1.default.createElement(MinusM_1.default, null)),
+            react_1.default.createElement("span", { className: index_module_css_1.default.stepperValue }, value),
+            react_1.default.createElement("button", { type: 'button', className: index_module_css_1.default.stepperButton, "aria-label": plusLabel, disabled: value >= max, onClick: () => onChange(Math.min(max, value + 1)) },
+                react_1.default.createElement(PlusM_1.default, null)))));
+};
+exports.TicketRow = TicketRow;

package/dist/use-players-and-variation-picker/types.d.ts

@@ -25,10 +25,9 @@ export type PickerSlotVariation = {
     };
     childPriceDescription?: string | null;
     /**
-     * Минимальная стоимость игры и льготная ставка тарифа. Лимит льготных мест
-     * пикер считает сам (`getMaxReducedPlayers`) — той же формулой, которой бэк
-     * посчитает цену, поэтому «сколько мест влезает» не может разойтись между
-     * UI и броней.
+     * Минимальная стоимость игры и льготная ставка тарифа. Пикер и бэк считают
+     * цену одной формулой: льготное место снимает ставку с группового тарифа,
+     * итог не ниже минимума. Число мест гость выбирает сам, до размера группы.
      */
     minGameAmount?: number;
     reducedRateMode?: TariffReducedRateModeEnum | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/hooks",
-  "version": "2.0.47",
+  "version": "2.0.49",
   "publishConfig": {
     "access": "public"
   },
@@ -14,9 +14,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/services": "^2.0.47",
-    "@escapenavigator/types": "^2.0.45",
-    "@escapenavigator/utils": "^2.0.47",
+    "@escapenavigator/services": "^2.0.49",
+    "@escapenavigator/types": "^2.0.47",
+    "@escapenavigator/utils": "^2.0.49",
     "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": "cd6ca16767c8a03b4deded5c6abc8943b02ce1ee"
+  "gitHead": "9eaab88a1509930c7715945ce519eaeba879f550"
 }