@escapenavigator/hooks 2.0.7 → 2.0.9

package/dist/players-and-variation-picker/index.d.ts

@@ -99,6 +99,19 @@ export type PlayersAndVariationPickerProps = {
      * сводке рядом с «Итого»). По умолчанию `false` — поведение не меняется.
      */
     hidePriceHints?: boolean;
+    /**
+     * Опция «Определимся на месте» (questroom.playersSelectMode=OPTIONAL).
+     * Когда передана, первым тегом в ряду игроков рендерится отложенный
+     * выбор состава. Пока он выбран: числовые теги не подсвечены, секция
+     * детей скрыта (и дети сброшены в 0), ценовые подсказки пикера не
+     * показываются — хост рендерит «базовую стоимость от» сам. Клик по
+     * числу автоматически снимает опцию (onSelect(false)).
+     */
+    flexPlayersOption?: {
+        selected: boolean;
+        label: string;
+        onSelect: (flex: boolean) => void;
+    };
 };
 /**
  * Single shared component that renders the "Variation + Players" picker used

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

@@ -52,6 +52,7 @@ const format_amount_1 = require("@escapenavigator/utils/dist/format-amount");
 const get_players_price_1 = require("@escapenavigator/utils/dist/get-players-price");
 const get_prices_1 = require("@escapenavigator/utils/dist/get-prices");
 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");
 /**
  * Single shared component that renders the "Variation + Players" picker used
@@ -62,8 +63,26 @@ const use_players_and_variation_picker_1 = require("../use-players-and-variation
  * buttons, kids row, price hint, save button) was reimplemented in three
  * places with subtle drift. This component is the single source of truth.
  */
-const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loadSlotDetails, onVariationChange, onVariationResolved, onDetailsLoaded, players = 0, child = 0, tariff: tariffOverride, currency, minPlayers, maxPlayersLimit, slotDiscount, error, t, onChange, onSave, orderId, onLoadingChange, hidePriceHints = false, }) => {
+const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loadSlotDetails, onVariationChange, onVariationResolved, onDetailsLoaded, players = 0, child = 0, tariff: tariffOverride, currency, minPlayers, maxPlayersLimit, slotDiscount, error, t, onChange, onSave, orderId, onLoadingChange, hidePriceHints = false, flexPlayersOption, }) => {
     var _a, _b;
+    /**
+     * Страховка от «голых ключей» перевода. Пикер рендерит `prices:*` /
+     * `common:*` через переданный хостом `t`, но сам хост часто берёт
+     * `t` из `useTranslation()` без этих namespace'ов. В CRM `prices`
+     * грузится лениво — если юзер открыл карточку игры раньше, чем
+     * какой-либо экран задекларировал этот ns, бандл никогда не
+     * запрашивался и вместо переводов светились ключи/фолбэки.
+     *
+     * Декларируем namespace'ы прямо здесь: react-i18next сам догрузит
+     * недостающие бандлы и перерендерит компонент, когда они приедут.
+     * `useSuspense: false` — чтобы не требовать Suspense-границу у всех
+     * хостов; вместо этого до готовности показываем скелетон ниже.
+     * При ошибке загрузки i18next помечает ns как «loaded (failed)»,
+     * так что вечного скелетона не будет.
+     */
+    const { ready: translationsReady } = (0, react_i18next_1.useTranslation)(['prices', 'common'], {
+        useSuspense: false,
+    });
     const { loading: pickerLoading, options: pickerOptions, selectedOptionId, selectedVariation, buildVariationChange, selectVariation, details, } = (0, use_players_and_variation_picker_1.usePlayersAndVariationPicker)({
         slot,
         currentTariffId,
@@ -118,14 +137,26 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
     (0, react_1.useEffect)(() => {
         setChildren(child);
     }, [child]);
+    const flexSelected = !!(flexPlayersOption === null || flexPlayersOption === void 0 ? void 0 : flexPlayersOption.selected);
     const handleChangePlayers = (value) => {
         setPlayers(value);
         onChange === null || onChange === void 0 ? void 0 : onChange('players', value);
+        // Явный выбор числа снимает «Определимся на месте».
+        if (flexSelected)
+            flexPlayersOption === null || flexPlayersOption === void 0 ? void 0 : flexPlayersOption.onSelect(false);
     };
     const handleChangeChildren = (value) => {
         setChildren(value);
         onChange === null || onChange === void 0 ? void 0 : onChange('children', value);
     };
+    const handleSelectFlex = () => {
+        if (flexSelected)
+            return;
+        // Состав не определён — детей тоже сбрасываем (их выбор скрывается).
+        if (_children)
+            handleChangeChildren(0);
+        flexPlayersOption === null || flexPlayersOption === void 0 ? void 0 : flexPlayersOption.onSelect(true);
+    };
     // Цена 0 за число игроков = «это кол-во недоступно для выбора». Такие
     // ключи не рендерим кнопками и не учитываем в availablePlayerKeys/clamp.
     const playersOptions = (0, react_1.useMemo)(() => Object.entries(tariff)
@@ -216,7 +247,9 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
     // not yet available (initial render before fetch starts, in-flight fetch,
     // or backend returned no details). This prevents the brief flash of an
     // empty picker UI between "slot prop arrived" and "loading=true".
-    if (slot && !details) {
+    // Also wait for the `prices`/`common` translation bundles so the picker
+    // never flashes raw i18n keys.
+    if (!translationsReady || (slot && !details)) {
         return (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 16 },
             react_1.default.createElement(skeleton_1.Skeleton, { visible: true, animate: true },
                 react_1.default.createElement("div", { style: { height: 80 } })),
@@ -225,7 +258,11 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
     }
     return (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 16 },
         showVariations && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
-            react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, t('prices:variation')),
+            react_1.default.createElement(typography_1.Typography.Text, { view: 'title', color: 'secondary' }, (details === null || details === void 0 ? void 0 : details.isFlex) === false
+                ? t('prices:chooseTariff', {
+                    defaultValue: 'Выберите подходящий тариф',
+                })
+                : t('prices:variation')),
             react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, pickerOptions.map((option) => (react_1.default.createElement("div", { key: option.id, style: option.isFree
                     ? undefined
                     : { opacity: 0.4, pointerEvents: 'none' } },
@@ -236,14 +273,18 @@ 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')),
-                !!_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)))),
-            react_1.default.createElement(flex_1.Flex, { gap: 'xs', wrap: true, justify: 'start' }, playersOptions
-                .filter((p) => {
-                const total = p.key + (_children || 0);
-                return total >= effectiveMin && total <= effectiveMax;
-            })
-                .map((p) => (react_1.default.createElement(tag_1.Tag, { key: `adult-${p.key}`, text: `${p.key}`, onClick: () => handleChangePlayers(p.key), view: _players === p.key ? 'primary-inverted' : 'primary' }))))),
-        !!childrenOptions.length && (react_1.default.createElement(flex_columns_1.FlexColumns, { columns: 1, gr: 8 },
+                !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)))),
+            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
+                    .filter((p) => {
+                    const total = p.key + (_children || 0);
+                    return total >= effectiveMin && total <= effectiveMax;
+                })
+                    .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)))),
@@ -255,13 +296,13 @@ const PlayersAndVariationPicker = ({ slot, currentTariffId, currentDuration, loa
                 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' }));
             })))),
-        !hidePriceHints && !!totalHeads && (react_1.default.createElement(flex_1.Flex, { justify: 'start', gap: 'xs' },
+        !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 && (!!totalHeads || !!childDescription) && (react_1.default.createElement("div", { style: {
+        hidePriceHints && !flexSelected && (!!totalHeads || !!childDescription) && (react_1.default.createElement("div", { style: {
                 display: 'flex',
                 flexDirection: 'column',
                 gap: 6,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/hooks",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "publishConfig": {
     "access": "public"
   },
@@ -14,9 +14,9 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/services": "^2.0.7",
-    "@escapenavigator/types": "^2.0.7",
-    "@escapenavigator/utils": "^2.0.7",
+    "@escapenavigator/services": "^2.0.9",
+    "@escapenavigator/types": "^2.0.9",
+    "@escapenavigator/utils": "^2.0.9",
     "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": "1205192b8db237aeb156697754bced60b39197f8"
+  "gitHead": "eb29688633048e8011bc07e280dcaa84a2c61244"
 }